From ad50909f181cf1fde5320676c25bfd694642f8e8 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 13 Apr 2019 19:55:18 -0400 Subject: [PATCH] thank you Dron_gus fot the idea! --- firmware/bootloader/!compile_bootloader_405.bat | 5 +++++ firmware/bootloader/!compile_bootloader_469.bat | 4 ++++ firmware/bootloader/!compile_bootloader_discovery407.bat | 4 ++++ .../config/boards/nucleo_f746/!compile-nucleo_f746.bat | 6 ++++++ firmware/config/boards/nucleo_f767/!compile-f767.bat | 8 +++++++- .../config/boards/nucleo_f767/!compile-nucleo_f767.bat | 8 +++++++- .../config/boards/prometheus/!compile-prometheus-405.bat | 6 ++++++ .../config/boards/prometheus/!compile-prometheus-469.bat | 6 ++++++ firmware/hw_layer/drivers/gpio/core.c | 1 - firmware/hw_layer/smart_gpio.cpp | 4 ++-- 10 files changed, 47 insertions(+), 5 deletions(-) diff --git a/firmware/bootloader/!compile_bootloader_405.bat b/firmware/bootloader/!compile_bootloader_405.bat index 4b35b57c25..cf9885ed40 100644 --- a/firmware/bootloader/!compile_bootloader_405.bat +++ b/firmware/bootloader/!compile_bootloader_405.bat @@ -10,3 +10,8 @@ set DEBUG_LEVEL_OPT="-O2" call !compile_bootloader.bat -r +rem Clean up so that no one inherits this value +set PROJECT_BOARD= +set EXTRA_PARAMS= +set DEBUG_LEVEL_OPT= + diff --git a/firmware/bootloader/!compile_bootloader_469.bat b/firmware/bootloader/!compile_bootloader_469.bat index 58c4230385..8c69c8ef39 100644 --- a/firmware/bootloader/!compile_bootloader_469.bat +++ b/firmware/bootloader/!compile_bootloader_469.bat @@ -10,3 +10,7 @@ set DEBUG_LEVEL_OPT="-O2" call !compile_bootloader.bat -r +rem Clean up so that no one inherits this value +set PROJECT_BOARD= +set EXTRA_PARAMS= +set DEBUG_LEVEL_OPT= diff --git a/firmware/bootloader/!compile_bootloader_discovery407.bat b/firmware/bootloader/!compile_bootloader_discovery407.bat index a35962f3c4..2ff0e1f840 100644 --- a/firmware/bootloader/!compile_bootloader_discovery407.bat +++ b/firmware/bootloader/!compile_bootloader_discovery407.bat @@ -12,3 +12,7 @@ rem set DEBUG_LEVEL_OPT="-O2" call !compile_bootloader.bat -r +rem Clean up so that no one inherits this value +set PROJECT_BOARD= +set EXTRA_PARAMS= +set DEBUG_LEVEL_OPT= diff --git a/firmware/config/boards/nucleo_f746/!compile-nucleo_f746.bat b/firmware/config/boards/nucleo_f746/!compile-nucleo_f746.bat index c91c8c9d4d..5958a10596 100644 --- a/firmware/config/boards/nucleo_f746/!compile-nucleo_f746.bat +++ b/firmware/config/boards/nucleo_f746/!compile-nucleo_f746.bat @@ -13,3 +13,9 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F746xx ^ set DEBUG_LEVEL_OPT="-O2" make -j4 ..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu + +rem Clean up so that no one inherits this value +set PROJECT_BOARD= +set EXTRA_PARAMS= +set DEBUG_LEVEL_OPT= +set USE_BOOTLOADER= diff --git a/firmware/config/boards/nucleo_f767/!compile-f767.bat b/firmware/config/boards/nucleo_f767/!compile-f767.bat index 1c1a292364..d66b6ae67a 100644 --- a/firmware/config/boards/nucleo_f767/!compile-f767.bat +++ b/firmware/config/boards/nucleo_f767/!compile-f767.bat @@ -14,4 +14,10 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F767xx ^ -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE set DEBUG_LEVEL_OPT="-O2" make -j4 -..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu \ No newline at end of file +..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu + +rem Clean up so that no one inherits this value +set PROJECT_BOARD= +set EXTRA_PARAMS= +set DEBUG_LEVEL_OPT= +set USE_BOOTLOADER= diff --git a/firmware/config/boards/nucleo_f767/!compile-nucleo_f767.bat b/firmware/config/boards/nucleo_f767/!compile-nucleo_f767.bat index e12a7f7066..ac4aad6d82 100644 --- a/firmware/config/boards/nucleo_f767/!compile-nucleo_f767.bat +++ b/firmware/config/boards/nucleo_f767/!compile-nucleo_f767.bat @@ -13,4 +13,10 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F767xx ^ -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE set DEBUG_LEVEL_OPT="-O2" make -j4 -..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu \ No newline at end of file +..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu + +rem Clean up so that no one inherits this value +set PROJECT_BOARD= +set EXTRA_PARAMS= +set DEBUG_LEVEL_OPT= +set USE_BOOTLOADER= diff --git a/firmware/config/boards/prometheus/!compile-prometheus-405.bat b/firmware/config/boards/prometheus/!compile-prometheus-405.bat index d4921595cf..5461b20c36 100644 --- a/firmware/config/boards/prometheus/!compile-prometheus-405.bat +++ b/firmware/config/boards/prometheus/!compile-prometheus-405.bat @@ -12,3 +12,9 @@ rem call compile.bat -r rem temp stuff trying to fix CI make clean make -r + +rem Clean up so that no one inherits this value +set PROJECT_BOARD= +set EXTRA_PARAMS= +set DEBUG_LEVEL_OPT= +set USE_BOOTLOADER= diff --git a/firmware/config/boards/prometheus/!compile-prometheus-469.bat b/firmware/config/boards/prometheus/!compile-prometheus-469.bat index f0c4fbdf79..6396b4cdfe 100644 --- a/firmware/config/boards/prometheus/!compile-prometheus-469.bat +++ b/firmware/config/boards/prometheus/!compile-prometheus-469.bat @@ -12,3 +12,9 @@ rem call compile.bat -r rem temp stuff trying to fix CI make clean make -r + +rem Clean up so that no one inherits this value +set PROJECT_BOARD= +set EXTRA_PARAMS= +set DEBUG_LEVEL_OPT= +set USE_BOOTLOADER= diff --git a/firmware/hw_layer/drivers/gpio/core.c b/firmware/hw_layer/drivers/gpio/core.c index 36598e5d24..2ba027a532 100644 --- a/firmware/hw_layer/drivers/gpio/core.c +++ b/firmware/hw_layer/drivers/gpio/core.c @@ -6,7 +6,6 @@ * @author Andrey Gusakov, (c) 2019 */ -#include "efifeatures.h" #include "global.h" #include "gpio/gpio_ext.h" diff --git a/firmware/hw_layer/smart_gpio.cpp b/firmware/hw_layer/smart_gpio.cpp index c575b49678..e123ff99b1 100644 --- a/firmware/hw_layer/smart_gpio.cpp +++ b/firmware/hw_layer/smart_gpio.cpp @@ -85,7 +85,7 @@ void initSmartGpio() { #if (BOARD_TLE6240_COUNT > 0) tle6240.spi_bus = getSpiDevice(engineConfiguration->tle6240spiDevice); tle6240_add(0, &tle6240); -#else +#elif (BOARD_EXT_GPIOCHIPS > 0) gpiochip_use_gpio_base(TLE6240_OUTPUTS); #endif /* (BOARD_TLE6240_COUNT > 0) */ @@ -93,7 +93,7 @@ void initSmartGpio() { mc33972.spi_bus = getSpiDevice(engineConfiguration->mc33972spiDevice); // todo: propogate 'basePinOffset' parameter mc33972_add(0, &mc33972); -#else +#elif (BOARD_EXT_GPIOCHIPS > 0) gpiochip_use_gpio_base(MC33972_INPUTS); #endif /* (BOARD_MC33972_COUNT > 0) */