diff --git a/firmware/.gitignore b/firmware/.gitignore index 3167e5acaf..7827f12ed2 100644 --- a/firmware/.gitignore +++ b/firmware/.gitignore @@ -1,3 +1,4 @@ openocd benchmark.txt gen_*.log +deliver/ diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 56daef4539..851166209f 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -812,6 +812,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20190803; + return 20190804; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/hw_layer/ports/stm32/stm32f7/dfu_init.h b/firmware/hw_layer/ports/stm32/stm32f7/dfu_init.h index a4fff2f71c..549d001b34 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/dfu_init.h +++ b/firmware/hw_layer/ports/stm32/stm32f7/dfu_init.h @@ -8,8 +8,10 @@ #ifndef HW_LAYER_PORTS_STM32_STM32F7_DFU_INIT_H_ #define HW_LAYER_PORTS_STM32_STM32F7_DFU_INIT_H_ +// looks like this is System Control Block Base Address LDR R1, =0xE000ED00 LDR R0, =0x1FF00000 +// so this must be Vector Table Offset Register? STR R0, [R1, #8] LDR SP, [R0, #0] LDR R0, [R0, #4] diff --git a/firmware/hw_layer/ports/stm32/stm32h7/dfu_init.h b/firmware/hw_layer/ports/stm32/stm32h7/dfu_init.h new file mode 100644 index 0000000000..3a1065336c --- /dev/null +++ b/firmware/hw_layer/ports/stm32/stm32h7/dfu_init.h @@ -0,0 +1,3 @@ + +// https://community.st.com/s/question/0D50X00009bNBluSAG/boot-stm32h7-after-power-up +// https://community.st.com/s/article/STM32H7-bootloader-jump-from-application diff --git a/firmware/svnversion.h b/firmware/svnversion.h index dad6699e3d..274618a685 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,12 +1,12 @@ // This file was generated by Version2Header -// Sat Aug 03 20:42:36 EDT 2019 +// Sun Aug 04 00:11:03 EDT 2019 #ifndef GIT_HASH -#define GIT_HASH "33a488aa5498ab79728f573a977237a60e401976" +#define GIT_HASH "508d497db19eda37c58b568670799f663fe8695e" #endif #ifndef VCS_VERSION -#define VCS_VERSION "19645" +#define VCS_VERSION "19649" #endif