diff --git a/firmware/controllers/actuators/ac_control_generated.h b/firmware/controllers/actuators/ac_control_generated.h index 14072af05b..0381e8efc7 100644 --- a/firmware/controllers/actuators/ac_control_generated.h +++ b/firmware/controllers/actuators/ac_control_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 07:53:56 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 08:20:03 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -6,33 +6,33 @@ // start of ac_control_s struct ac_control_s { /** - * AC engine too slow + * @@INDICATOR_NAME_AC_SWITCH@@ offset 0 bit 0 */ + bool acButtonState : 1 {}; + /** + * AC enabled + offset 0 bit 1 */ + bool m_acEnabled : 1 {}; + /** + * AC engine too slow + offset 0 bit 2 */ bool engineTooSlow : 1 {}; /** * AC engine too fast - offset 0 bit 1 */ + offset 0 bit 3 */ bool engineTooFast : 1 {}; /** * AC no CLT - offset 0 bit 2 */ + offset 0 bit 4 */ bool noClt : 1 {}; /** * AC engine too hot - offset 0 bit 3 */ + offset 0 bit 5 */ bool engineTooHot : 1 {}; /** * AC tps too high - offset 0 bit 4 */ - bool tpsTooHigh : 1 {}; - /** - * AC enabled - offset 0 bit 5 */ - bool m_acEnabled : 1 {}; - /** - * @@INDICATOR_NAME_AC_SWITCH@@ offset 0 bit 6 */ - bool acButtonState : 1 {}; + bool tpsTooHigh : 1 {}; /** * AC disabled by Lua offset 0 bit 7 */ @@ -122,4 +122,4 @@ struct ac_control_s { static_assert(sizeof(ac_control_s) == 12); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 07:53:56 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 08:20:03 UTC 2022 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index 125e0c66fa..a3bad6cce1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Wed Jun 29 22:51:53 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jul 02 08:20:03 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -391,13 +391,13 @@ public class AcControl { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 0); - public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 1); - public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 2); - public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 3); - public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 4); - public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 5); - public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 6); + public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0); + public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1); + public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2); + public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3); + public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4); + public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5); + public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6); public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7); public static final Field UNUSEDBIT_8_8 = Field.create("UNUSEDBIT_8_8", 0, FieldType.BIT, 8); public static final Field UNUSEDBIT_8_9 = Field.create("UNUSEDBIT_8_9", 0, FieldType.BIT, 9); @@ -426,13 +426,13 @@ public class AcControl { public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0); public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0); public static final Field[] VALUES = { + ACBUTTONSTATE, + M_ACENABLED, ENGINETOOSLOW, ENGINETOOFAST, NOCLT, ENGINETOOHOT, TPSTOOHIGH, - M_ACENABLED, - ACBUTTONSTATE, ISDISABLEDBYLUA, UNUSEDBIT_8_8, UNUSEDBIT_8_9,