diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md index 65c6dd451a..f97ba3686a 100644 --- a/firmware/CHANGELOG.md +++ b/firmware/CHANGELOG.md @@ -42,6 +42,7 @@ Release template (copy/paste this for new release): - Injection Offset for skipped wheel triggers #4536 ### Removed + - Alternator on/off mode #4548 ## August 2022 Release - "Day 170" diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index cdff45a2a3..59b8784d71 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -22,7 +22,7 @@ bit needBurn; bit sd_msd bit isFan2On -bit alternatorOnOff; +bit unusedBitLAtwfs; bit toothLogReady; bit unused3123 bit isTpsError; diff --git a/firmware/controllers/actuators/alternator_controller.cpp b/firmware/controllers/actuators/alternator_controller.cpp index e44938629b..5e9be52e01 100644 --- a/firmware/controllers/actuators/alternator_controller.cpp +++ b/firmware/controllers/actuators/alternator_controller.cpp @@ -64,24 +64,6 @@ void AlternatorController::onFastCallback() { auto vBatt = Sensor::get(SensorType::BatteryVoltage); float targetVoltage = engineConfiguration->targetVBatt; - // todo: I am not aware of a SINGLE person to use this onOffAlternatorLogic - if (engineConfiguration->onOffAlternatorLogic) { - if (!vBatt) { - // Somehow battery voltage isn't valid, disable alternator control - enginePins.alternatorPin.setValue(false); - } - - float h = 0.1; - bool newState = (vBatt.Value < targetVoltage - h) || (currentPlainOnOffState && vBatt.Value < targetVoltage); - enginePins.alternatorPin.setValue(newState); - currentPlainOnOffState = newState; -#if EFI_TUNER_STUDIO - engine->outputChannels.alternatorOnOff = newState; -#endif /* EFI_TUNER_STUDIO */ - - return; - } - if (!vBatt) { // Somehow battery voltage isn't valid, disable alternator control alternatorPid.reset(); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 8f22266e8b..d2f5a34f9b 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -759,7 +759,7 @@ bit is_enabled_spi_2 bit useLcdScreen bit verboseTLE8888 bit enableVerboseCanTx;+CAN broadcast using custom rusEFI protocol\nenable can_broadcast/disable can_broadcast - bit onOffAlternatorLogic;+This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control. + bit unusedAlteOnOff bit isCJ125Enabled;enable cj125/disable cj125 bit vvtCamSensorUseRise,"Rising","Falling";+Use rise or fall signal front\nget vvtCamSensorUseRise bit measureMapOnlyInOneCylinder;+Useful for individual intakes diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index fe173844aa..7eb0db8a62 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3163,20 +3163,19 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button"