Merge branch 'master' of github.com:rene-dev/stmbl

rene-dev · Apr 12, 2018 · a89172d · a89172d
2 parents db711ec + 69f262c
commit a89172d
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -74,3 +74,4 @@ src/conf_templates.c
 stm32f303/inc/commandslist.h
 stm32f303/inc/hal_tbl.h
 stm32f303/src/hal_tbl.c
+toolchain-user.mak
diff --git a/Makefile b/Makefile
@@ -349,7 +349,6 @@ clean:
 # Include the base rules
 #
 include base.mak
-include toolchain.mak
 
 # Include the dependency files
 #

diff --git a/base.mak b/base.mak
@@ -86,3 +86,6 @@ flash: $(TARGET).bin
 %.dfu: %.bin
 	@cp $< $@
 	@$(DFU-SUFFIX) -v 0483 -p df11 -a $@
+
+include toolchain.mak
+-include toolchain-user.mak
diff --git a/bootloader/Makefile b/bootloader/Makefile
@@ -148,7 +148,6 @@ clean:
 # Include the base rules
 #
 include base.mak
-include toolchain.mak
 
 # Include the dependency files
 #

diff --git a/bootloader/src/version.c b/bootloader/src/version.c
@@ -1,7 +1,8 @@
 #include "version.h"
+#include "version_number.h"
 
 volatile const version_info_t version_info __attribute__((section(".version_info"))) = {
     .product_name = "STMBL-Bootloader",
-    .major        = 0,
-    .minor        = 9,
-    .patch        = 15};
+    .major        = VERSION_MAJOR,
+    .minor        = VERSION_MINOR,
+    .patch        = VERSION_PATCH};
diff --git a/f3_boot/Makefile b/f3_boot/Makefile
@@ -168,7 +168,6 @@ clean:
 # Include the base rules
 #
 include base.mak
-include toolchain.mak
 
 # Include the dependency files
 #

diff --git a/f3_boot/src/version.c b/f3_boot/src/version.c
@@ -1,7 +1,8 @@
 #include "version.h"
+#include "version_number.h"
 
 volatile const version_info_t version_info __attribute__((section(".version_info"))) = {
     .product_name = "STMBL-f3-boot",
-    .major        = 0,
-    .minor        = 9,
-    .patch        = 15};
+    .major        = VERSION_MAJOR,
+    .minor        = VERSION_MINOR,
+    .patch        = VERSION_PATCH};
diff --git a/shared/common.h b/shared/common.h
@@ -46,7 +46,7 @@ typedef struct {
   } state : 8;
   uint16_t padding;
 } packet_bootloader_t;
-
+_Static_assert(sizeof(packet_bootloader_t) == 24, "packet_bootloader_t size error");
 
 //process data from f3 to f4
 typedef struct {
@@ -57,6 +57,7 @@ typedef struct {
   uint8_t buf;
   uint16_t padding;
 } packet_from_hv_t;
+_Static_assert(sizeof(packet_from_hv_t) == 24, "packet_from_hv_t size error");
 
 //process data from f4 to f3
 typedef struct {
@@ -85,6 +86,7 @@ typedef struct {
     uint32_t padding;
   };
 } packet_to_hv_t;
+_Static_assert(sizeof(packet_to_hv_t) == 32, "packet_to_hv_t size error");
 
 //config data for f3
 typedef union {
@@ -153,7 +155,6 @@ typedef enum {
   HV_OVERCURRENT_HW,
 } fault_t;
 
-
 //check if structs can be send at 5kHz with DATABAUD
 _Static_assert(sizeof(packet_to_hv_t) <= DATABAUD / 11 / 5000 - 1 - 5, "to_hv struct to large");
 _Static_assert(sizeof(packet_from_hv_t) <= DATABAUD / 11 / 5000 - 1 - 5, "from_hv struct to large");

diff --git a/shared/version_number.h b/shared/version_number.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define VERSION_MAJOR 0
+#define VERSION_MINOR 9
+#define VERSION_PATCH 17
diff --git a/src/version.c b/src/version.c
@@ -1,7 +1,8 @@
 #include "version.h"
+#include "version_number.h"
 
 volatile const version_info_t version_info __attribute__((section(".version_info"))) = {
     .product_name = "STMBL",
-    .major        = 0,
-    .minor        = 9,
-    .patch        = 15};
+    .major        = VERSION_MAJOR,
+    .minor        = VERSION_MINOR,
+    .patch        = VERSION_PATCH};
diff --git a/stm32f303/Makefile b/stm32f303/Makefile
@@ -216,7 +216,6 @@ clean:
 # Include the base rules
 #
 include base.mak
-include toolchain.mak
 
 # Include the dependency files
 #

diff --git a/stm32f303/src/version.c b/stm32f303/src/version.c
@@ -1,7 +1,8 @@
 #include "version.h"
+#include "version_number.h"
 
 volatile const version_info_t version_info __attribute__((section(".version_info"))) = {
     .product_name = "STMBL-hv-f303",
-    .major        = 0,
-    .minor        = 9,
-    .patch        = 15};
+    .major        = VERSION_MAJOR,
+    .minor        = VERSION_MINOR,
+    .patch        = VERSION_PATCH};
diff --git a/toolchain.mak b/toolchain.mak
@@ -1,4 +1,5 @@
 # Define programs and commands for the toolchain
+# Do not modiy this file. Instead create a file toolchain-user.mak which can overwrite anything in here.
 PYTHON     = python
 DFU-UTIL   = dfu-util
 DFU-SUFFIX = dfu-suffix