From d6b745e1c0fb379d61829b522995a05f7c1bf7eb Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 22 Dec 2020 20:50:01 -0500 Subject: [PATCH] Proteus is compiled without VSS feature #2122 --- firmware/config/boards/proteus/board.mk | 11 ++++++++++- firmware/hw_layer/hardware.cpp | 6 +++--- firmware/hw_layer/vehicle_speed.cpp | 3 ++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index e513bf1972..16e3936156 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -22,7 +22,16 @@ else endif # Override DEFAULT_ENGINE_TYPE -DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS_DEFAULTS -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE -DEFI_SOFTWARE_KNOCK=TRUE -DEFI_CONSOLE_TX_BRAIN_PIN=GPIO_UNASSIGNED -DEFI_CONSOLE_RX_BRAIN_PIN=GPIO_UNASSIGNED +DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE +DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 +DDEFS += -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS_DEFAULTS +DDEFS += -DEFI_INCLUDE_ENGINE_PRESETS=FALSE +DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE +DDEFS += -DEFI_LOGIC_ANALYZER=FALSE +DDEFS += -DSTM32_ADC_USE_ADC3=TRUE +DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE +DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=GPIO_UNASSIGNED -DEFI_CONSOLE_RX_BRAIN_PIN=GPIO_UNASSIGNED + # We are running on Proteus hardware! DDEFS += -DHW_PROTEUS=1 diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 35f8dcbb5e..d0b7d93674 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -620,15 +620,15 @@ void initHardware(Logging *l) { #if EFI_VEHICLE_SPEED initVehicleSpeed(sharedLogger); -#endif +#endif // EFI_VEHICLE_SPEED #if EFI_CAN_SUPPORT initCanVssSupport(sharedLogger); -#endif +#endif // EFI_CAN_SUPPORT #if EFI_CDM_INTEGRATION cdmIonInit(); -#endif +#endif // EFI_CDM_INTEGRATION #if (HAL_USE_PAL && EFI_JOYSTICK) initJoystick(sharedLogger); diff --git a/firmware/hw_layer/vehicle_speed.cpp b/firmware/hw_layer/vehicle_speed.cpp index 1341ebb0f9..c7efab225e 100644 --- a/firmware/hw_layer/vehicle_speed.cpp +++ b/firmware/hw_layer/vehicle_speed.cpp @@ -86,8 +86,9 @@ void stopVSSPins(void) { } void startVSSPins(void) { - if (!hasVehicleSpeedSensor()) + if (!hasVehicleSpeedSensor()) { return; + } #if HAL_VSS_USE_PAL ioline_t pal_line = PAL_LINE(getHwPort("vss", CONFIG(vehicleSpeedSensorInputPin)), getHwPin("vss", CONFIG(vehicleSpeedSensorInputPin)));