diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 1f6532c184..3adab30fa4 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -14,12 +14,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -314,7 +312,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", 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 6ae38edcb0..af6678863f 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -63,6 +63,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 91449ec718..f729422b33 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -15,12 +15,12 @@ isFan2OnGauge = isFan2On,"isFan2On", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 alternatorOnOffGauge = alternatorOnOff,"alternatorOnOff", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 brakePedalStateGauge = brakePedalState,"brake: down", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 toothLogReadyGauge = toothLogReady,"toothLogReady", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -acSwitchStateGauge = acSwitchState,"AC switch", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unused3123Gauge = unused3123,"unused3123", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isTpsErrorGauge = isTpsError,"isTpsError", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isCltErrorGauge = isCltError,"isCltError", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isMapErrorGauge = isMapError,"isMapError", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isIatErrorGauge = isIatError,"isIatError", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -acStateGauge = acState,"acState", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unused131313Gauge = unused131313,"unused131313", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isTriggerErrorGauge = isTriggerError,"isTriggerError", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 hasCriticalErrorGauge = hasCriticalError,"hasCriticalError", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isWarnNowGauge = isWarnNow,"isWarnNow", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 1cba781c27..2508a6c280 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -15,12 +15,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -540,33 +540,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index e5a78e6e65..f2af376644 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun May 08 13:03:46 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon May 09 09:39:55 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -86,9 +86,8 @@ struct output_channels_s { offset 0 bit 16 */ bool toothLogReady : 1 {}; /** - * @@INDICATOR_NAME_AC_SWITCH@@ offset 0 bit 17 */ - bool acSwitchState : 1 {}; + bool unused3123 : 1 {}; /** offset 0 bit 18 */ bool isTpsError : 1 {}; @@ -103,7 +102,7 @@ struct output_channels_s { bool isIatError : 1 {}; /** offset 0 bit 22 */ - bool acState : 1 {}; + bool unused131313 : 1 {}; /** offset 0 bit 23 */ bool isTriggerError : 1 {}; @@ -1365,4 +1364,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 616); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun May 08 13:03:46 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon May 09 09:39:55 UTC 2022 diff --git a/firmware/controllers/actuators/ac_control_generated.h b/firmware/controllers/actuators/ac_control_generated.h index 72f75e7b0e..7128a41b76 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 Sun Apr 17 20:27:25 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon May 09 09:39:56 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -22,86 +22,87 @@ struct ac_control_s { bool tpsTooHigh : 1 {}; /** offset 0 bit 5 */ + bool m_acEnabled : 1 {}; + /** + * @@INDICATOR_NAME_AC_SWITCH@@ + offset 0 bit 6 */ bool acButtonState : 1 {}; /** * For setAcDisabled Lua method - offset 0 bit 6 */ + offset 0 bit 7 */ bool isDisabledByLua : 1 {}; /** - offset 0 bit 7 */ - bool unusedBit_7_7 : 1 {}; - /** offset 0 bit 8 */ - bool unusedBit_7_8 : 1 {}; + bool unusedBit_8_8 : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_7_9 : 1 {}; + bool unusedBit_8_9 : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_7_10 : 1 {}; + bool unusedBit_8_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_7_11 : 1 {}; + bool unusedBit_8_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_7_12 : 1 {}; + bool unusedBit_8_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_7_13 : 1 {}; + bool unusedBit_8_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_7_14 : 1 {}; + bool unusedBit_8_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_7_15 : 1 {}; + bool unusedBit_8_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_7_16 : 1 {}; + bool unusedBit_8_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_7_17 : 1 {}; + bool unusedBit_8_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_7_18 : 1 {}; + bool unusedBit_8_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_7_19 : 1 {}; + bool unusedBit_8_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_7_20 : 1 {}; + bool unusedBit_8_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_7_21 : 1 {}; + bool unusedBit_8_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_7_22 : 1 {}; + bool unusedBit_8_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_7_23 : 1 {}; + bool unusedBit_8_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_7_24 : 1 {}; + bool unusedBit_8_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_7_25 : 1 {}; + bool unusedBit_8_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_7_26 : 1 {}; + bool unusedBit_8_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_7_27 : 1 {}; + bool unusedBit_8_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_7_28 : 1 {}; + bool unusedBit_8_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_7_29 : 1 {}; + bool unusedBit_8_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_7_30 : 1 {}; + bool unusedBit_8_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_7_31 : 1 {}; + bool unusedBit_8_31 : 1 {}; /** * offset 4 */ @@ -114,4 +115,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 Sun Apr 17 20:27:25 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon May 09 09:39:56 UTC 2022 diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 15a178c1a5..ef828fcc44 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -32,8 +32,6 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.brakePedalState; if (strEqualCaseInsensitive(name, "toothLogReady")) return engine->outputChannels.toothLogReady; - if (strEqualCaseInsensitive(name, "acSwitchState")) - return engine->outputChannels.acSwitchState; if (strEqualCaseInsensitive(name, "isTpsError")) return engine->outputChannels.isTpsError; if (strEqualCaseInsensitive(name, "isCltError")) @@ -42,8 +40,6 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.isMapError; if (strEqualCaseInsensitive(name, "isIatError")) return engine->outputChannels.isIatError; - if (strEqualCaseInsensitive(name, "acState")) - return engine->outputChannels.acState; if (strEqualCaseInsensitive(name, "isTriggerError")) return engine->outputChannels.isTriggerError; if (strEqualCaseInsensitive(name, "hasCriticalError")) diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 2cadf8cc3a..1c0f8994c2 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -84,7 +84,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 Mon May 09 08:20:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:35 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5157,6 +5156,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index fa94fe9249..e4fc79e943 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -84,7 +84,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 Mon May 09 08:19:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:39:56 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5151,6 +5150,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 470ea60461..d2f81f98c4 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -84,7 +84,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 Mon May 09 08:19:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:39:58 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5152,6 +5151,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index cb5898c137..8739b44f1c 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -84,7 +84,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 Mon May 09 08:19:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:32 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5157,6 +5156,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index b84c5e8035..86b374d35d 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -84,7 +84,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 Mon May 09 08:19:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:20 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5154,6 +5153,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index d7f5bec567..a94beba421 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -84,7 +84,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 Mon May 09 08:19:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:31 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5157,6 +5156,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index d098636612..0f358ca08e 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -84,7 +84,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 Mon May 09 08:19:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:22 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5157,6 +5156,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 6779bc6df9..3214b58604 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -84,7 +84,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 Mon May 09 08:19:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:00 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 5566633fef..52e2517794 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -84,7 +84,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 Mon May 09 08:19:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:12 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 0fa5a503a0..575ae15611 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -84,7 +84,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 Mon May 09 08:19:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:04 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index afb4faed86..7dd8144894 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -84,7 +84,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 Mon May 09 08:19:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:03 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index d426225658..73242eb375 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -84,7 +84,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 Mon May 09 08:19:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:01 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index ebbb7cf8ff..aeaa10227e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -84,7 +84,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 Mon May 09 08:19:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:06 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 4328f9fa2f..3cbcd11f79 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -84,7 +84,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 Mon May 09 08:19:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:09 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index c962761487..6416d58ae5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -84,7 +84,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 Mon May 09 08:19:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:11 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5152,6 +5151,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 099051a1e5..68c69cb8d9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -84,7 +84,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 Mon May 09 08:19:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:07 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 2b95fbaa53..444b575ecb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -84,7 +84,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 Mon May 09 08:19:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:14 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 1f3aa5ab69..2d8eac73ad 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -84,7 +84,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 Mon May 09 08:19:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:15 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index a0d4259d91..b0e3411d32 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -84,7 +84,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 Mon May 09 08:20:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon May 09 09:40:38 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5157,6 +5156,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 787a70e455..6032ce65da 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -84,7 +84,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 Mon May 09 08:20:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon May 09 09:40:37 UTC 2022 pageSize = 21324 page = 1 @@ -2116,12 +2116,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2641,33 +2641,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4143,12 +4143,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4443,7 +4441,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5118,6 +5117,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 0df9b2f698..5674735f6a 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -84,7 +84,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 Mon May 09 08:19:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:18 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5154,6 +5153,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index ee8e29ffff..a91e2fb65c 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -84,7 +84,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 Mon May 09 08:19:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:17 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5154,6 +5153,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index ce708ad283..6f4d0de264 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -84,7 +84,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 Mon May 09 08:19:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:25 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5152,6 +5151,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index eb1ebdd7ca..0319ea7eba 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -84,7 +84,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 Mon May 09 08:19:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:23 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5152,6 +5151,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index fc1e1c24cd..3af34e01bf 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -84,7 +84,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 Mon May 09 08:19:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:28 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5150,6 +5149,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 2aba9b8d11..23cf078bb1 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -84,7 +84,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 Mon May 09 08:19:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:26 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5150,6 +5149,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 717d133c9f..57aaa4f613 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -84,7 +84,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 Mon May 09 08:19:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:29 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5150,6 +5149,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 83d849bf7c..6427e22162 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -84,7 +84,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 Mon May 09 08:20:05 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 Mon May 09 09:40:39 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5153,6 +5152,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 31b9f26dfe..aaf88640a1 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -84,7 +84,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 Mon May 09 08:20:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon May 09 09:40:34 UTC 2022 pageSize = 21352 page = 1 @@ -2155,12 +2155,12 @@ isFan2On = bits, U32, 0, [13:13] alternatorOnOff = bits, U32, 0, [14:14] brakePedalState = bits, U32, 0, [15:15] toothLogReady = bits, U32, 0, [16:16] -acSwitchState = bits, U32, 0, [17:17] +unused3123 = bits, U32, 0, [17:17] isTpsError = bits, U32, 0, [18:18] isCltError = bits, U32, 0, [19:19] isMapError = bits, U32, 0, [20:20] isIatError = bits, U32, 0, [21:21] -acState = bits, U32, 0, [22:22] +unused131313 = bits, U32, 0, [22:22] isTriggerError = bits, U32, 0, [23:23] hasCriticalError = bits, U32, 0, [24:24] isWarnNow = bits, U32, 0, [25:25] @@ -2680,33 +2680,33 @@ engineTooFast = bits, U32, 684, [1:1] noClt = bits, U32, 684, [2:2] engineTooHot = bits, U32, 684, [3:3] tpsTooHigh = bits, U32, 684, [4:4] -acButtonState = bits, U32, 684, [5:5] -isDisabledByLua = bits, U32, 684, [6:6] -unusedBit_7_7 = bits, U32, 684, [7:7] -unusedBit_7_8 = bits, U32, 684, [8:8] -unusedBit_7_9 = bits, U32, 684, [9:9] -unusedBit_7_10 = bits, U32, 684, [10:10] -unusedBit_7_11 = bits, U32, 684, [11:11] -unusedBit_7_12 = bits, U32, 684, [12:12] -unusedBit_7_13 = bits, U32, 684, [13:13] -unusedBit_7_14 = bits, U32, 684, [14:14] -unusedBit_7_15 = bits, U32, 684, [15:15] -unusedBit_7_16 = bits, U32, 684, [16:16] -unusedBit_7_17 = bits, U32, 684, [17:17] -unusedBit_7_18 = bits, U32, 684, [18:18] -unusedBit_7_19 = bits, U32, 684, [19:19] -unusedBit_7_20 = bits, U32, 684, [20:20] -unusedBit_7_21 = bits, U32, 684, [21:21] -unusedBit_7_22 = bits, U32, 684, [22:22] -unusedBit_7_23 = bits, U32, 684, [23:23] -unusedBit_7_24 = bits, U32, 684, [24:24] -unusedBit_7_25 = bits, U32, 684, [25:25] -unusedBit_7_26 = bits, U32, 684, [26:26] -unusedBit_7_27 = bits, U32, 684, [27:27] -unusedBit_7_28 = bits, U32, 684, [28:28] -unusedBit_7_29 = bits, U32, 684, [29:29] -unusedBit_7_30 = bits, U32, 684, [30:30] -unusedBit_7_31 = bits, U32, 684, [31:31] +m_acEnabled = bits, U32, 684, [5:5] +acButtonState = bits, U32, 684, [6:6] +isDisabledByLua = bits, U32, 684, [7:7] +unusedBit_8_8 = bits, U32, 684, [8:8] +unusedBit_8_9 = bits, U32, 684, [9:9] +unusedBit_8_10 = bits, U32, 684, [10:10] +unusedBit_8_11 = bits, U32, 684, [11:11] +unusedBit_8_12 = bits, U32, 684, [12:12] +unusedBit_8_13 = bits, U32, 684, [13:13] +unusedBit_8_14 = bits, U32, 684, [14:14] +unusedBit_8_15 = bits, U32, 684, [15:15] +unusedBit_8_16 = bits, U32, 684, [16:16] +unusedBit_8_17 = bits, U32, 684, [17:17] +unusedBit_8_18 = bits, U32, 684, [18:18] +unusedBit_8_19 = bits, U32, 684, [19:19] +unusedBit_8_20 = bits, U32, 684, [20:20] +unusedBit_8_21 = bits, U32, 684, [21:21] +unusedBit_8_22 = bits, U32, 684, [22:22] +unusedBit_8_23 = bits, U32, 684, [23:23] +unusedBit_8_24 = bits, U32, 684, [24:24] +unusedBit_8_25 = bits, U32, 684, [25:25] +unusedBit_8_26 = bits, U32, 684, [26:26] +unusedBit_8_27 = bits, U32, 684, [27:27] +unusedBit_8_28 = bits, U32, 684, [28:28] +unusedBit_8_29 = bits, U32, 684, [29:29] +unusedBit_8_30 = bits, U32, 684, [30:30] +unusedBit_8_31 = bits, U32, 684, [31:31] latest_usage_ac_control = scalar, S32, 688, "", 1, 0 acSwitchLastChangeTimeMs = scalar, S32, 692, "", 1, 0 ; total TS size = 696 @@ -4182,12 +4182,10 @@ entry = isFan2On, "isFan2On", int, "%d" entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = brakePedalState, "brake: down", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" -entry = acSwitchState, "AC switch", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" entry = isMapError, "isMapError", int, "%d" entry = isIatError, "isIatError", int, "%d" -entry = acState, "acState", int, "%d" entry = isTriggerError, "isTriggerError", int, "%d" entry = hasCriticalError, "hasCriticalError", int, "%d" entry = isWarnNow, "isWarnNow", int, "%d" @@ -4482,7 +4480,8 @@ entry = engineTooFast, "engineTooFast", int, "%d" entry = noClt, "noClt", int, "%d" entry = engineTooHot, "engineTooHot", int, "%d" entry = tpsTooHigh, "tpsTooHigh", int, "%d" -entry = acButtonState, "acButtonState", int, "%d" +entry = m_acEnabled, "m_acEnabled", int, "%d" +entry = acButtonState, "AC switch", int, "%d" entry = isDisabledByLua, "For setAcDisabled Lua method", int, "%d" entry = latest_usage_ac_control, "latest_usage_ac_control", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" @@ -5157,6 +5156,7 @@ indicatorPanel = ac_controlIndicatorPanel, 2 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" 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 870aa1b4fa..3b007a82be 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,43 +1,424 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\ac_control.txt Thu Apr 14 20:46:48 EDT 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon May 09 09:39:56 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class AcControl { + public static final int ADC_CHANNEL_NONE = 0; + public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; + public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; + public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; + public static final int AUX_ANALOG_INPUT_COUNT = 8; + public static final int AUX_DIGITAL_VALVE_COUNT = 2; + public static final int BANKS_COUNT = 2; + public static final int BARO_CORR_SIZE = 4; + public static final int BLOCKING_FACTOR = 256; + public static final int BOOST_LOAD_COUNT = 8; + public static final int BOOST_RPM_COUNT = 8; + public static final int CAM_INPUTS_COUNT = 4; + public static final int CAM_INPUTS_COUNT_padding = 0; + public static final int CAMS_PER_BANK = 2; + public static final int CAMS_PER_BANK_padding = 0; + public static final int CAN_DEFAULT_BASE = 0x200; + public static final int CAN_ECU_SERIAL_RX_ID = 0x100; + public static final int CAN_ECU_SERIAL_TX_ID = 0x102; + public static final String CAN_RX_PREFIX = "CAN_rx"; + public static final int CLT_CRANKING_CURVE_SIZE = 8; + public static final int CLT_CURVE_SIZE = 16; + public static final int CLT_LIMITER_CURVE_SIZE = 4; + public static final int CLT_TIMING_CURVE_SIZE = 8; + public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; + public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; + public static final String CMD_BOOST_PIN = "set_boost_pin"; + public static final String CMD_BURNCONFIG = "burnconfig"; + public static final String CMD_DATE = "date"; + public static final String CMD_DISABLE = "disable"; + public static final String CMD_ENABLE = "enable"; + public static final String CMD_ENGINE_TYPE = "engine_type"; + public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; + public static final String CMD_ETB_DUTY = "set_etb_duty"; + public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; + public static final String CMD_FAN2_BENCH = "fan2bench"; + public static final String CMD_FAN_BENCH = "fanbench"; + public static final String CMD_FUEL_BENCH = "fuelbench"; + public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; + public static final String CMD_GET = "get"; + public static final String CMD_HPFP_BENCH = "hpfpbench"; + public static final String CMD_IDLE_PIN = "set_idle_pin"; + public static final String CMD_IGNITION = "ignition"; + public static final String CMD_IGNITION_PIN = "set_ignition_pin"; + public static final String CMD_INJECTION = "injection"; + public static final String CMD_INJECTION_PIN = "set_injection_pin"; + public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; + public static final String CMD_MIL_BENCH = "milbench"; + public static final String CMD_PINS = "pins"; + public static final String CMD_PWM = "pwm"; + public static final String CMD_REBOOT = "reboot"; + public static final String CMD_REBOOT_DFU = "reboot_dfu"; + public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; + public static final String CMD_RPM = "rpm"; + public static final String CMD_SELF_STIMULATION = "self_stimulation"; + public static final String CMD_SET = "set"; + public static final String CMD_SPARK_BENCH = "sparkbench"; + public static final String CMD_STARTER_BENCH = "starterbench"; + public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; + public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; + public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; + public static final String CMD_TRIGGERINFO = "triggerinfo"; + public static final int CMD_TS_BENCH_CATEGORY = 22; + public static final int CMD_TS_LUA_OUTPUT_CATEGORY = 33; + public static final int CMD_TS_SOLENOID_CATEGORY = 41; + public static final int CMD_TS_X14 = 20; + public static final int CMD_TS_X31 = 49; + public static final String CMD_VSS_PIN = "vss_pin"; + public static final String CMD_WRITECONFIG = "writeconfig"; + public static final int COMPOSITE_DATA_LENGTH = 2500; + public static final int COMPOSITE_DATA_LENGTH_HALF = 1250; + public static final int COMPOSITE_PACKET_COUNT = 500; + public static final int COMPOSITE_PACKET_SIZE = 5; + public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; + public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; + public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; + public static final int CRANKING_CURVE_SIZE = 8; + public static final String CRITICAL_PREFIX = "CRITICAL"; + public static final int DC_PER_STEPPER = 2; + public static final int DIGIPOT_COUNT = 4; + public static final int DWELL_CURVE_SIZE = 8; + public static final int EGT_CHANNEL_COUNT = 8; + public static final String ENGINE_MAKE_BMW = "BMW"; + public static final String ENGINE_MAKE_GM = "GM"; + public static final String ENGINE_MAKE_HONDA = "Honda"; + public static final String ENGINE_MAKE_Hyundai = "Hyundai"; + public static final String ENGINE_MAKE_LADA = "Lada"; + public static final String ENGINE_MAKE_MAZDA = "Mazda"; + public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; + public static final String ENGINE_MAKE_NISSAN = "Nissan"; + public static final String ENGINE_MAKE_SUBARU = "Subaru"; + public static final String ENGINE_MAKE_TOYOTA = "Toyota"; + public static final String ENGINE_MAKE_VAG = "VAG"; + public static final int ENGINE_NOISE_CURVE_SIZE = 16; + public static final int ENGINE_SNIFFER_UNIT_US = 10; + public static final int ERROR_BUFFER_SIZE = 120; + public static final int ETB_BIAS_CURVE_LENGTH = 8; + public static final int ETB_COUNT = 2; + public static final int ETB_HW_MAX_FREQUENCY = 3000; + public static final int FLASH_DATA_VERSION = 10011; + public static final int FUEL_LEVEL_TABLE_COUNT = 8; + public static final int FUEL_LOAD_COUNT = 16; + public static final int FUEL_RPM_COUNT = 16; + public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; + public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; + public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; + public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; + public static final String GAUGE_NAME_ACCEL_YAW = "Acceleration: Yaw"; + public static final String GAUGE_NAME_ACCEL_Z = "Acceleration: Z"; + public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio"; + public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; + public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_MASS = "air mass"; + public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; + public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; + public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1"; + public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2"; + public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure"; + public static final String GAUGE_NAME_BOOST_CLOSED_LOOP = "Boost Closed Loop"; + public static final String GAUGE_NAME_BOOST_OPEN_LOOP = "Boost Open Loop"; + public static final String GAUGE_NAME_BOOST_OUTPUT = "Boost Output"; + public static final String GAUGE_NAME_BOOST_TARGET = "Boost Target"; + public static final String GAUGE_NAME_CLT = "CLT"; + public static final String GAUGE_NAME_CPU_TEMP = "CPU Temperature"; + public static final String GAUGE_NAME_CURRENT_GEAR = "Current Gear"; + public static final String GAUGE_NAME_DEBUG_F1 = "debug f1"; + public static final String GAUGE_NAME_DEBUG_F2 = "debug f2: iTerm"; + public static final String GAUGE_NAME_DEBUG_F3 = "debug f3: prevError"; + public static final String GAUGE_NAME_DEBUG_F4 = "debug f4: iParam"; + public static final String GAUGE_NAME_DEBUG_F5 = "debug f5: dParam"; + public static final String GAUGE_NAME_DEBUG_F6 = "debug f6: dTerm"; + public static final String GAUGE_NAME_DEBUG_F7 = "debug f7"; + public static final String GAUGE_NAME_DEBUG_I1 = "debug i1: pParam"; + public static final String GAUGE_NAME_DEBUG_I2 = "debug i2: offset"; + public static final String GAUGE_NAME_DEBUG_I3 = "debug i3"; + public static final String GAUGE_NAME_DEBUG_I4 = "debug i4"; + public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; + public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; + public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; + public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; + public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; + public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; + public static final String GAUGE_NAME_ETB_ERROR = "ETB position error"; + public static final String GAUGE_NAME_ETB_TARGET = "ETB position target"; + public static final String GAUGE_NAME_FLEX = "Flex Ethanol %"; + public static final String GAUGE_NAME_FUEL_BARO_CORR = "fuel: Barometric pressure correction"; + public static final String GAUGE_NAME_FUEL_BASE = "fuel: base mass"; + public static final String GAUGE_NAME_FUEL_CHARGE_TEMP = "fuel: Estimated charge temperature"; + public static final String GAUGE_NAME_FUEL_CLT_CORR = "fuel: CLT correction"; + public static final String GAUGE_NAME_FUEL_CONSUMPTION = "fuel: Total consumed"; + public static final String GAUGE_NAME_FUEL_CRANKING = "fuel: cranking"; + public static final String GAUGE_NAME_FUEL_EL_EXTRA = "fuel: engine load acceleration extra fuel"; + public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; + public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; + public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; + public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; + public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; + public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; + public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS = "bar"; + public static final String GAUGE_NAME_FUEL_PRESSURE_LOW = "Fuel pressure (low)"; + public static final String GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS = "kPa"; + public static final String GAUGE_NAME_FUEL_RUNNING = "fuel: running"; + public static final String GAUGE_NAME_FUEL_TPS_EXTRA = "fuel: TPS acceleration extra fuel ms"; + public static final String GAUGE_NAME_FUEL_TPS_ROC = "fuel: TPS change"; + public static final String GAUGE_NAME_FUEL_TRIM = "fuel: fuel trim"; + public static final String GAUGE_NAME_FUEL_TRIM_2 = "fuel: fuel trim 2"; + public static final String GAUGE_NAME_FUEL_VE = "fuel: VE"; + public static final String GAUGE_NAME_FUEL_WALL_AMOUNT = "fuel: wall amount"; + public static final String GAUGE_NAME_FUEL_WALL_CORRECTION = "fuel: wall correction"; + public static final String GAUGE_NAME_FW_VERSION = "ECU Software Version"; + public static final String GAUGE_NAME_GEAR_RATIO = "Gearbox Ratio"; + public static final String GAUGE_NAME_IAC = "Idle Air Valve"; + public static final String GAUGE_NAME_IAT = "IAT"; + public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; + public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; + public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; + public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; + public static final String GAUGE_NAME_KNOCK_10 = "knock 10"; + public static final String GAUGE_NAME_KNOCK_11 = "knock 11"; + public static final String GAUGE_NAME_KNOCK_12 = "knock 12"; + public static final String GAUGE_NAME_KNOCK_2 = "knock 2"; + public static final String GAUGE_NAME_KNOCK_3 = "knock 3"; + public static final String GAUGE_NAME_KNOCK_4 = "knock 4"; + public static final String GAUGE_NAME_KNOCK_5 = "knock 5"; + public static final String GAUGE_NAME_KNOCK_6 = "knock 6"; + public static final String GAUGE_NAME_KNOCK_7 = "knock 7"; + public static final String GAUGE_NAME_KNOCK_8 = "knock 8"; + public static final String GAUGE_NAME_KNOCK_9 = "knock 9"; + public static final String GAUGE_NAME_KNOCK_COUNTER = "knock: count"; + public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level"; + public static final String GAUGE_NAME_KNOCK_RETARD = "knock: retard"; + public static final String GAUGE_NAME_LAMBDA = "Lambda"; + public static final String GAUGE_NAME_LAMBDA2 = "Lambda 2"; + public static final String GAUGE_NAME_LAST_ERROR = "Last error"; + public static final String GAUGE_NAME_MAF = "MAF"; + public static final String GAUGE_NAME_MAP = "MAP"; + public static final String GAUGE_NAME_OIL_PRESSURE = "Oil Pressure"; + public static final String GAUGE_NAME_OIL_PRESSURE_UNITS = "kPa"; + public static final String GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH = "Fuel pressure raw (high)"; + public static final String GAUGE_NAME_RAW_FUEL_PRESSURE_LOW = "Fuel pressure raw (low)"; + public static final String GAUGE_NAME_RPM = "RPM"; + public static final String GAUGE_NAME_TARGET_AFR = "fuel: target AFR"; + public static final String GAUGE_NAME_TARGET_LAMBDA = "fuel: target lambda"; + public static final String GAUGE_NAME_TC_RATIO = "Torque Converter Ratio"; + public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; + public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; + public static final String GAUGE_NAME_TIME = "Time"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; + public static final String GAUGE_NAME_TPS = "TPS"; + public static final String GAUGE_NAME_TPS2 = "TPS2"; + public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; + public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; + public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; + public static final String GAUGE_NAME_UPTIME = "Uptime"; + public static final String GAUGE_NAME_VBAT = "VBatt"; + public static final String GAUGE_NAME_VERSION = "firmware"; + public static final String GAUGE_NAME_VVS = "Vehicle Speed"; + public static final String GAUGE_NAME_VVT_B1E = "VVT: bank 1 exhaust"; + public static final String GAUGE_NAME_VVT_B1I = "VVT: bank 1 intake"; + public static final String GAUGE_NAME_VVT_B2E = "VVT: bank 2 exhaust"; + public static final String GAUGE_NAME_VVT_B2I = "VVT: bank 2 intake"; + public static final String GAUGE_NAME_VVT_TARGET_B1E = "VVT: bank 1 exhaust target"; + public static final String GAUGE_NAME_VVT_TARGET_B1I = "VVT: bank 1 intake target"; + public static final String GAUGE_NAME_VVT_TARGET_B2E = "VVT: bank 2 exhaust target"; + public static final String GAUGE_NAME_VVT_TARGET_B2I = "VVT: bank 2 intake target"; + public static final String GAUGE_NAME_WARNING_COUNT = "Warning count"; + public static final String GAUGE_NAME_WARNING_COUNTER = "warning: counter"; + public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; + public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; + public static final int GEARS_COUNT = 8; + public static final int GPPWM_CHANNELS = 4; + public static final int GPPWM_LOAD_COUNT = 8; + public static final int GPPWM_NOTE_SIZE = 16; + public static final int GPPWM_RPM_COUNT = 8; + public static final int HPFP_COMPENSATION_SIZE = 10; + public static final int HPFP_DEADTIME_SIZE = 8; + public static final int HPFP_LOBE_PROFILE_SIZE = 16; + public static final int HPFP_TARGET_SIZE = 10; + public static final int HW_MAX_ADC_INDEX = 17; + public static final int IAC_PID_MULT_SIZE = 8; + public static final int IAT_CURVE_SIZE = 16; + public static final int IDLE_ADVANCE_CURVE_SIZE = 8; + public static final int IDLE_VE_SIZE = 4; + public static final int IGN_LOAD_COUNT = 16; + public static final int IGN_RPM_COUNT = 16; + public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; + public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; + public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; + public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; + public static final int LE_COMMAND_LENGTH = 200; + public static final String LOG_DELIMITER = "`"; + public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; + public static final int LUA_ANALOG_INPUT_COUNT = 8; + public static final int LUA_PWM_COUNT = 8; + public static final int LUA_SCRIPT_SIZE = 8000; + public static final int MAF_DECODING_COUNT = 256; + public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; + public static final int MAP_ANGLE_SIZE = 8; + public static final int MAP_WINDOW_SIZE = 8; + public static final int MAX_CYLINDER_COUNT = 12; + public static final int MLQ_FIELD_HEADER_SIZE = 55; + public static final int MLQ_HEADER_SIZE = 22; + public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; + public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; + public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; + public static final int PACK_ADD_TEMPERATURE = 40; + public static final int PACK_MULT_AFR = 1000; + public static final int PACK_MULT_AFR_CFG = 10; + public static final int PACK_MULT_ANGLE = 50; + public static final int PACK_MULT_FUEL_FLOW = 200; + public static final int PACK_MULT_FUEL_MASS = 100; + public static final int PACK_MULT_HIGH_PRESSURE = 10; + public static final int PACK_MULT_LAMBDA = 10000; + public static final int PACK_MULT_LAMBDA_CFG = 147; + public static final int PACK_MULT_MASS_FLOW = 10; + public static final int PACK_MULT_MS = 300; + public static final int PACK_MULT_PERCENT = 100; + public static final int PACK_MULT_PRESSURE = 30; + public static final int PACK_MULT_TEMPERATURE = 100; + public static final int PACK_MULT_VOLTAGE = 1000; + public static final int PEDAL_TO_TPS_SIZE = 8; + public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; + public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; + public static final String PROTOCOL_CRANK1 = "t1"; + public static final String PROTOCOL_CRANK2 = "t2"; + public static final String PROTOCOL_CRANK3 = "t3"; + public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; + public static final String PROTOCOL_ES_DOWN = "d"; + public static final String PROTOCOL_ES_UP = "u"; + public static final String PROTOCOL_HELLO_PREFIX = "***"; + public static final String PROTOCOL_HIP_NAME = "HIP"; + public static final String PROTOCOL_HPFP_NAME = "hpfp"; + public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; + public static final String PROTOCOL_MSG = "msg"; + public static final String PROTOCOL_OUTPIN = "outpin"; + public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; + public static final String PROTOCOL_TACH_NAME = "tach"; + public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; + public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; + public static final String PROTOCOL_VVT1_NAME = "VVT1"; + public static final String PROTOCOL_VVT2_NAME = "VVT2"; + public static final String PROTOCOL_VVT3_NAME = "VVT3"; + public static final String PROTOCOL_VVT4_NAME = "VVT4"; + public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; + public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; + public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; + public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; + public static final int RPM_1_BYTE_PACKING_MULT = 50; + public static final int SCRIPT_CURVE_16 = 16; + public static final int SCRIPT_CURVE_8 = 8; + public static final int SCRIPT_CURVE_COUNT = 6; + public static final int SCRIPT_SETTING_COUNT = 8; + public static final int SCRIPT_TABLE_8 = 8; + public static final int SCRIPT_TABLE_COUNT = 4; + public static final int SERVO_COUNT = 8; + public static final int STFT_BANK_COUNT = 2; + public static final int STFT_CELL_COUNT = 4; + public static final int TCU_GEAR_COUNT = 10; + public static final int TCU_SOLENOID_COUNT = 6; + public static final int TOOTH_DATA_LENGTH = 2000; + public static final int TOOTH_PACKET_COUNT = 1000; + public static final int TOOTH_PACKET_SIZE = 2; + public static final String TOP_DEAD_CENTER_MESSAGE = "r"; + public static final int TORQUE_CURVE_SIZE = 6; + public static final int TPS_2_BYTE_PACKING_MULT = 100; + public static final int TPS_TPS_ACCEL_TABLE = 8; + public static final String TRIGGER_COMMENT = "#"; + public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; + public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; + public static final int TRIGGER_INPUT_PIN_COUNT = 3; + public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; + public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final String TRIGGERS_FILE_NAME = "triggers.txt"; + public static final int TRIM_SIZE = 4; + public static final char TS_BURN_COMMAND = 'B'; + public static final char TS_CHUNK_WRITE_COMMAND = 'C'; + public static final char TS_COMMAND_F = 'F'; + public static final int TS_COMPOSITE_DISABLE = 2; + public static final int TS_COMPOSITE_ENABLE = 1; + public static final char TS_CRC_CHECK_COMMAND = 'k'; + public static final char TS_EXECUTE = 'E'; + public static final int TS_FILE_VERSION = 20210312; + public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; + public static final char TS_GET_CONFIG_ERROR = 'e'; + public static final char TS_GET_FIRMWARE_VERSION = 'V'; + public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; + public static final char TS_GET_OUTPUTS_SIZE = '4'; + public static final char TS_GET_STRUCT = '9'; + public static final char TS_GET_TEXT = 'G'; + public static final char TS_HELLO_COMMAND = 'S'; + public static final char TS_IO_TEST_COMMAND = 'Z'; + public static final char TS_ONLINE_PROTOCOL = 'z'; + public static final char TS_OUTPUT_COMMAND = 'O'; + public static final char TS_PAGE_COMMAND = 'P'; + public static final char TS_PERF_TRACE_BEGIN = '_'; + public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; + public static final String TS_PROTOCOL = "001"; + public static final char TS_QUERY_COMMAND = 'Q'; + public static final char TS_READ_COMMAND = 'R'; + public static final int TS_RESPONSE_BURN_OK = 4; + public static final int TS_RESPONSE_COMMAND_OK = 7; + public static final int TS_RESPONSE_CRC_FAILURE = 0x82; + public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; + public static final int TS_RESPONSE_OK = 0; + public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; + public static final int TS_RESPONSE_UNDERRUN = 0x80; + public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; + public static final char TS_SET_LOGGER_SWITCH = 'l'; + public static final char TS_SINGLE_WRITE_COMMAND = 'W'; + public static final char TS_TEST_COMMAND = 't'; + public static final int VBAT_INJECTOR_CURVE_SIZE = 8; + public static final int VEHICLE_INFO_SIZE = 32; + 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 ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 5); - public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 6); - public static final Field UNUSEDBIT_7_7 = Field.create("UNUSEDBIT_7_7", 0, FieldType.BIT, 7); - public static final Field UNUSEDBIT_7_8 = Field.create("UNUSEDBIT_7_8", 0, FieldType.BIT, 8); - public static final Field UNUSEDBIT_7_9 = Field.create("UNUSEDBIT_7_9", 0, FieldType.BIT, 9); - public static final Field UNUSEDBIT_7_10 = Field.create("UNUSEDBIT_7_10", 0, FieldType.BIT, 10); - public static final Field UNUSEDBIT_7_11 = Field.create("UNUSEDBIT_7_11", 0, FieldType.BIT, 11); - public static final Field UNUSEDBIT_7_12 = Field.create("UNUSEDBIT_7_12", 0, FieldType.BIT, 12); - public static final Field UNUSEDBIT_7_13 = Field.create("UNUSEDBIT_7_13", 0, FieldType.BIT, 13); - public static final Field UNUSEDBIT_7_14 = Field.create("UNUSEDBIT_7_14", 0, FieldType.BIT, 14); - public static final Field UNUSEDBIT_7_15 = Field.create("UNUSEDBIT_7_15", 0, FieldType.BIT, 15); - public static final Field UNUSEDBIT_7_16 = Field.create("UNUSEDBIT_7_16", 0, FieldType.BIT, 16); - public static final Field UNUSEDBIT_7_17 = Field.create("UNUSEDBIT_7_17", 0, FieldType.BIT, 17); - public static final Field UNUSEDBIT_7_18 = Field.create("UNUSEDBIT_7_18", 0, FieldType.BIT, 18); - public static final Field UNUSEDBIT_7_19 = Field.create("UNUSEDBIT_7_19", 0, FieldType.BIT, 19); - public static final Field UNUSEDBIT_7_20 = Field.create("UNUSEDBIT_7_20", 0, FieldType.BIT, 20); - public static final Field UNUSEDBIT_7_21 = Field.create("UNUSEDBIT_7_21", 0, FieldType.BIT, 21); - public static final Field UNUSEDBIT_7_22 = Field.create("UNUSEDBIT_7_22", 0, FieldType.BIT, 22); - public static final Field UNUSEDBIT_7_23 = Field.create("UNUSEDBIT_7_23", 0, FieldType.BIT, 23); - public static final Field UNUSEDBIT_7_24 = Field.create("UNUSEDBIT_7_24", 0, FieldType.BIT, 24); - public static final Field UNUSEDBIT_7_25 = Field.create("UNUSEDBIT_7_25", 0, FieldType.BIT, 25); - public static final Field UNUSEDBIT_7_26 = Field.create("UNUSEDBIT_7_26", 0, FieldType.BIT, 26); - public static final Field UNUSEDBIT_7_27 = Field.create("UNUSEDBIT_7_27", 0, FieldType.BIT, 27); - public static final Field UNUSEDBIT_7_28 = Field.create("UNUSEDBIT_7_28", 0, FieldType.BIT, 28); - public static final Field UNUSEDBIT_7_29 = Field.create("UNUSEDBIT_7_29", 0, FieldType.BIT, 29); - public static final Field UNUSEDBIT_7_30 = Field.create("UNUSEDBIT_7_30", 0, FieldType.BIT, 30); - public static final Field UNUSEDBIT_7_31 = Field.create("UNUSEDBIT_7_31", 0, FieldType.BIT, 31); + 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 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); + public static final Field UNUSEDBIT_8_10 = Field.create("UNUSEDBIT_8_10", 0, FieldType.BIT, 10); + public static final Field UNUSEDBIT_8_11 = Field.create("UNUSEDBIT_8_11", 0, FieldType.BIT, 11); + public static final Field UNUSEDBIT_8_12 = Field.create("UNUSEDBIT_8_12", 0, FieldType.BIT, 12); + public static final Field UNUSEDBIT_8_13 = Field.create("UNUSEDBIT_8_13", 0, FieldType.BIT, 13); + public static final Field UNUSEDBIT_8_14 = Field.create("UNUSEDBIT_8_14", 0, FieldType.BIT, 14); + public static final Field UNUSEDBIT_8_15 = Field.create("UNUSEDBIT_8_15", 0, FieldType.BIT, 15); + public static final Field UNUSEDBIT_8_16 = Field.create("UNUSEDBIT_8_16", 0, FieldType.BIT, 16); + public static final Field UNUSEDBIT_8_17 = Field.create("UNUSEDBIT_8_17", 0, FieldType.BIT, 17); + public static final Field UNUSEDBIT_8_18 = Field.create("UNUSEDBIT_8_18", 0, FieldType.BIT, 18); + public static final Field UNUSEDBIT_8_19 = Field.create("UNUSEDBIT_8_19", 0, FieldType.BIT, 19); + public static final Field UNUSEDBIT_8_20 = Field.create("UNUSEDBIT_8_20", 0, FieldType.BIT, 20); + public static final Field UNUSEDBIT_8_21 = Field.create("UNUSEDBIT_8_21", 0, FieldType.BIT, 21); + public static final Field UNUSEDBIT_8_22 = Field.create("UNUSEDBIT_8_22", 0, FieldType.BIT, 22); + public static final Field UNUSEDBIT_8_23 = Field.create("UNUSEDBIT_8_23", 0, FieldType.BIT, 23); + public static final Field UNUSEDBIT_8_24 = Field.create("UNUSEDBIT_8_24", 0, FieldType.BIT, 24); + public static final Field UNUSEDBIT_8_25 = Field.create("UNUSEDBIT_8_25", 0, FieldType.BIT, 25); + public static final Field UNUSEDBIT_8_26 = Field.create("UNUSEDBIT_8_26", 0, FieldType.BIT, 26); + public static final Field UNUSEDBIT_8_27 = Field.create("UNUSEDBIT_8_27", 0, FieldType.BIT, 27); + public static final Field UNUSEDBIT_8_28 = Field.create("UNUSEDBIT_8_28", 0, FieldType.BIT, 28); + public static final Field UNUSEDBIT_8_29 = Field.create("UNUSEDBIT_8_29", 0, FieldType.BIT, 29); + public static final Field UNUSEDBIT_8_30 = Field.create("UNUSEDBIT_8_30", 0, FieldType.BIT, 30); + public static final Field UNUSEDBIT_8_31 = Field.create("UNUSEDBIT_8_31", 0, FieldType.BIT, 31); 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 = { @@ -46,33 +427,33 @@ public class AcControl { NOCLT, ENGINETOOHOT, TPSTOOHIGH, + M_ACENABLED, ACBUTTONSTATE, ISDISABLEDBYLUA, - UNUSEDBIT_7_7, - UNUSEDBIT_7_8, - UNUSEDBIT_7_9, - UNUSEDBIT_7_10, - UNUSEDBIT_7_11, - UNUSEDBIT_7_12, - UNUSEDBIT_7_13, - UNUSEDBIT_7_14, - UNUSEDBIT_7_15, - UNUSEDBIT_7_16, - UNUSEDBIT_7_17, - UNUSEDBIT_7_18, - UNUSEDBIT_7_19, - UNUSEDBIT_7_20, - UNUSEDBIT_7_21, - UNUSEDBIT_7_22, - UNUSEDBIT_7_23, - UNUSEDBIT_7_24, - UNUSEDBIT_7_25, - UNUSEDBIT_7_26, - UNUSEDBIT_7_27, - UNUSEDBIT_7_28, - UNUSEDBIT_7_29, - UNUSEDBIT_7_30, - UNUSEDBIT_7_31, + UNUSEDBIT_8_8, + UNUSEDBIT_8_9, + UNUSEDBIT_8_10, + UNUSEDBIT_8_11, + UNUSEDBIT_8_12, + UNUSEDBIT_8_13, + UNUSEDBIT_8_14, + UNUSEDBIT_8_15, + UNUSEDBIT_8_16, + UNUSEDBIT_8_17, + UNUSEDBIT_8_18, + UNUSEDBIT_8_19, + UNUSEDBIT_8_20, + UNUSEDBIT_8_21, + UNUSEDBIT_8_22, + UNUSEDBIT_8_23, + UNUSEDBIT_8_24, + UNUSEDBIT_8_25, + UNUSEDBIT_8_26, + UNUSEDBIT_8_27, + UNUSEDBIT_8_28, + UNUSEDBIT_8_29, + UNUSEDBIT_8_30, + UNUSEDBIT_8_31, LATEST_USAGE_AC_CONTROL, ACSWITCHLASTCHANGETIMEMS, }; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 932aed067f..cc52f6607f 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun May 08 13:03:46 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon May 09 09:39:55 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -404,12 +404,12 @@ public class TsOutputs { public static final Field ALTERNATORONOFF = Field.create("ALTERNATORONOFF", 0, FieldType.BIT, 14); public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 0, FieldType.BIT, 15); public static final Field TOOTHLOGREADY = Field.create("TOOTHLOGREADY", 0, FieldType.BIT, 16); - public static final Field ACSWITCHSTATE = Field.create("ACSWITCHSTATE", 0, FieldType.BIT, 17); + public static final Field UNUSED3123 = Field.create("UNUSED3123", 0, FieldType.BIT, 17); public static final Field ISTPSERROR = Field.create("ISTPSERROR", 0, FieldType.BIT, 18); public static final Field ISCLTERROR = Field.create("ISCLTERROR", 0, FieldType.BIT, 19); public static final Field ISMAPERROR = Field.create("ISMAPERROR", 0, FieldType.BIT, 20); public static final Field ISIATERROR = Field.create("ISIATERROR", 0, FieldType.BIT, 21); - public static final Field ACSTATE = Field.create("ACSTATE", 0, FieldType.BIT, 22); + public static final Field UNUSED131313 = Field.create("UNUSED131313", 0, FieldType.BIT, 22); public static final Field ISTRIGGERERROR = Field.create("ISTRIGGERERROR", 0, FieldType.BIT, 23); public static final Field HASCRITICALERROR = Field.create("HASCRITICALERROR", 0, FieldType.BIT, 24); public static final Field ISWARNNOW = Field.create("ISWARNNOW", 0, FieldType.BIT, 25); @@ -827,12 +827,12 @@ public class TsOutputs { ALTERNATORONOFF, BRAKEPEDALSTATE, TOOTHLOGREADY, - ACSWITCHSTATE, + UNUSED3123, ISTPSERROR, ISCLTERROR, ISMAPERROR, ISIATERROR, - ACSTATE, + UNUSED131313, ISTRIGGERERROR, HASCRITICALERROR, ISWARNNOW,