Updated oresat-gen-fw-files invocation

And also updated the oresat-configs install instructions.

In the latest version of oresat-configs the invocation for
oresat-gen-fw-files changed slightly, I didn't realize it was being used
as part of the build scripts here. This fixes up these build scripts to
use the new invocation, which is changing the argument `oresat0.5` to
`--oresat 0.5`.

Author: ThirteenFish

README.md

@@ -83,11 +83,8 @@ Tools required:
 * srecord
 * oresat-configs
 
-To install oresat-configs: 
-* `$ git clone https://github.com/oresat/oresat-configs`
-* `$ cd oresat-configs`
-* `$ pip install -r requirements.txt`
-* `$ ./build_and_install.sh`
+To install oresat-configs:
+* `$ pip install oresat-configs`
 
 PLEASE NOTE: If you use OpenOCD, the latest "official" release of OpenOCD in
 package managers is several years old. You MUST build it from source for it

src/f0/app_adcs/Makefile

@@ -108,10 +108,10 @@ BOARDDIR  = $(PROJ_ROOT)/boards/$(BOARD)
 
 ODDIR    := $(APP_ROOT)/od
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) imu -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) imu -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f0/app_battery/Makefile

@@ -112,11 +112,11 @@ ifeq ($(USE_BOOTLOADER),)
 endif
 
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) battery -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) battery -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f0/app_devboard/Makefile

@@ -112,11 +112,11 @@ ifeq ($(USE_BOOTLOADER),)
 endif
 
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) base -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f0/app_protocard/Makefile

@@ -112,11 +112,11 @@ ifeq ($(USE_BOOTLOADER),)
 endif
 
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) base -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f0/app_solar/Makefile

@@ -82,10 +82,6 @@ endif
 # Project, target, sources and paths
 #
 
-ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
-endif
-
 # Define project name here
 PROJECT   = app_solar
 
@@ -116,11 +112,11 @@ ifeq ($(USE_BOOTLOADER),)
 endif
 
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) solar -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) solar -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)
@@ -226,9 +222,6 @@ include $(TOOLCHAIN)/toolchain.mk
 # Custom rules
 #
 
-xxd:
-	xxd -i build/$(PROJECT).crc32.bin > build/$(PROJECT).crc32.bin.h
-
 #
 # Custom rules
 ##############################################################################

src/f4/app_cantest/Makefile

@@ -107,11 +107,11 @@ ODDIR    := $(APP_ROOT)/od
 BOARDDIR  = $(PROJ_ROOT)/boards/$(BOARD)
 
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) base -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f4/app_control/Makefile

@@ -107,11 +107,11 @@ ODDIR    := $(APP_ROOT)/od
 BOARDDIR  = $(PROJ_ROOT)/boards/$(BOARD)
 
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) base -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f4/app_devboard/Makefile

@@ -107,18 +107,17 @@ ODDIR    := $(APP_ROOT)/od
 BOARDDIR  = $(PROJ_ROOT)/boards/$(BOARD)
 
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) base -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)
 
 # Project specific files.
 include $(PROJ_SRC)/oresat.mk
-include $(PROJ_SRC)/CO_master.mk
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk

src/l4/app_devboard/Makefile

@@ -107,11 +107,11 @@ ODDIR    := $(APP_ROOT)/od
 BOARDDIR  = $(PROJ_ROOT)/boards/$(BOARD)
 
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) base -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/l4/app_devboard_cpp/Makefile

@@ -107,11 +107,11 @@ DEPDIR   := $(APP_ROOT)/.dep
 BOARDDIR  = $(PROJ_ROOT)/boards/$(BOARD)
 
 ifeq ($(ORESAT),)
-  ORESAT = oresat0.5
+  ORESAT = 0.5
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files $(ORESAT) base -d $(ODDIR))
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)