Add board/firmware versions to OD generator

This patch ensures that the board and firmware versions make it
somewhere into the built artefacts. The script itself puts them into the
object dictionary at the appropriate locations.

The firmware version is pretty easy, it's just the output of `git
describe`. As long as tags are maintained it will do the right thing.

Board version is kind of nebulous, currently it just pulls the name of
the board config directory in. There's not really a better string
defined anywhere that I can see? Also because of the way the OD is
generated it's hard to get something from inside a file like a #define
so using the directory is easy to implement.

src/f0/app_adcs/Makefile

@@ -111,7 +111,8 @@ ifeq ($(ORESAT),)
   ORESAT = 0.5
 endif
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) imu -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) imu -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f0/app_battery/Makefile

@@ -116,7 +116,8 @@ ifeq ($(ORESAT),)
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) battery -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) battery -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f0/app_devboard/Makefile

@@ -116,7 +116,8 @@ ifeq ($(ORESAT),)
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f0/app_protocard/Makefile

@@ -116,7 +116,8 @@ ifeq ($(ORESAT),)
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f0/app_solar/Makefile

@@ -116,7 +116,8 @@ ifeq ($(ORESAT),)
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) solar -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) solar -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f4/app_cantest/Makefile

@@ -111,7 +111,8 @@ ifeq ($(ORESAT),)
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f4/app_control/Makefile

@@ -111,7 +111,8 @@ ifeq ($(ORESAT),)
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/f4/app_devboard/Makefile

@@ -111,7 +111,8 @@ ifeq ($(ORESAT),)
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/l4/app_devboard/Makefile

@@ -111,7 +111,8 @@ ifeq ($(ORESAT),)
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)

src/l4/app_devboard_cpp/Makefile

@@ -111,7 +111,8 @@ ifeq ($(ORESAT),)
 endif
 
 # generate OD.c/OD.h from oresat-configs
-$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR))
+FW_VERSION = $(shell git describe)
+$(shell oresat-gen-fw-files --oresat $(ORESAT) base -d $(ODDIR) -fw $(FW_VERSION) -hw $(BOARD))
 # add them
 ALLCSRC += $(ODDIR)/OD.c
 ALLINC += $(ODDIR)