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

Merge remote-tracking branch 'origin/Hellen_fork_point' into master 

# Conflicts:
#	firmware/controllers/algo/engine.h
#	firmware/hw_layer/drivers/drivers.mk
#	firmware/hw_layer/stepper.h
#	firmware/integration/rusefi_config.txt
#	firmware/tunerstudio/rusefi.input
#	simulator/simulator/efifeatures.h
This commit is contained in:
rusefi 2020-09-07 15:02:11 -04:00
parent a2f26ac99b 6a3d212370
commit f33b3eda8a
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/actuators/idle_thread.cpp
View File

@ -685,6 +685,14 @@ bool isIdleMotorBusy(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return iacMotor.isBusy(); return iacMotor.isBusy();
} }
bool isIdleMotorBusy(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
if (!CONFIG(useStepperIdle)) {
// todo: check other motor types?
return false;
}
return iacMotor.isBusy();
}
void stopIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void stopIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
#if EFI_PROD_CODE #if EFI_PROD_CODE
brain_pin_markUnused(activeConfiguration.stepperEnablePin); brain_pin_markUnused(activeConfiguration.stepperEnablePin);

2
firmware/controllers/algo/engine.h
View File

@ -374,7 +374,7 @@ public:
* Needed by the stepper motor code to detect if it works. * Needed by the stepper motor code to detect if it works.
*/ */
bool isMainRelayEnabled(DECLARE_ENGINE_PARAMETER_SIGNATURE) const; bool isMainRelayEnabled(DECLARE_ENGINE_PARAMETER_SIGNATURE) const;
/** /**
* Needed by EFI_MAIN_RELAY_CONTROL to handle fuel pump and shutdown timings correctly. * Needed by EFI_MAIN_RELAY_CONTROL to handle fuel pump and shutdown timings correctly.
* This method returns the number of seconds since the ignition voltage is present. * This method returns the number of seconds since the ignition voltage is present.

2
firmware/hw_layer/stepper.h
View File

@ -75,7 +75,7 @@ protected:
void saveStepperPos(int pos); void saveStepperPos(int pos);
int loadStepperPos(); int loadStepperPos();
void changeCurrentPosition(bool positive); void changeCurrentPosition(bool positive);
void postCurrentPosition(void); void postCurrentPosition(void);