Proteus is compiled without VSS feature #2122

This commit is contained in:
rusefi 2020-12-22 20:50:01 -05:00
parent fd54e37358
commit d6b745e1c0
3 changed files with 15 additions and 5 deletions

View File

@ -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

View File

@ -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);

View File

@ -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)));