andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#616 idle for simulator

This commit is contained in:
rusefi 2018-11-01 15:57:50 -04:00
parent 940af25fab
commit 0d7b0a7dba
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/controllers/idle_thread.cpp
View File

@ -289,7 +289,7 @@ static msg_t ivThread(int param) {
} }
#if EFI_PROD_CODE || defined(__DOXYGEN__)
// this value is not used yet // this value is not used yet
if (boardConfiguration->clutchDownPin != GPIO_UNASSIGNED) { if (boardConfiguration->clutchDownPin != GPIO_UNASSIGNED) {
engine->clutchDownState = efiReadPin(boardConfiguration->clutchDownPin); engine->clutchDownState = efiReadPin(boardConfiguration->clutchDownPin);
@ -301,6 +301,7 @@ static msg_t ivThread(int param) {
if (engineConfiguration->brakePedalPin != GPIO_UNASSIGNED) { if (engineConfiguration->brakePedalPin != GPIO_UNASSIGNED) {
engine->brakePedalState = efiReadPin(engineConfiguration->brakePedalPin); engine->brakePedalState = efiReadPin(engineConfiguration->brakePedalPin);
} }
#endif /* EFI_PROD_CODE */
finishIdleTestIfNeeded(); finishIdleTestIfNeeded();
undoIdleBlipIfNeeded(); undoIdleBlipIfNeeded();
@ -490,8 +491,10 @@ void startIdleThread(Logging*sharedLogger) {
} }
if (engineConfiguration->brakePedalPin != GPIO_UNASSIGNED) { if (engineConfiguration->brakePedalPin != GPIO_UNASSIGNED) {
#if EFI_PROD_CODE || defined(__DOXYGEN__)
efiSetPadMode("brake pedal switch", engineConfiguration->brakePedalPin, efiSetPadMode("brake pedal switch", engineConfiguration->brakePedalPin,
getInputMode(engineConfiguration->brakePedalPinMode)); getInputMode(engineConfiguration->brakePedalPinMode));
#endif /* EFI_PROD_CODE */
} }
addConsoleAction("idleinfo", showIdleInfo); addConsoleAction("idleinfo", showIdleInfo);

6
firmware/hw_layer/stepper.cpp
View File

@ -33,8 +33,10 @@ static msg_t stThread(StepperMotor *motor) {
// try to get saved stepper position (-1 for no data) // try to get saved stepper position (-1 for no data)
motor->currentPosition = loadStepperPos(); motor->currentPosition = loadStepperPos();
#if EFI_PROD_CODE || defined(__DOXYGEN__)
// first wait until at least 1 slowADC sampling is complete // first wait until at least 1 slowADC sampling is complete
waitForSlowAdc(); waitForSlowAdc();
#endif
// now check if stepper motor re-initialization is requested - if the throttle pedal is pressed at startup // 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; bool forceStepperParking = !engine->rpmCalculator.isRunning(PASS_ENGINE_PARAMETER_SIGNATURE) && getTPS(PASS_ENGINE_PARAMETER_SIGNATURE) > STEPPER_PARKING_TPS;
if (boardConfiguration->stepperForceParkingEveryRestart) if (boardConfiguration->stepperForceParkingEveryRestart)
@ -146,14 +148,18 @@ void StepperMotor::initialize(brain_pin_e stepPin, brain_pin_e directionPin, pin
return; return;
} }
#if EFI_PROD_CODE || defined(__DOXYGEN__)
stepPort = getHwPort("step", stepPin); stepPort = getHwPort("step", stepPin);
this->stepPin = getHwPin("step", stepPin); this->stepPin = getHwPin("step", stepPin);
#endif /* EFI_PROD_CODE */
this->directionPinMode = directionPinMode; this->directionPinMode = directionPinMode;
this->directionPin.initPin("stepper dir", directionPin, &this->directionPinMode); this->directionPin.initPin("stepper dir", directionPin, &this->directionPinMode);
#if EFI_PROD_CODE || defined(__DOXYGEN__)
enablePort = getHwPort("enable", enablePin); enablePort = getHwPort("enable", enablePin);
this->enablePin = getHwPin("enable", enablePin); this->enablePin = getHwPin("enable", enablePin);
#endif /* EFI_PROD_CODE */
efiSetPadMode("stepper step", stepPin, PAL_MODE_OUTPUT_PUSHPULL); efiSetPadMode("stepper step", stepPin, PAL_MODE_OUTPUT_PUSHPULL);
efiSetPadMode("stepper enable", enablePin, PAL_MODE_OUTPUT_PUSHPULL); efiSetPadMode("stepper enable", enablePin, PAL_MODE_OUTPUT_PUSHPULL);

2
simulator/simulator/global.h
View File

@ -29,6 +29,8 @@
#include "eficonsole.h" #include "eficonsole.h"
#endif /* __cplusplus */ #endif /* __cplusplus */
#define efiSetPadMode(msg, brainPin, mode) {}
#define EFI_UNIT_TEST FALSE #define EFI_UNIT_TEST FALSE
#define hasFatalError() (FALSE) #define hasFatalError() (FALSE)