From 0d7b0a7dba9e09912abd62207e70425a94e7aa2f Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 1 Nov 2018 15:57:50 -0400 Subject: [PATCH] #616 idle for simulator --- firmware/controllers/idle_thread.cpp | 5 ++++- firmware/hw_layer/stepper.cpp | 6 ++++++ simulator/simulator/global.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/firmware/controllers/idle_thread.cpp b/firmware/controllers/idle_thread.cpp index 7cc96b67f5..9d586ce581 100644 --- a/firmware/controllers/idle_thread.cpp +++ b/firmware/controllers/idle_thread.cpp @@ -289,7 +289,7 @@ static msg_t ivThread(int param) { } - +#if EFI_PROD_CODE || defined(__DOXYGEN__) // this value is not used yet if (boardConfiguration->clutchDownPin != GPIO_UNASSIGNED) { engine->clutchDownState = efiReadPin(boardConfiguration->clutchDownPin); @@ -301,6 +301,7 @@ static msg_t ivThread(int param) { if (engineConfiguration->brakePedalPin != GPIO_UNASSIGNED) { engine->brakePedalState = efiReadPin(engineConfiguration->brakePedalPin); } +#endif /* EFI_PROD_CODE */ finishIdleTestIfNeeded(); undoIdleBlipIfNeeded(); @@ -490,8 +491,10 @@ void startIdleThread(Logging*sharedLogger) { } if (engineConfiguration->brakePedalPin != GPIO_UNASSIGNED) { +#if EFI_PROD_CODE || defined(__DOXYGEN__) efiSetPadMode("brake pedal switch", engineConfiguration->brakePedalPin, getInputMode(engineConfiguration->brakePedalPinMode)); +#endif /* EFI_PROD_CODE */ } addConsoleAction("idleinfo", showIdleInfo); diff --git a/firmware/hw_layer/stepper.cpp b/firmware/hw_layer/stepper.cpp index 91a0db9750..95bfb03e5c 100644 --- a/firmware/hw_layer/stepper.cpp +++ b/firmware/hw_layer/stepper.cpp @@ -33,8 +33,10 @@ static msg_t stThread(StepperMotor *motor) { // try to get saved stepper position (-1 for no data) motor->currentPosition = loadStepperPos(); +#if EFI_PROD_CODE || defined(__DOXYGEN__) // first wait until at least 1 slowADC sampling is complete waitForSlowAdc(); +#endif // now check if stepper motor re-initialization is requested - if the throttle pedal is pressed at startup bool forceStepperParking = !engine->rpmCalculator.isRunning(PASS_ENGINE_PARAMETER_SIGNATURE) && getTPS(PASS_ENGINE_PARAMETER_SIGNATURE) > STEPPER_PARKING_TPS; if (boardConfiguration->stepperForceParkingEveryRestart) @@ -146,14 +148,18 @@ void StepperMotor::initialize(brain_pin_e stepPin, brain_pin_e directionPin, pin return; } +#if EFI_PROD_CODE || defined(__DOXYGEN__) stepPort = getHwPort("step", stepPin); this->stepPin = getHwPin("step", stepPin); +#endif /* EFI_PROD_CODE */ this->directionPinMode = directionPinMode; this->directionPin.initPin("stepper dir", directionPin, &this->directionPinMode); +#if EFI_PROD_CODE || defined(__DOXYGEN__) enablePort = getHwPort("enable", enablePin); this->enablePin = getHwPin("enable", enablePin); +#endif /* EFI_PROD_CODE */ efiSetPadMode("stepper step", stepPin, PAL_MODE_OUTPUT_PUSHPULL); efiSetPadMode("stepper enable", enablePin, PAL_MODE_OUTPUT_PUSHPULL); diff --git a/simulator/simulator/global.h b/simulator/simulator/global.h index 6f38dc46f5..cf04301795 100644 --- a/simulator/simulator/global.h +++ b/simulator/simulator/global.h @@ -29,6 +29,8 @@ #include "eficonsole.h" #endif /* __cplusplus */ +#define efiSetPadMode(msg, brainPin, mode) {} + #define EFI_UNIT_TEST FALSE #define hasFatalError() (FALSE)