diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index b60c80b212..6bfa75ab7b 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -287,13 +287,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 3d80c13486..2c2b0a68ab 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -62,13 +62,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 09c9bd0ba4..ef156100f8 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -374,13 +374,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 diff --git a/firmware/controllers/actuators/ac_control_generated.h b/firmware/controllers/actuators/ac_control_generated.h index 14072af05b..0381e8efc7 100644 --- a/firmware/controllers/actuators/ac_control_generated.h +++ b/firmware/controllers/actuators/ac_control_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 07:53:56 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 08:20:03 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -6,33 +6,33 @@ // start of ac_control_s struct ac_control_s { /** - * AC engine too slow + * @@INDICATOR_NAME_AC_SWITCH@@ offset 0 bit 0 */ + bool acButtonState : 1 {}; + /** + * AC enabled + offset 0 bit 1 */ + bool m_acEnabled : 1 {}; + /** + * AC engine too slow + offset 0 bit 2 */ bool engineTooSlow : 1 {}; /** * AC engine too fast - offset 0 bit 1 */ + offset 0 bit 3 */ bool engineTooFast : 1 {}; /** * AC no CLT - offset 0 bit 2 */ + offset 0 bit 4 */ bool noClt : 1 {}; /** * AC engine too hot - offset 0 bit 3 */ + offset 0 bit 5 */ bool engineTooHot : 1 {}; /** * AC tps too high - offset 0 bit 4 */ - bool tpsTooHigh : 1 {}; - /** - * AC enabled - offset 0 bit 5 */ - bool m_acEnabled : 1 {}; - /** - * @@INDICATOR_NAME_AC_SWITCH@@ offset 0 bit 6 */ - bool acButtonState : 1 {}; + bool tpsTooHigh : 1 {}; /** * AC disabled by Lua offset 0 bit 7 */ @@ -122,4 +122,4 @@ struct ac_control_s { static_assert(sizeof(ac_control_s) == 12); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 07:53:56 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 08:20:03 UTC 2022 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index f413f1d3b6..4de239b0f6 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:59 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4817,13 +4817,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index f00c40ef47..98fa7e13e7 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:38 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4814,13 +4814,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 4b73aa42c0..0237d2d939 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:53:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:04 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4811,13 +4811,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 5907a09044..d030a6e26f 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:06 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4812,13 +4812,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index b171993590..0284cc355a 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:55 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4817,13 +4817,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 0446533bf4..af826906ba 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:36 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4814,13 +4814,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index ed122f1b2c..57b75b0f9d 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:52 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4817,13 +4817,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 8de6e7023c..192fc2cc5a 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:54 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4817,13 +4817,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index c590a426e2..0d4fd638f2 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:40 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4817,13 +4817,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index fa9c6949dd..cb95fd9f40 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:08 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 30d11dbe17..c8e9584c30 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:26 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 2308e03d3b..494f10d59e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:24 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 6c1de37367..3967b31dce 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:14 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 93de7ca8db..35e0d03b41 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:12 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index ca46ed3548..8b050ef4f7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:10 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 4f5ecabbe7..bbca6c1e5d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:16 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 0c040be96d..5cb27a5187 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:20 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 92bcc668a8..6d3cac7f61 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:22 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4812,13 +4812,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index fd2bca1dbf..86d24ce674 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:18 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 1dd509f392..efa0b248fc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:28 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index d5e96fdeec..1bfe2df87d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:30 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 117feba0f2..d4ff70bd65 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jul 02 07:55:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jul 02 08:21:03 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4817,13 +4817,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 41452458ba..c07a692942 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 02 07:55:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 02 08:21:01 UTC 2022 pageSize = 21272 page = 1 @@ -2446,13 +2446,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4077,13 +4077,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4778,13 +4778,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 8e5856d0b4..6789aabf1d 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:34 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4814,13 +4814,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index d28119eba7..bd2770961c 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:32 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4814,13 +4814,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a404635402..d9dbd4cb3c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:44 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4812,13 +4812,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 7f4163035f..a986276e86 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:42 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4812,13 +4812,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 41eef59f6b..849dfaf9fb 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:48 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4810,13 +4810,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 59a27b48ee..d2037741d1 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:46 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4810,13 +4810,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 1948087d25..3bb7112825 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:49 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4810,13 +4810,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 3abdee62b7..b1bf9444de 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Jul 02 07:55:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Jul 02 08:21:05 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4813,13 +4813,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 29026a4eba..71d2ff28f4 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 07:54:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 02 08:20:57 UTC 2022 pageSize = 21300 page = 1 @@ -2485,13 +2485,13 @@ openLoopPart = scalar, F32, 640, "", 1, 0 boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 ; total TS size = 648 -engineTooSlow = bits, U32, 648, [0:0] -engineTooFast = bits, U32, 648, [1:1] -noClt = bits, U32, 648, [2:2] -engineTooHot = bits, U32, 648, [3:3] -tpsTooHigh = bits, U32, 648, [4:4] -m_acEnabled = bits, U32, 648, [5:5] -acButtonState = bits, U32, 648, [6:6] +acButtonState = bits, U32, 648, [0:0] +m_acEnabled = bits, U32, 648, [1:1] +engineTooSlow = bits, U32, 648, [2:2] +engineTooFast = bits, U32, 648, [3:3] +noClt = bits, U32, 648, [4:4] +engineTooHot = bits, U32, 648, [5:5] +tpsTooHigh = bits, U32, 648, [6:6] isDisabledByLua = bits, U32, 648, [7:7] latest_usage_ac_control = scalar, S32, 652, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 @@ -4116,13 +4116,13 @@ entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" +entry = acButtonState, "AC switch", int, "%d" +entry = m_acEnabled, "AC enabled", int, "%d" entry = engineTooSlow, "AC engine too slow", int, "%d" entry = engineTooFast, "AC engine too fast", int, "%d" entry = noClt, "AC no CLT", int, "%d" entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -4817,13 +4817,13 @@ dialog = boost_controlDialog, "boost_control" graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 + indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" + indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" indicator = {noClt}, "noClt No", "noClt Yes" indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" dialog = ac_controlDialog, "ac_control" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index 125e0c66fa..a3bad6cce1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Wed Jun 29 22:51:53 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 08:20:03 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -391,13 +391,13 @@ public class AcControl { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 0); - public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 1); - public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 2); - public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 3); - public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 4); - public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 5); - public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 6); + public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0); + public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1); + public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2); + public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3); + public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4); + public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5); + public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6); public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7); public static final Field UNUSEDBIT_8_8 = Field.create("UNUSEDBIT_8_8", 0, FieldType.BIT, 8); public static final Field UNUSEDBIT_8_9 = Field.create("UNUSEDBIT_8_9", 0, FieldType.BIT, 9); @@ -426,13 +426,13 @@ public class AcControl { public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0); public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0); public static final Field[] VALUES = { + ACBUTTONSTATE, + M_ACENABLED, ENGINETOOSLOW, ENGINETOOFAST, NOCLT, ENGINETOOHOT, TPSTOOHIGH, - M_ACENABLED, - ACBUTTONSTATE, ISDISABLEDBYLUA, UNUSEDBIT_8_8, UNUSEDBIT_8_9,