Merge remote-tracking branch 'origin/master' into master
This commit is contained in:
commit
e190f261c4
|
@ -495,6 +495,15 @@ void EtbController::update() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (CONFIG(disableEtbWhenEngineStopped)) {
|
||||||
|
if (engine->triggerCentral.getTimeSinceTriggerEvent(getTimeNowNt()) > 1) {
|
||||||
|
// If engine is stopped and so configured, skip the ETB update entirely
|
||||||
|
// This is quieter and pulls less power than leaving it on all the time
|
||||||
|
m_motor->disable();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#if EFI_TUNER_STUDIO
|
#if EFI_TUNER_STUDIO
|
||||||
if (engineConfiguration->debugMode == DBG_ETB_LOGIC) {
|
if (engineConfiguration->debugMode == DBG_ETB_LOGIC) {
|
||||||
tsOutputChannels.debugFloatField1 = engine->engineState.targetFromTable;
|
tsOutputChannels.debugFloatField1 = engine->engineState.targetFromTable;
|
||||||
|
|
|
@ -66,7 +66,7 @@ void applyIACposition(percent_t position DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
||||||
#endif /* EFI_UNIT_TEST */
|
#endif /* EFI_UNIT_TEST */
|
||||||
} else {
|
} else {
|
||||||
// if not spinning or running a bench test, turn off the idle valve(s) to be quieter and save power
|
// if not spinning or running a bench test, turn off the idle valve(s) to be quieter and save power
|
||||||
if (engine->triggerCentral.getTimeSinceTriggerEvent(getTimeNowNt()) > 1.0f && timeToStopIdleTest == 0) {
|
if (!engine->triggerCentral.engineMovedRecently() && timeToStopIdleTest == 0) {
|
||||||
idleSolenoidOpen.setSimplePwmDutyCycle(0);
|
idleSolenoidOpen.setSimplePwmDutyCycle(0);
|
||||||
idleSolenoidClose.setSimplePwmDutyCycle(0);
|
idleSolenoidClose.setSimplePwmDutyCycle(0);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021
|
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Feb 05 23:21:13 UTC 2021
|
||||||
|
|
||||||
// by class com.rusefi.output.FileFsioSettingsConsumer
|
// by class com.rusefi.output.FileFsioSettingsConsumer
|
||||||
FSIO_SETTING_FANONTEMPERATURE = 1000,
|
FSIO_SETTING_FANONTEMPERATURE = 1000,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021
|
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Feb 05 23:21:13 UTC 2021
|
||||||
|
|
||||||
// by class com.rusefi.output.FileFsioSettingsConsumer
|
// by class com.rusefi.output.FileFsioSettingsConsumer
|
||||||
case FSIO_SETTING_FANONTEMPERATURE:
|
case FSIO_SETTING_FANONTEMPERATURE:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021
|
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Feb 05 23:21:13 UTC 2021
|
||||||
|
|
||||||
// by class com.rusefi.output.FileFsioSettingsConsumer
|
// by class com.rusefi.output.FileFsioSettingsConsumer
|
||||||
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");
|
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Feb 03 19:36:03 UTC 2021
|
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Feb 05 23:21:13 UTC 2021
|
||||||
|
|
||||||
// by class com.rusefi.output.FileFsioSettingsConsumer
|
// by class com.rusefi.output.FileFsioSettingsConsumer
|
||||||
case FSIO_SETTING_FANONTEMPERATURE:
|
case FSIO_SETTING_FANONTEMPERATURE:
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD all
|
#define SIGNATURE_BOARD all
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 920683779
|
#define SIGNATURE_HASH 2191466603
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.all.920683779"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.all.2191466603"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD frankenso_na6
|
#define SIGNATURE_BOARD frankenso_na6
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 2996480144
|
#define SIGNATURE_HASH 115674616
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.frankenso_na6.2996480144"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.frankenso_na6.115674616"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD hellen72
|
#define SIGNATURE_BOARD hellen72
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 615833019
|
#define SIGNATURE_HASH 2429253843
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.hellen72.615833019"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.hellen72.2429253843"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD hellen_cypress
|
#define SIGNATURE_BOARD hellen_cypress
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 1956404947
|
#define SIGNATURE_HASH 3236166587
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.hellen_cypress.1956404947"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.hellen_cypress.3236166587"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD kin
|
#define SIGNATURE_BOARD kin
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 1956404947
|
#define SIGNATURE_HASH 3236166587
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.kin.1956404947"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.kin.3236166587"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD mre_f4
|
#define SIGNATURE_BOARD mre_f4
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 405207017
|
#define SIGNATURE_HASH 2891534977
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.mre_f4.405207017"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.mre_f4.2891534977"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD mre_f7
|
#define SIGNATURE_BOARD mre_f7
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 405207017
|
#define SIGNATURE_HASH 2891534977
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.mre_f7.405207017"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.mre_f7.2891534977"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD prometheus_405
|
#define SIGNATURE_BOARD prometheus_405
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 611747637
|
#define SIGNATURE_HASH 2416517725
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.prometheus_405.611747637"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.prometheus_405.2416517725"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD prometheus_469
|
#define SIGNATURE_BOARD prometheus_469
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 611747637
|
#define SIGNATURE_HASH 2416517725
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.prometheus_469.611747637"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.prometheus_469.2416517725"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD proteus_f4
|
#define SIGNATURE_BOARD proteus_f4
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 1372671276
|
#define SIGNATURE_HASH 3853445188
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.proteus_f4.1372671276"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.proteus_f4.3853445188"
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_BOARD proteus_f7
|
#define SIGNATURE_BOARD proteus_f7
|
||||||
#define SIGNATURE_DATE 2021.02.03
|
#define SIGNATURE_DATE 2021.02.05
|
||||||
#define SIGNATURE_HASH 1372671276
|
#define SIGNATURE_HASH 3853445188
|
||||||
#define TS_SIGNATURE "rusEFI 2021.02.03.proteus_f7.1372671276"
|
#define TS_SIGNATURE "rusEFI 2021.02.05.proteus_f7.3853445188"
|
||||||
|
|
|
@ -49,6 +49,11 @@ public:
|
||||||
return m_lastEventTimer.getElapsedSeconds(nowNt);
|
return m_lastEventTimer.getElapsedSeconds(nowNt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool engineMovedRecently() const {
|
||||||
|
// Trigger event some time in the past second = engine moving
|
||||||
|
return getTimeSinceTriggerEvent(getTimeNowNt()) < 1.0f;
|
||||||
|
}
|
||||||
|
|
||||||
TriggerNoiseFilter noiseFilter;
|
TriggerNoiseFilter noiseFilter;
|
||||||
|
|
||||||
trigger_type_e vvtTriggerType;
|
trigger_type_e vvtTriggerType;
|
||||||
|
|
|
@ -831,7 +831,7 @@ bit is_enabled_spi_2
|
||||||
bit useIacTableForCoasting;+This setting allows the ECU to open the IAC during overrun conditions to help reduce engine breaking, this can be helpful for large engines in light weight cars. Used in Auto-PID Idle mode.
|
bit useIacTableForCoasting;+This setting allows the ECU to open the IAC during overrun conditions to help reduce engine breaking, this can be helpful for large engines in light weight cars. Used in Auto-PID Idle mode.
|
||||||
bit useNoiselessTriggerDecoder
|
bit useNoiselessTriggerDecoder
|
||||||
bit useIdleTimingPidControl
|
bit useIdleTimingPidControl
|
||||||
bit unused744b25
|
bit disableEtbWhenEngineStopped;+Allows disabling the ETB when the engine is stopped. You may not like the power draw or PWM noise from the motor, so this lets you turn it off until it's necessary.
|
||||||
bit is_enabled_spi_4
|
bit is_enabled_spi_4
|
||||||
bit pauseEtbControl;+Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle.
|
bit pauseEtbControl;+Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle.
|
||||||
bit alignEngineSnifferAtTDC
|
bit alignEngineSnifferAtTDC
|
||||||
|
|
|
@ -3254,6 +3254,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
|
||||||
dialog = etbDialogLeft
|
dialog = etbDialogLeft
|
||||||
field = "https://rusefi.com/s/etb"
|
field = "https://rusefi.com/s/etb"
|
||||||
field = "Detailed status in console", isVerboseETB
|
field = "Detailed status in console", isVerboseETB
|
||||||
|
field = "Disable ETB if engine is stopped", disableEtbWhenEngineStopped
|
||||||
field = "Disable ETB Motor", pauseEtbControl
|
field = "Disable ETB Motor", pauseEtbControl
|
||||||
field = "H-Bridge #1 function", etbFunctions1
|
field = "H-Bridge #1 function", etbFunctions1
|
||||||
field = "H-Bridge #2 function", etbFunctions2
|
field = "H-Bridge #2 function", etbFunctions2
|
||||||
|
|
Loading…
Reference in New Issue