diff --git a/firmware/Makefile b/firmware/Makefile index f898ebe9f1..0787bafd72 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -153,6 +153,8 @@ ifeq ($(USE_FATFS),yes) include $(PROJECT_DIR)/ext/fatfs.mk endif +BOARDS_DIR = $(PROJECT_DIR)/config/boards + include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.mk include $(PROJECT_DIR)/config/engines/engines.mk include $(PROJECT_DIR)/console/console.mk diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index dab7ac4d37..a14b2aa229 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -1,7 +1,5 @@ # Combine the related files for a specific platform and MCU. -BOARDS_DIR = $(PROJECT_DIR)/config/boards - # Target ECU board design BOARDSRC_CPP = $(BOARDS_DIR)/microrusefi/board_configuration.cpp diff --git a/firmware/config/boards/proteus/adc_hack.cpp b/firmware/config/boards/proteus/adc_hack.cpp index eeb13248fa..5749b89c98 100644 --- a/firmware/config/boards/proteus/adc_hack.cpp +++ b/firmware/config/boards/proteus/adc_hack.cpp @@ -42,7 +42,9 @@ adcsample_t vbattSampleProteus = 0; void proteusAdcHack() { adcConvert(&ADCD3, &adcConvGroup, samples, 8); +#if defined(STM32F7XX) SCB_InvalidateDCache_by_Addr(reinterpret_cast(samples), sizeof(samples)); +#endif /* STM32F7XX */ uint32_t sum = 0; diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index 279b78c4a4..f70064edf5 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -23,4 +23,4 @@ endif # Override DEFAULT_ENGINE_TYPE -DDEFS += -DSTM32F767xx -DEFI_USE_OSC=TRUE -DEFI_FATAL_ERROR_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DUSE_ADC3_VBATT_HACK -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE +DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DEFI_FATAL_ERROR_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DUSE_ADC3_VBATT_HACK -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index 47e08cafbf..fcf989bae5 100644 --- a/firmware/config/boards/proteus/board_configuration.cpp +++ b/firmware/config/boards/proteus/board_configuration.cpp @@ -53,6 +53,9 @@ static void setIgnitionPins() { engineConfiguration->ignitionPinMode = OM_DEFAULT; } +void setSdCardConfigurationOverrides(void) { +} + static void setLedPins() { CONFIG(warningLedPin) = GPIOE_3; CONFIG(communicationLedPin) = GPIOE_4; diff --git a/firmware/config/boards/skeleton/board.mk b/firmware/config/boards/skeleton/board.mk index 1c0c3f19eb..bcabe02ae7 100644 --- a/firmware/config/boards/skeleton/board.mk +++ b/firmware/config/boards/skeleton/board.mk @@ -1,7 +1,5 @@ # Combine the related files for a specific platform and MCU. -BOARDS_DIR = $(PROJECT_DIR)/config/boards - # Target ECU board design BOARDSRC_CPP = $(BOARDS_DIR)/skeleton/board_configuration.cpp diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 2dce775574..9bf0bf08ad 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -324,7 +324,7 @@ void AdcDevice::invalidateSamplesCache() { // As a result, we have to manually invalidate the D-cache any time we (the CPU) // would like to read something that somebody else wrote (ADC via DMA, in this case) SCB_InvalidateDCache_by_Addr(reinterpret_cast(samples), sizeof(samples)); -#endif +#endif /* STM32F7XX */ } void AdcDevice::init(void) {