diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt
index 3fcc2debb0..4f05b1d5ee 100644
--- a/firmware/console/binary/output_channels.txt
+++ b/firmware/console/binary/output_channels.txt
@@ -1,6 +1,6 @@
 ! units,scale,offset,min,max,digits
 
-struct_no_prefix ts_outputs_s
+struct_no_prefix output_channels_s
 
 bit sd_present
 bit isIgnitionEnabledIndicator;
diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/output_channels_generated.h
similarity index 98%
rename from firmware/console/binary/ts_outputs_generated.h
rename to firmware/console/binary/output_channels_generated.h
index 8e995b4463..a3cef755ba 100644
--- a/firmware/console/binary/ts_outputs_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 Thu Apr 07 13:26:35 UTC 2022
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Thu Apr 14 20:51:56 EDT 2022
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -28,8 +28,8 @@ struct pid_status_s {
 	/** total size 12*/
 };
 
-// start of ts_outputs_s
-struct ts_outputs_s {
+// start of output_channels_s
+struct output_channels_s {
 	/**
 	offset 0 bit 0 */
 	bool sd_present : 1 {};
@@ -1391,4 +1391,4 @@ struct ts_outputs_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Apr 07 13:26:35 UTC 2022
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Thu Apr 14 20:51:56 EDT 2022
diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h
index b4206d45fa..1735ec5a5e 100644
--- a/firmware/console/binary/tunerstudio_outputs.h
+++ b/firmware/console/binary/tunerstudio_outputs.h
@@ -12,7 +12,7 @@
 
 #include "rusefi_types.h"
 #include "scaled_channel.h"
-#include "ts_outputs_generated.h"
+#include "output_channels_generated.h"
 
 #ifndef WITH_TS_STATE
 // do we ever see a case of compiling without TSOutputChannels? Shall we wipe out all '#if EFI_TUNER_STUDIO' or replace with '#if WITH_TS_STATE'
@@ -30,4 +30,4 @@
  * see also [OutputChannels] in rusefi.input
  * see also TS_OUTPUT_SIZE in rusefi_config.txt
  */
-struct TunerStudioOutputChannels : ts_outputs_s { };
+struct TunerStudioOutputChannels : output_channels_s { };
diff --git a/firmware/controllers/trigger/trigger_central.txt b/firmware/controllers/trigger/trigger_central.txt
index 12482f5bff..585ea2eb26 100644
--- a/firmware/controllers/trigger/trigger_central.txt
+++ b/firmware/controllers/trigger/trigger_central.txt
@@ -1,3 +1,4 @@
+#define HW_EVENT_TYPES 6
 
 struct_no_prefix trigger_central_s
 
diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/controllers/trigger/trigger_central_generated.h
index 52ef8d46e0..59033ae377 100644
--- a/firmware/controllers/trigger/trigger_central_generated.h
+++ b/firmware/controllers/trigger/trigger_central_generated.h
@@ -1,8 +1,9 @@
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger\trigger_central.txt Thu Apr 14 15:43:13 EDT 2022
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger\trigger_central.txt Thu Apr 14 20:48:21 EDT 2022
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
 #include "rusefi_types.h"
+#define HW_EVENT_TYPES 6
 // start of trigger_central_s
 struct trigger_central_s {
 	/**
@@ -18,4 +19,4 @@ struct trigger_central_s {
 };
 
 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger\trigger_central.txt Thu Apr 14 15:43:13 EDT 2022
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger\trigger_central.txt Thu Apr 14 20:48:21 EDT 2022
diff --git a/firmware/gen_output_channels.sh b/firmware/gen_output_channels.sh
index 942410d576..d931124cd8 100755
--- a/firmware/gen_output_channels.sh
+++ b/firmware/gen_output_channels.sh
@@ -4,7 +4,4 @@ java -DSystemOut.name=logs/gen_output_channels \
  -jar ../java_tools/ConfigDefinition.jar \
  -prepend integration/rusefi_config.txt \
  -definition console/binary/output_channels.txt \
- -output_lookup_file controllers/lua/generated/output_lookup_generated.cpp \
- -ts_outputs_section console/binary/ \
- -with_c_defines false \
- -c_destination console/binary/ts_outputs_generated.h
\ No newline at end of file
+ -output_lookup_file controllers/lua/generated/output_lookup_generated.cpp
diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml
index b752420b4f..db12f47cad 100644
--- a/firmware/integration/LiveData.yaml
+++ b/firmware/integration/LiveData.yaml
@@ -3,6 +3,7 @@
 # see gen_live_documentation.sh
 #
 Usages:
+  output_channels: ["TsOutputs.java", "console/binary", "-prepend=integration/rusefi_config.txt" ]
   high_pressure_fuel_pump: [ "HighPressureFuelPump.java", "controllers/engine_cycle" ]
   injector_model: [ "InjectorModel.java", "controllers/algo/fuel" ]
   launch_control_state: [ "LaunchControl.java", "controllers/algo" ]
@@ -15,7 +16,7 @@ Usages:
   #pid_state: [ "PidState.java", "util/math" ]
   engine_state: [ "EngineState.java", "controllers/algo" ]
   tps_accel_state: [ "TpsAccelState.java", "controllers/algo" ]
-  trigger_central: [ "TriggerCentral.java", "controllers/trigger" ]
+  trigger_central: [ "TriggerCentral.java", "controllers/trigger", "-with_c_defines=true" ]
   trigger_state: [ "TriggerState.java", "controllers/trigger" ]
   wall_fuel_state: [ "WallFuelState.java", "controllers/algo" ]
   idle_state: [ "IdleState.java", "controllers/actuators" ]
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index ff52ce7c6c..69364c5c74 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -79,8 +79,6 @@
 !
 #define TS_OUTPUT_SIZE 640
 
-#define HW_EVENT_TYPES 6
-
 !
 ! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
 ! so not forget to change fileVersion in rusefi.ini
diff --git a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java
index 37b03584a9..e7cb98d42e 100644
--- a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java
+++ b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java
@@ -4,6 +4,7 @@ package com.rusefi.enums;
 
 
 public enum live_data_e {
+	LDS_output_channels,
 	LDS_high_pressure_fuel_pump,
 	LDS_injector_model,
 	LDS_launch_control_state,
diff --git a/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java b/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java
index 4e72e43796..0c9bf8f5cd 100644
--- a/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java
+++ b/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java
@@ -1,5 +1,6 @@
 package com.rusefi.ldmp;
 
+import com.rusefi.OutputChannel;
 import com.rusefi.config.Field;
 import com.rusefi.config.generated.*;
 import com.rusefi.enums.live_data_e;
@@ -23,10 +24,11 @@ public enum StateDictionary {
         // LDS_CJ125_PID
         //register(live_data_e.LDS_IDLE, IdleState.VALUES);
         // todo: code generate this!
-        register(live_data_e.LDS_engine_state, EngineState.VALUES, "engine"); // 3
+        register(live_data_e.LDS_output_channels, TsOutputs.VALUES, "output_channels");
+        register(live_data_e.LDS_engine_state, EngineState.VALUES, "engine");
         register(live_data_e.LDS_trigger_central, TriggerCentral.VALUES, "trigger_central");
-        register(live_data_e.LDS_trigger_state, TriggerState.VALUES, "trigger_decoder"); // 11
-        register(live_data_e.LDS_ac_control, AcControl.VALUES, "ac_control"); // 12
+        register(live_data_e.LDS_trigger_state, TriggerState.VALUES, "trigger_decoder");
+        register(live_data_e.LDS_ac_control, AcControl.VALUES, "ac_control");
         register(live_data_e.LDS_fan_control, FuelPump.VALUES, "fan_control");
         register(live_data_e.LDS_injector_model, InjectorModel.VALUES, "injector_model");
         register(live_data_e.LDS_idle_state, IdleState.VALUES, "idle_thread");
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 b09bfed80c..870aa1b4fa 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,394 +1,11 @@
 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 15:45:20 EDT 2022
+// 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
 
 // 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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java
index e14c0bdbc8..fc1484c6f0 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\boost_control.txt Thu Apr 14 15:45:19 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\boost_control.txt Thu Apr 14 20:46:48 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class BoostControl {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0);
 	public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1);
 	public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java
index bed7031e86..82db347dfd 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\electronic_throttle.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\electronic_throttle.txt Thu Apr 14 20:48:22 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class ElectronicThrottle {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT);
 	public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT);
 	public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java
index 8747714672..9e5d8880d9 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\engine_state.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\engine_state.txt Thu Apr 14 20:46:48 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class EngineState {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 ISTCHARGEAIRMODEL = Field.create("ISTCHARGEAIRMODEL", 0, FieldType.BIT, 0);
 	public static final Field UNUSEDBIT_1_1 = Field.create("UNUSEDBIT_1_1", 0, FieldType.BIT, 1);
 	public static final Field UNUSEDBIT_1_2 = Field.create("UNUSEDBIT_1_2", 0, FieldType.BIT, 2);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java
index 1b149029b1..a34fc7ef55 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\fan_control.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\fan_control.txt Thu Apr 14 20:46:48 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class FanControl {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0);
 	public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1);
 	public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java
index cb54f399c7..4560a8cfed 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\fuel_pump_control.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\fuel_pump_control.txt Thu Apr 14 20:46:48 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class FuelPump {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0);
 	public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1);
 	public static final Field ISPUMPON = Field.create("ISPUMPON", 0, FieldType.BIT, 2);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java b/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java
index b533505ab6..e0a6cd6b89 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle\high_pressure_fuel_pump.txt Thu Apr 14 15:45:19 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle\high_pressure_fuel_pump.txt Thu Apr 14 20:46:48 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class HighPressureFuelPump {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 M_REQUESTED_PUMP = Field.create("M_REQUESTED_PUMP", 0, FieldType.FLOAT);
 	public static final Field FUEL_REQUESTED_PERCENT = Field.create("FUEL_REQUESTED_PERCENT", 4, FieldType.FLOAT);
 	public static final Field FUEL_REQUESTED_PERCENT_PI = Field.create("FUEL_REQUESTED_PERCENT_PI", 8, FieldType.FLOAT);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java
index 722ffcd4fd..e4815aca77 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\idle_state.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\idle_state.txt Thu Apr 14 20:48:22 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class IdleState {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0);
 	public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT);
 	public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java
index ab75b03b34..ecafbc336c 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\ignition_state.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\ignition_state.txt Thu Apr 14 20:48:22 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class IgnitionState {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT);
 	public static final Field DWELLVOLTAGECORRECTION = Field.create("DWELLVOLTAGECORRECTION", 4, FieldType.FLOAT);
 	public static final Field[] VALUES = {
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java b/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java
index 4b7018a58f..bb642c4685 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel\injector_model.txt Thu Apr 14 15:45:19 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel\injector_model.txt Thu Apr 14 20:46:48 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class InjectorModel {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 M_DEADTIME = Field.create("M_DEADTIME", 0, FieldType.FLOAT);
 	public static final Field PRESSUREDELTA = Field.create("PRESSUREDELTA", 4, FieldType.FLOAT);
 	public static final Field PRESSURERATIO = Field.create("PRESSURERATIO", 8, FieldType.FLOAT);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java
index 7dbc1b2995..13cc02d67b 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\launch_control_state.txt Thu Apr 14 15:45:19 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\launch_control_state.txt Thu Apr 14 20:46:48 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class LaunchControl {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0);
 	public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0);
 	public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java
index 9e376e3c35..8fe5841f45 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\main_relay.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\main_relay.txt Thu Apr 14 20:46:48 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class MainRelay {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0);
 	public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1);
 	public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java
index 915374217f..a3c5329a8b 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\tps_accel_state.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\tps_accel_state.txt Thu Apr 14 20:46:48 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class TpsAccelState {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT);
 	public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT);
 	public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java
index baa2f8cf3a..3a94432e00 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java
@@ -1,394 +1,12 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger\trigger_central.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger\trigger_central.txt Thu Apr 14 20:48:21 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class TriggerCentral {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0);
 	public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0);
 	public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0);
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java
index 5c78527338..e1c81a6cfc 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger\trigger_state.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger\trigger_state.txt Thu Apr 14 20:48:22 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class TriggerState {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 CURRENTGAP = Field.create("CURRENTGAP", 0, FieldType.FLOAT);
 	public static final Field TOTALREVOLUTIONCOUNTER = Field.create("TOTALREVOLUTIONCOUNTER", 4, FieldType.INT).setScale(1.0);
 	public static final Field[] VALUES = {
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
new file mode 100644
index 0000000000..d30869cc6a
--- /dev/null
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java
@@ -0,0 +1,1255 @@
+package com.rusefi.config.generated;
+
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Thu Apr 14 20:48:21 EDT 2022
+
+// by class com.rusefi.output.FileJavaFieldsConsumer
+import com.rusefi.config.*;
+
+public class TsOutputs {
+	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_FSIO_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 = 8;
+	public static final int ENGINE_SNIFFER_UNIT_US = 10;
+	public static final int ENUM_16_BITS = 60000;
+	public static final int ENUM_32_BITS = 2000000000;
+	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 = 10009;
+	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_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: counter";
+	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
+	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_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_MAP_ESTIMATE = 100;
+	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 = 20200310;
+	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 int TS_OUTPUT_SIZE = 640;
+	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 SD_PRESENT = Field.create("SD_PRESENT", 0, FieldType.BIT, 0);
+	public static final Field ISIGNITIONENABLEDINDICATOR = Field.create("ISIGNITIONENABLEDINDICATOR", 0, FieldType.BIT, 1);
+	public static final Field ISINJECTIONENABLEDINDICATOR = Field.create("ISINJECTIONENABLEDINDICATOR", 0, FieldType.BIT, 2);
+	public static final Field SD_LOGGING_INTERNAL = Field.create("SD_LOGGING_INTERNAL", 0, FieldType.BIT, 3);
+	public static final Field UNUSEDB4 = Field.create("UNUSEDB4", 0, FieldType.BIT, 4);
+	public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 5);
+	public static final Field ISFANON = Field.create("ISFANON", 0, FieldType.BIT, 6);
+	public static final Field ISO2HEATERON = Field.create("ISO2HEATERON", 0, FieldType.BIT, 7);
+	public static final Field CHECKENGINE = Field.create("CHECKENGINE", 0, FieldType.BIT, 8);
+	public static final Field NEEDBURN = Field.create("NEEDBURN", 0, FieldType.BIT, 9);
+	public static final Field SD_MSD = Field.create("SD_MSD", 0, FieldType.BIT, 10);
+	public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 0, FieldType.BIT, 11);
+	public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 0, FieldType.BIT, 12);
+	public static final Field ISFAN2ON = Field.create("ISFAN2ON", 0, FieldType.BIT, 13);
+	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 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 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);
+	public static final Field ISPEDALERROR = Field.create("ISPEDALERROR", 0, FieldType.BIT, 26);
+	public static final Field ISKNOCKCHIPOK = Field.create("ISKNOCKCHIPOK", 0, FieldType.BIT, 27);
+	public static final Field LAUNCHTRIGGERED = Field.create("LAUNCHTRIGGERED", 0, FieldType.BIT, 28);
+	public static final Field ISTPS2ERROR = Field.create("ISTPS2ERROR", 0, FieldType.BIT, 29);
+	public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 0, FieldType.BIT, 30);
+	public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 0, FieldType.BIT, 31);
+	public static final Field RPMVALUE = Field.create("RPMVALUE", 4, FieldType.INT16).setScale(1.0);
+	public static final Field RPMACCELERATION = Field.create("RPMACCELERATION", 6, FieldType.INT16).setScale(1.0);
+	public static final Field SPEEDTORPMRATIO = Field.create("SPEEDTORPMRATIO", 8, FieldType.INT16).setScale(0.01);
+	public static final Field VEHICLESPEEDKPH = Field.create("VEHICLESPEEDKPH", 10, FieldType.INT8).setScale(1.0);
+	public static final Field INTERNALMCUTEMPERATURE = Field.create("INTERNALMCUTEMPERATURE", 11, FieldType.INT8).setScale(1.0);
+	public static final Field COOLANT = Field.create("COOLANT", 12, FieldType.INT16).setScale(0.01);
+	public static final Field INTAKE = Field.create("INTAKE", 14, FieldType.INT16).setScale(0.01);
+	public static final Field AUXTEMP1 = Field.create("AUXTEMP1", 16, FieldType.INT16).setScale(0.01);
+	public static final Field AUXTEMP2 = Field.create("AUXTEMP2", 18, FieldType.INT16).setScale(0.01);
+	public static final Field TPSVALUE = Field.create("TPSVALUE", 20, FieldType.INT16).setScale(0.01);
+	public static final Field THROTTLEPEDALPOSITION = Field.create("THROTTLEPEDALPOSITION", 22, FieldType.INT16).setScale(0.01);
+	public static final Field TPSADC = Field.create("TPSADC", 24, FieldType.INT16).setScale(1.0);
+	public static final Field RAWMAF = Field.create("RAWMAF", 26, FieldType.INT16).setScale(0.001);
+	public static final Field MAFMEASURED = Field.create("MAFMEASURED", 28, FieldType.INT16).setScale(0.1);
+	public static final Field MAPVALUE = Field.create("MAPVALUE", 30, FieldType.INT16).setScale(0.03333333333333333);
+	public static final Field BAROPRESSURE = Field.create("BAROPRESSURE", 32, FieldType.INT16).setScale(0.03333333333333333);
+	public static final Field LAMBDAVALUE = Field.create("LAMBDAVALUE", 34, FieldType.INT16).setScale(1.0E-4);
+	public static final Field KNOCKRETARD = Field.create("KNOCKRETARD", 36, FieldType.INT8).setScale(0.1);
+	public static final Field IDLECURRENTPOSITION = Field.create("IDLECURRENTPOSITION", 37, FieldType.INT8).setScale(0.5);
+	public static final Field VBATT = Field.create("VBATT", 38, FieldType.INT16).setScale(0.001);
+	public static final Field OILPRESSURE = Field.create("OILPRESSURE", 40, FieldType.INT16).setScale(0.03333333333333333);
+	public static final Field VVTPOSITIONB1I = Field.create("VVTPOSITIONB1I", 42, FieldType.INT16).setScale(0.02);
+	public static final Field CHARGEAIRMASS = Field.create("CHARGEAIRMASS", 44, FieldType.INT16).setScale(0.001);
+	public static final Field CRANKINGFUELMS = Field.create("CRANKINGFUELMS", 46, FieldType.INT16).setScale(0.01);
+	public static final Field CURRENTTARGETAFR = Field.create("CURRENTTARGETAFR", 48, FieldType.INT16).setScale(0.001);
+	public static final Field BASEFUEL = Field.create("BASEFUEL", 50, FieldType.INT16).setScale(0.01);
+	public static final Field FUELRUNNING = Field.create("FUELRUNNING", 52, FieldType.INT16).setScale(0.01);
+	public static final Field ACTUALLASTINJECTION = Field.create("ACTUALLASTINJECTION", 54, FieldType.INT16).setScale(0.0033333333333333335);
+	public static final Field INJECTORDUTYCYCLE = Field.create("INJECTORDUTYCYCLE", 56, FieldType.INT8).setScale(0.5);
+	public static final Field VEVALUE = Field.create("VEVALUE", 57, FieldType.INT8).setScale(0.5);
+	public static final Field INJECTIONOFFSET = Field.create("INJECTIONOFFSET", 58, FieldType.INT16).setScale(1.0);
+	public static final Field TCHARGE = Field.create("TCHARGE", 60, FieldType.INT16).setScale(0.01);
+	public static final Field INJECTORLAGMS = Field.create("INJECTORLAGMS", 62, FieldType.INT16).setScale(0.0033333333333333335);
+	public static final Field IATCORRECTION = Field.create("IATCORRECTION", 64, FieldType.INT16).setScale(0.01);
+	public static final Field CLTCORRECTION = Field.create("CLTCORRECTION", 66, FieldType.INT16).setScale(0.01);
+	public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 68, FieldType.INT16).setScale(0.01);
+	public static final Field CURRENTENGINEPHASE = Field.create("CURRENTENGINEPHASE", 70, FieldType.INT16).setScale(1.0);
+	public static final Field WALLFUELAMOUNT = Field.create("WALLFUELAMOUNT", 72, FieldType.INT16).setScale(0.01);
+	public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 74, FieldType.INT16).setScale(0.01);
+	public static final Field REVOLUTIONCOUNTERSINCESTART = Field.create("REVOLUTIONCOUNTERSINCESTART", 76, FieldType.INT16).setScale(1.0);
+	public static final Field DELTATPS = Field.create("DELTATPS", 78, FieldType.INT16).setScale(0.01);
+	public static final Field CANREADCOUNTER = Field.create("CANREADCOUNTER", 80, FieldType.INT16).setScale(1.0);
+	public static final Field TPSACCELFUEL = Field.create("TPSACCELFUEL", 82, FieldType.INT16).setScale(0.0033333333333333335);
+	public static final Field IGNITIONADVANCE = Field.create("IGNITIONADVANCE", 84, FieldType.INT16).setScale(0.02);
+	public static final Field SPARKDWELLVALUE = Field.create("SPARKDWELLVALUE", 86, FieldType.INT16).setScale(0.0033333333333333335);
+	public static final Field COILDUTYCYCLE = Field.create("COILDUTYCYCLE", 88, FieldType.INT16).setScale(0.01);
+	public static final Field IDLEAIRVALVEPOSITION = Field.create("IDLEAIRVALVEPOSITION", 90, FieldType.INT16).setScale(0.01);
+	public static final Field ETBTARGET = Field.create("ETBTARGET", 92, FieldType.INT16).setScale(0.01);
+	public static final Field ETB1DUTYCYCLE = Field.create("ETB1DUTYCYCLE", 94, FieldType.INT16).setScale(0.01);
+	public static final Field ETB1ERROR = Field.create("ETB1ERROR", 96, FieldType.INT16).setScale(0.01);
+	public static final Field FUELTANKLEVEL = Field.create("FUELTANKLEVEL", 98, FieldType.INT16).setScale(0.01);
+	public static final Field TOTALFUELCONSUMPTION = Field.create("TOTALFUELCONSUMPTION", 100, FieldType.INT16).setScale(1.0);
+	public static final Field FUELFLOWRATE = Field.create("FUELFLOWRATE", 102, FieldType.INT16).setScale(0.005);
+	public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 104, FieldType.INT16).setScale(0.01);
+	public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 106, FieldType.INT16).setScale(0.01);
+	public static final Field KNOCKLEVEL = Field.create("KNOCKLEVEL", 108, FieldType.FLOAT);
+	public static final Field SECONDS = Field.create("SECONDS", 112, FieldType.INT).setScale(1.0);
+	public static final Field ENGINEMODE = Field.create("ENGINEMODE", 116, FieldType.INT).setScale(1.0);
+	public static final Field FIRMWAREVERSION = Field.create("FIRMWAREVERSION", 120, FieldType.INT).setScale(1.0);
+	public static final Field TSCONFIGVERSION = Field.create("TSCONFIGVERSION", 124, FieldType.INT).setScale(1.0);
+	public static final Field CALIBRATIONVALUE = Field.create("CALIBRATIONVALUE", 128, FieldType.FLOAT);
+	public static final Field CALIBRATIONMODE = Field.create("CALIBRATIONMODE", 132, FieldType.INT8).setScale(1.0);
+	public static final Field IDLETARGETPOSITION = Field.create("IDLETARGETPOSITION", 133, FieldType.INT8).setScale(1.0);
+	public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 134, FieldType.INT16).setScale(0.01);
+	public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 136, FieldType.INT16).setScale(0.01);
+	public static final Field ENGINEMAKECODENAMECRC16 = Field.create("ENGINEMAKECODENAMECRC16", 138, FieldType.INT16).setScale(1.0);
+	public static final Field TOTALTRIGGERERRORCOUNTER = Field.create("TOTALTRIGGERERRORCOUNTER", 140, FieldType.INT).setScale(1.0);
+	public static final Field ORDERINGERRORCOUNTER = Field.create("ORDERINGERRORCOUNTER", 144, FieldType.INT).setScale(1.0);
+	public static final Field WARNINGCOUNTER = Field.create("WARNINGCOUNTER", 148, FieldType.INT16).setScale(1.0);
+	public static final Field LASTERRORCODE = Field.create("LASTERRORCODE", 150, FieldType.INT16).setScale(1.0);
+	public static final Field RECENTERRORCODE1 = Field.create("RECENTERRORCODE1", 152, FieldType.INT16).setScale(1.0);
+	public static final Field RECENTERRORCODE2 = Field.create("RECENTERRORCODE2", 154, FieldType.INT16).setScale(1.0);
+	public static final Field RECENTERRORCODE3 = Field.create("RECENTERRORCODE3", 156, FieldType.INT16).setScale(1.0);
+	public static final Field RECENTERRORCODE4 = Field.create("RECENTERRORCODE4", 158, FieldType.INT16).setScale(1.0);
+	public static final Field RECENTERRORCODE5 = Field.create("RECENTERRORCODE5", 160, FieldType.INT16).setScale(1.0);
+	public static final Field RECENTERRORCODE6 = Field.create("RECENTERRORCODE6", 162, FieldType.INT16).setScale(1.0);
+	public static final Field RECENTERRORCODE7 = Field.create("RECENTERRORCODE7", 164, FieldType.INT16).setScale(1.0);
+	public static final Field RECENTERRORCODE8 = Field.create("RECENTERRORCODE8", 166, FieldType.INT16).setScale(1.0);
+	public static final Field DEBUGFLOATFIELD1 = Field.create("DEBUGFLOATFIELD1", 168, FieldType.FLOAT);
+	public static final Field DEBUGFLOATFIELD2 = Field.create("DEBUGFLOATFIELD2", 172, FieldType.FLOAT);
+	public static final Field DEBUGFLOATFIELD3 = Field.create("DEBUGFLOATFIELD3", 176, FieldType.FLOAT);
+	public static final Field DEBUGFLOATFIELD4 = Field.create("DEBUGFLOATFIELD4", 180, FieldType.FLOAT);
+	public static final Field DEBUGFLOATFIELD5 = Field.create("DEBUGFLOATFIELD5", 184, FieldType.FLOAT);
+	public static final Field DEBUGFLOATFIELD6 = Field.create("DEBUGFLOATFIELD6", 188, FieldType.FLOAT);
+	public static final Field DEBUGFLOATFIELD7 = Field.create("DEBUGFLOATFIELD7", 192, FieldType.FLOAT);
+	public static final Field DEBUGINTFIELD1 = Field.create("DEBUGINTFIELD1", 196, FieldType.INT).setScale(1.0);
+	public static final Field DEBUGINTFIELD2 = Field.create("DEBUGINTFIELD2", 200, FieldType.INT).setScale(1.0);
+	public static final Field DEBUGINTFIELD3 = Field.create("DEBUGINTFIELD3", 204, FieldType.INT).setScale(1.0);
+	public static final Field DEBUGINTFIELD4 = Field.create("DEBUGINTFIELD4", 208, FieldType.INT16).setScale(1.0);
+	public static final Field DEBUGINTFIELD5 = Field.create("DEBUGINTFIELD5", 210, FieldType.INT16).setScale(1.0);
+	public static final Field ACCELERATIONX = Field.create("ACCELERATIONX", 212, FieldType.INT16).setScale(0.01);
+	public static final Field ACCELERATIONY = Field.create("ACCELERATIONY", 214, FieldType.INT16).setScale(0.01);
+	public static final Field EGT1 = Field.create("EGT1", 216, FieldType.INT16).setScale(1.0);
+	public static final Field EGT2 = Field.create("EGT2", 218, FieldType.INT16).setScale(1.0);
+	public static final Field EGT3 = Field.create("EGT3", 220, FieldType.INT16).setScale(1.0);
+	public static final Field EGT4 = Field.create("EGT4", 222, FieldType.INT16).setScale(1.0);
+	public static final Field EGT5 = Field.create("EGT5", 224, FieldType.INT16).setScale(1.0);
+	public static final Field EGT6 = Field.create("EGT6", 226, FieldType.INT16).setScale(1.0);
+	public static final Field EGT7 = Field.create("EGT7", 228, FieldType.INT16).setScale(1.0);
+	public static final Field EGT8 = Field.create("EGT8", 230, FieldType.INT16).setScale(1.0);
+	public static final Field TPS2VALUE = Field.create("TPS2VALUE", 232, FieldType.INT16).setScale(0.01);
+	public static final Field RAWTPS1PRIMARY = Field.create("RAWTPS1PRIMARY", 234, FieldType.INT16).setScale(0.001);
+	public static final Field RAWPPSPRIMARY = Field.create("RAWPPSPRIMARY", 236, FieldType.INT16).setScale(0.001);
+	public static final Field RAWCLT = Field.create("RAWCLT", 238, FieldType.INT16).setScale(0.001);
+	public static final Field RAWIAT = Field.create("RAWIAT", 240, FieldType.INT16).setScale(0.001);
+	public static final Field RAWOILPRESSURE = Field.create("RAWOILPRESSURE", 242, FieldType.INT16).setScale(0.001);
+	public static final Field TUNECRC16 = Field.create("TUNECRC16", 244, FieldType.INT16).setScale(1.0);
+	public static final Field FUELCLOSEDLOOPBINIDX = Field.create("FUELCLOSEDLOOPBINIDX", 246, FieldType.INT8).setScale(1.0);
+	public static final Field TCUCURRENTGEAR = Field.create("TCUCURRENTGEAR", 247, FieldType.INT8).setScale(1.0);
+	public static final Field RAWPPSSECONDARY = Field.create("RAWPPSSECONDARY", 248, FieldType.INT16).setScale(0.001);
+	public static final Field KNOCK1 = Field.create("KNOCK1", 250, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK2 = Field.create("KNOCK2", 251, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK3 = Field.create("KNOCK3", 252, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK4 = Field.create("KNOCK4", 253, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK5 = Field.create("KNOCK5", 254, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK6 = Field.create("KNOCK6", 255, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK7 = Field.create("KNOCK7", 256, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK8 = Field.create("KNOCK8", 257, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK9 = Field.create("KNOCK9", 258, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK10 = Field.create("KNOCK10", 259, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK11 = Field.create("KNOCK11", 260, FieldType.INT8).setScale(1.0);
+	public static final Field KNOCK12 = Field.create("KNOCK12", 261, FieldType.INT8).setScale(1.0);
+	public static final Field TCUDESIREDGEAR = Field.create("TCUDESIREDGEAR", 262, FieldType.INT8).setScale(1.0);
+	public static final Field FLEXPERCENT = Field.create("FLEXPERCENT", 263, FieldType.INT8).setScale(0.5);
+	public static final Field RAWIDLEPOSITIONSENSOR = Field.create("RAWIDLEPOSITIONSENSOR", 264, FieldType.INT16).setScale(0.001);
+	public static final Field RAWWASTEGATEPOSITION = Field.create("RAWWASTEGATEPOSITION", 266, FieldType.INT16).setScale(0.001);
+	public static final Field WASTEGATEPOSITIONSENSOR = Field.create("WASTEGATEPOSITIONSENSOR", 268, FieldType.INT16).setScale(0.01);
+	public static final Field IDLEPOSITIONSENSOR = Field.create("IDLEPOSITIONSENSOR", 270, FieldType.INT16).setScale(0.01);
+	public static final Field RAWLOWFUELPRESSURE = Field.create("RAWLOWFUELPRESSURE", 272, FieldType.INT16).setScale(0.001);
+	public static final Field RAWHIGHFUELPRESSURE = Field.create("RAWHIGHFUELPRESSURE", 274, FieldType.INT16).setScale(0.001);
+	public static final Field LOWFUELPRESSURE = Field.create("LOWFUELPRESSURE", 276, FieldType.INT16).setScale(0.03333333333333333);
+	public static final Field HIGHFUELPRESSURE = Field.create("HIGHFUELPRESSURE", 278, FieldType.INT16).setScale(0.1);
+	public static final Field TARGETLAMBDA = Field.create("TARGETLAMBDA", 280, FieldType.INT16).setScale(1.0E-4);
+	public static final Field AFRVALUE = Field.create("AFRVALUE", 282, FieldType.INT16).setScale(0.001);
+	public static final Field VSSACCELERATION = Field.create("VSSACCELERATION", 284, FieldType.INT16).setScale(0.0033333333333333335);
+	public static final Field LAMBDAVALUE2 = Field.create("LAMBDAVALUE2", 286, FieldType.INT16).setScale(1.0E-4);
+	public static final Field AFRVALUE2 = Field.create("AFRVALUE2", 288, FieldType.INT16).setScale(0.001);
+	public static final Field VVTPOSITIONB1E = Field.create("VVTPOSITIONB1E", 290, FieldType.INT16).setScale(0.02);
+	public static final Field VVTPOSITIONB2I = Field.create("VVTPOSITIONB2I", 292, FieldType.INT16).setScale(0.02);
+	public static final Field VVTPOSITIONB2E = Field.create("VVTPOSITIONB2E", 294, FieldType.INT16).setScale(0.02);
+	public static final Field FUELPIDCORRECTION1 = Field.create("FUELPIDCORRECTION1", 296, FieldType.INT16).setScale(0.01);
+	public static final Field FUELPIDCORRECTION2 = Field.create("FUELPIDCORRECTION2", 298, FieldType.INT16).setScale(0.01);
+	public static final Field RAWTPS1SECONDARY = Field.create("RAWTPS1SECONDARY", 300, FieldType.INT16).setScale(0.001);
+	public static final Field RAWTPS2PRIMARY = Field.create("RAWTPS2PRIMARY", 302, FieldType.INT16).setScale(0.001);
+	public static final Field RAWTPS2SECONDARY = Field.create("RAWTPS2SECONDARY", 304, FieldType.INT16).setScale(0.001);
+	public static final Field KNOCKCOUNT = Field.create("KNOCKCOUNT", 306, FieldType.INT16).setScale(1.0);
+	public static final Field ACCELERATIONZ = Field.create("ACCELERATIONZ", 308, FieldType.INT16).setScale(0.01);
+	public static final Field ACCELERATIONROLL = Field.create("ACCELERATIONROLL", 310, FieldType.INT16).setScale(0.01);
+	public static final Field ACCELERATIONYAW = Field.create("ACCELERATIONYAW", 312, FieldType.INT16).setScale(0.01);
+	public static final Field VVTTARGETS1 = Field.create("VVTTARGETS1", 314, FieldType.INT8).setScale(1.0);
+	public static final Field VVTTARGETS2 = Field.create("VVTTARGETS2", 315, FieldType.INT8).setScale(1.0);
+	public static final Field VVTTARGETS3 = Field.create("VVTTARGETS3", 316, FieldType.INT8).setScale(1.0);
+	public static final Field VVTTARGETS4 = Field.create("VVTTARGETS4", 317, FieldType.INT8).setScale(1.0);
+	public static final Field TURBOSPEED = Field.create("TURBOSPEED", 318, FieldType.INT16).setScale(1.0);
+	public static final Field WBTEMPERATURE1 = Field.create("WBTEMPERATURE1", 320, FieldType.INT16).setScale(1.0);
+	public static final Field WBTEMPERATURE2 = Field.create("WBTEMPERATURE2", 322, FieldType.INT16).setScale(1.0);
+	public static final Field WBHEATERDUTY1 = Field.create("WBHEATERDUTY1", 324, FieldType.INT8).setScale(1.0);
+	public static final Field WBHEATERDUTY2 = Field.create("WBHEATERDUTY2", 325, FieldType.INT8).setScale(1.0);
+	public static final Field TPS1SPLIT = Field.create("TPS1SPLIT", 326, FieldType.INT16).setScale(0.01);
+	public static final Field TPS2SPLIT = Field.create("TPS2SPLIT", 328, FieldType.INT16).setScale(0.01);
+	public static final Field TPS12SPLIT = Field.create("TPS12SPLIT", 330, FieldType.INT16).setScale(0.01);
+	public static final Field ACCPEDALSPLIT = Field.create("ACCPEDALSPLIT", 332, FieldType.INT16).setScale(0.01);
+	public static final Field M_REQUESTED_PUMP = Field.create("M_REQUESTED_PUMP", 334, FieldType.INT16).setScale(0.02);
+	public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 336, FieldType.INT16).setScale(0.03333333333333333);
+	public static final Field SPARKCUTREASON = Field.create("SPARKCUTREASON", 338, FieldType.INT8).setScale(1.0);
+	public static final Field FUELCUTREASON = Field.create("FUELCUTREASON", 339, FieldType.INT8).setScale(1.0);
+	public static final Field FUEL_REQUESTED_PERCENT = Field.create("FUEL_REQUESTED_PERCENT", 340, FieldType.FLOAT);
+	public static final Field FUEL_REQUESTED_PERCENT_PI = Field.create("FUEL_REQUESTED_PERCENT_PI", 344, FieldType.FLOAT);
+	public static final Field M_I_SUM_PERCENT = Field.create("M_I_SUM_PERCENT", 348, FieldType.FLOAT);
+	public static final Field M_PRESSURETARGET_KPA = Field.create("M_PRESSURETARGET_KPA", 352, FieldType.FLOAT);
+	public static final Field MAFESTIMATE = Field.create("MAFESTIMATE", 356, FieldType.INT16).setScale(0.1);
+	public static final Field INSTANTRPM = Field.create("INSTANTRPM", 358, FieldType.INT16).setScale(1.0);
+	public static final Field DI_NEXTSTART = Field.create("DI_NEXTSTART", 360, FieldType.FLOAT);
+	public static final Field SYSTEMEVENTREUSE = Field.create("SYSTEMEVENTREUSE", 364, FieldType.INT16).setScale(1.0);
+	public static final Field RAWMAP = Field.create("RAWMAP", 366, FieldType.INT16).setScale(0.001);
+	public static final Field RAWAFR = Field.create("RAWAFR", 368, FieldType.INT16).setScale(0.001);
+	public static final Field TPSACCELFROM = Field.create("TPSACCELFROM", 370, FieldType.INT8).setScale(1.0);
+	public static final Field TPSACCELTO = Field.create("TPSACCELTO", 371, FieldType.INT8).setScale(1.0);
+	public static final Field CALIBRATIONVALUE2 = Field.create("CALIBRATIONVALUE2", 372, FieldType.FLOAT);
+	public static final Field ISMAINRELAYON = Field.create("ISMAINRELAYON", 376, FieldType.BIT, 0);
+	public static final Field ISUSBCONNECTED = Field.create("ISUSBCONNECTED", 376, FieldType.BIT, 1);
+	public static final Field UNUSEDBIT_182_2 = Field.create("UNUSEDBIT_182_2", 376, FieldType.BIT, 2);
+	public static final Field UNUSEDBIT_182_3 = Field.create("UNUSEDBIT_182_3", 376, FieldType.BIT, 3);
+	public static final Field UNUSEDBIT_182_4 = Field.create("UNUSEDBIT_182_4", 376, FieldType.BIT, 4);
+	public static final Field UNUSEDBIT_182_5 = Field.create("UNUSEDBIT_182_5", 376, FieldType.BIT, 5);
+	public static final Field UNUSEDBIT_182_6 = Field.create("UNUSEDBIT_182_6", 376, FieldType.BIT, 6);
+	public static final Field UNUSEDBIT_182_7 = Field.create("UNUSEDBIT_182_7", 376, FieldType.BIT, 7);
+	public static final Field UNUSEDBIT_182_8 = Field.create("UNUSEDBIT_182_8", 376, FieldType.BIT, 8);
+	public static final Field UNUSEDBIT_182_9 = Field.create("UNUSEDBIT_182_9", 376, FieldType.BIT, 9);
+	public static final Field UNUSEDBIT_182_10 = Field.create("UNUSEDBIT_182_10", 376, FieldType.BIT, 10);
+	public static final Field UNUSEDBIT_182_11 = Field.create("UNUSEDBIT_182_11", 376, FieldType.BIT, 11);
+	public static final Field UNUSEDBIT_182_12 = Field.create("UNUSEDBIT_182_12", 376, FieldType.BIT, 12);
+	public static final Field UNUSEDBIT_182_13 = Field.create("UNUSEDBIT_182_13", 376, FieldType.BIT, 13);
+	public static final Field UNUSEDBIT_182_14 = Field.create("UNUSEDBIT_182_14", 376, FieldType.BIT, 14);
+	public static final Field UNUSEDBIT_182_15 = Field.create("UNUSEDBIT_182_15", 376, FieldType.BIT, 15);
+	public static final Field UNUSEDBIT_182_16 = Field.create("UNUSEDBIT_182_16", 376, FieldType.BIT, 16);
+	public static final Field UNUSEDBIT_182_17 = Field.create("UNUSEDBIT_182_17", 376, FieldType.BIT, 17);
+	public static final Field UNUSEDBIT_182_18 = Field.create("UNUSEDBIT_182_18", 376, FieldType.BIT, 18);
+	public static final Field UNUSEDBIT_182_19 = Field.create("UNUSEDBIT_182_19", 376, FieldType.BIT, 19);
+	public static final Field UNUSEDBIT_182_20 = Field.create("UNUSEDBIT_182_20", 376, FieldType.BIT, 20);
+	public static final Field UNUSEDBIT_182_21 = Field.create("UNUSEDBIT_182_21", 376, FieldType.BIT, 21);
+	public static final Field UNUSEDBIT_182_22 = Field.create("UNUSEDBIT_182_22", 376, FieldType.BIT, 22);
+	public static final Field UNUSEDBIT_182_23 = Field.create("UNUSEDBIT_182_23", 376, FieldType.BIT, 23);
+	public static final Field UNUSEDBIT_182_24 = Field.create("UNUSEDBIT_182_24", 376, FieldType.BIT, 24);
+	public static final Field UNUSEDBIT_182_25 = Field.create("UNUSEDBIT_182_25", 376, FieldType.BIT, 25);
+	public static final Field UNUSEDBIT_182_26 = Field.create("UNUSEDBIT_182_26", 376, FieldType.BIT, 26);
+	public static final Field UNUSEDBIT_182_27 = Field.create("UNUSEDBIT_182_27", 376, FieldType.BIT, 27);
+	public static final Field UNUSEDBIT_182_28 = Field.create("UNUSEDBIT_182_28", 376, FieldType.BIT, 28);
+	public static final Field UNUSEDBIT_182_29 = Field.create("UNUSEDBIT_182_29", 376, FieldType.BIT, 29);
+	public static final Field UNUSEDBIT_182_30 = Field.create("UNUSEDBIT_182_30", 376, FieldType.BIT, 30);
+	public static final Field UNUSEDBIT_182_31 = Field.create("UNUSEDBIT_182_31", 376, FieldType.BIT, 31);
+	public static final Field LUAINVOCATIONCOUNTER = Field.create("LUAINVOCATIONCOUNTER", 380, FieldType.INT).setScale(1.0);
+	public static final Field LUALASTCYCLEDURATION = Field.create("LUALASTCYCLEDURATION", 384, FieldType.INT).setScale(1.0);
+	public static final Field TESTBENCHITER = Field.create("TESTBENCHITER", 388, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE1 = Field.create("UNUSEDINTHEMIDDLE1", 389, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE2 = Field.create("UNUSEDINTHEMIDDLE2", 390, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE3 = Field.create("UNUSEDINTHEMIDDLE3", 391, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE4 = Field.create("UNUSEDINTHEMIDDLE4", 392, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE5 = Field.create("UNUSEDINTHEMIDDLE5", 393, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE6 = Field.create("UNUSEDINTHEMIDDLE6", 394, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE7 = Field.create("UNUSEDINTHEMIDDLE7", 395, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE8 = Field.create("UNUSEDINTHEMIDDLE8", 396, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE9 = Field.create("UNUSEDINTHEMIDDLE9", 397, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE10 = Field.create("UNUSEDINTHEMIDDLE10", 398, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE11 = Field.create("UNUSEDINTHEMIDDLE11", 399, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE12 = Field.create("UNUSEDINTHEMIDDLE12", 400, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE13 = Field.create("UNUSEDINTHEMIDDLE13", 401, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE14 = Field.create("UNUSEDINTHEMIDDLE14", 402, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDINTHEMIDDLE15 = Field.create("UNUSEDINTHEMIDDLE15", 403, FieldType.INT8).setScale(1.0);
+	public static final Field AUXLINEAR1 = Field.create("AUXLINEAR1", 404, FieldType.INT16).setScale(0.01);
+	public static final Field AUXLINEAR2 = Field.create("AUXLINEAR2", 406, FieldType.INT16).setScale(0.01);
+	public static final Field LAUNCHSPEEDCONDITION = Field.create("LAUNCHSPEEDCONDITION", 408, FieldType.BIT, 0);
+	public static final Field LAUNCHRPMCONDITION = Field.create("LAUNCHRPMCONDITION", 408, FieldType.BIT, 1);
+	public static final Field LAUNCHTPSCONDITION = Field.create("LAUNCHTPSCONDITION", 408, FieldType.BIT, 2);
+	public static final Field LAUNCHACTIVATESWITCHCONDITION = Field.create("LAUNCHACTIVATESWITCHCONDITION", 408, FieldType.BIT, 3);
+	public static final Field LAUNCHISLAUNCHCONDITION = Field.create("LAUNCHISLAUNCHCONDITION", 408, FieldType.BIT, 4);
+	public static final Field LAUNCHCOMBINEDCONDITIONS = Field.create("LAUNCHCOMBINEDCONDITIONS", 408, FieldType.BIT, 5);
+	public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 408, FieldType.BIT, 6);
+	public static final Field DFCOACTIVE = Field.create("DFCOACTIVE", 408, FieldType.BIT, 7);
+	public static final Field TPSACCELACTIVE = Field.create("TPSACCELACTIVE", 408, FieldType.BIT, 8);
+	public static final Field UNUSEDBIT_227_9 = Field.create("UNUSEDBIT_227_9", 408, FieldType.BIT, 9);
+	public static final Field UNUSEDBIT_227_10 = Field.create("UNUSEDBIT_227_10", 408, FieldType.BIT, 10);
+	public static final Field UNUSEDBIT_227_11 = Field.create("UNUSEDBIT_227_11", 408, FieldType.BIT, 11);
+	public static final Field UNUSEDBIT_227_12 = Field.create("UNUSEDBIT_227_12", 408, FieldType.BIT, 12);
+	public static final Field UNUSEDBIT_227_13 = Field.create("UNUSEDBIT_227_13", 408, FieldType.BIT, 13);
+	public static final Field UNUSEDBIT_227_14 = Field.create("UNUSEDBIT_227_14", 408, FieldType.BIT, 14);
+	public static final Field UNUSEDBIT_227_15 = Field.create("UNUSEDBIT_227_15", 408, FieldType.BIT, 15);
+	public static final Field UNUSEDBIT_227_16 = Field.create("UNUSEDBIT_227_16", 408, FieldType.BIT, 16);
+	public static final Field UNUSEDBIT_227_17 = Field.create("UNUSEDBIT_227_17", 408, FieldType.BIT, 17);
+	public static final Field UNUSEDBIT_227_18 = Field.create("UNUSEDBIT_227_18", 408, FieldType.BIT, 18);
+	public static final Field UNUSEDBIT_227_19 = Field.create("UNUSEDBIT_227_19", 408, FieldType.BIT, 19);
+	public static final Field UNUSEDBIT_227_20 = Field.create("UNUSEDBIT_227_20", 408, FieldType.BIT, 20);
+	public static final Field UNUSEDBIT_227_21 = Field.create("UNUSEDBIT_227_21", 408, FieldType.BIT, 21);
+	public static final Field UNUSEDBIT_227_22 = Field.create("UNUSEDBIT_227_22", 408, FieldType.BIT, 22);
+	public static final Field UNUSEDBIT_227_23 = Field.create("UNUSEDBIT_227_23", 408, FieldType.BIT, 23);
+	public static final Field UNUSEDBIT_227_24 = Field.create("UNUSEDBIT_227_24", 408, FieldType.BIT, 24);
+	public static final Field UNUSEDBIT_227_25 = Field.create("UNUSEDBIT_227_25", 408, FieldType.BIT, 25);
+	public static final Field UNUSEDBIT_227_26 = Field.create("UNUSEDBIT_227_26", 408, FieldType.BIT, 26);
+	public static final Field UNUSEDBIT_227_27 = Field.create("UNUSEDBIT_227_27", 408, FieldType.BIT, 27);
+	public static final Field UNUSEDBIT_227_28 = Field.create("UNUSEDBIT_227_28", 408, FieldType.BIT, 28);
+	public static final Field UNUSEDBIT_227_29 = Field.create("UNUSEDBIT_227_29", 408, FieldType.BIT, 29);
+	public static final Field UNUSEDBIT_227_30 = Field.create("UNUSEDBIT_227_30", 408, FieldType.BIT, 30);
+	public static final Field UNUSEDBIT_227_31 = Field.create("UNUSEDBIT_227_31", 408, FieldType.BIT, 31);
+	public static final Field TEMPLOG_MAP_AT_CYCLE_COUNT = Field.create("TEMPLOG_MAP_AT_CYCLE_COUNT", 412, FieldType.INT8).setScale(1.0);
+	public static final Field TEMPLOG_MAP_PEAK = Field.create("TEMPLOG_MAP_PEAK", 413, FieldType.INT8).setScale(1.0);
+	public static final Field BOOSTCONTROLLEROUTPUT = Field.create("BOOSTCONTROLLEROUTPUT", 414, FieldType.INT8).setScale(0.5);
+	public static final Field BOOSTCONTROLLEROPENLOOPPART = Field.create("BOOSTCONTROLLEROPENLOOPPART", 415, FieldType.INT8).setScale(0.5);
+	public static final Field TEMPLOG_MAP_AT_SPECIAL_POINT = Field.create("TEMPLOG_MAP_AT_SPECIAL_POINT", 416, FieldType.FLOAT);
+	public static final Field TEMPLOG_MAP_AT_DIFF = Field.create("TEMPLOG_MAP_AT_DIFF", 420, FieldType.FLOAT);
+	public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 424, FieldType.FLOAT);
+	public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 428, FieldType.FLOAT);
+	public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 432, FieldType.FLOAT);
+	public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 436, FieldType.INT8).setScale(1.0);
+	public static final Field VVTCOUNTER = Field.create("VVTCOUNTER", 437, FieldType.INT8).setScale(1.0);
+	public static final Field VVTSYNCCOUNTER = Field.create("VVTSYNCCOUNTER", 438, FieldType.INT8).setScale(1.0);
+	public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 439, FieldType.INT8).setScale(1.0);
+	public static final Field FALLBACKMAP = Field.create("FALLBACKMAP", 440, FieldType.INT16).setScale(0.1);
+	public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 442, FieldType.INT8).setScale(0.5);
+	public static final Field DETECTEDGEAR = Field.create("DETECTEDGEAR", 443, FieldType.INT8).setScale(1.0);
+	public static final Field TIMINGCLTCORRECTION = Field.create("TIMINGCLTCORRECTION", 444, FieldType.INT16).setScale(0.01);
+	public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 446, FieldType.INT16).setScale(0.01);
+	public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 448, FieldType.INT16).setScale(0.01);
+	public static final Field INSTANTMAPVALUE = Field.create("INSTANTMAPVALUE", 450, FieldType.INT16).setScale(0.03333333333333333);
+	public static final Field MOSTRECENTTIMEBETWEENSPARKEVENTS = Field.create("MOSTRECENTTIMEBETWEENSPARKEVENTS", 452, FieldType.INT16).setScale(1.0);
+	public static final Field MOSTRECENTTIMEBETWEENIGNITIONEVENTS = Field.create("MOSTRECENTTIMEBETWEENIGNITIONEVENTS", 454, FieldType.INT16).setScale(1.0);
+	public static final Field MAXLOCKEDDURATION = Field.create("MAXLOCKEDDURATION", 456, FieldType.INT16).setScale(1.0);
+	public static final Field MAXTRIGGERREENTRANT = Field.create("MAXTRIGGERREENTRANT", 458, FieldType.INT16).setScale(1.0);
+	public static final Field CANWRITEOK = Field.create("CANWRITEOK", 460, FieldType.INT16).setScale(1.0);
+	public static final Field CANWRITENOTOK = Field.create("CANWRITENOTOK", 462, FieldType.INT16).setScale(1.0);
+	public static final Field TRIGGERPRIMARYFALL = Field.create("TRIGGERPRIMARYFALL", 464, FieldType.INT).setScale(1.0);
+	public static final Field TRIGGERPRIMARYRISE = Field.create("TRIGGERPRIMARYRISE", 468, FieldType.INT).setScale(1.0);
+	public static final Field TRIGGERSECONDARYFALL = Field.create("TRIGGERSECONDARYFALL", 472, FieldType.INT).setScale(1.0);
+	public static final Field TRIGGERSECONDARYRISE = Field.create("TRIGGERSECONDARYRISE", 476, FieldType.INT).setScale(1.0);
+	public static final Field TRIGGERVVTFALL = Field.create("TRIGGERVVTFALL", 480, FieldType.INT).setScale(1.0);
+	public static final Field TRIGGERVVTRISE = Field.create("TRIGGERVVTRISE", 484, FieldType.INT).setScale(1.0);
+	public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 488, FieldType.INT8).setScale(1.0);
+	public static final Field STARTERSTATE = Field.create("STARTERSTATE", 489, FieldType.INT8).setScale(1.0);
+	public static final Field STARTERRELAYDISABLE = Field.create("STARTERRELAYDISABLE", 490, FieldType.INT8).setScale(1.0);
+	public static final Field MULTISPARKCOUNTER = Field.create("MULTISPARKCOUNTER", 491, FieldType.INT8).setScale(1.0);
+	public static final Field IDLESTATE = Field.create("IDLESTATE", 492, FieldType.INT).setScale(1.0);
+	public static final Field INJECTORFLOWPRESSURERATIO = Field.create("INJECTORFLOWPRESSURERATIO", 496, FieldType.FLOAT);
+	public static final Field INJECTORFLOWPRESSUREDELTA = Field.create("INJECTORFLOWPRESSUREDELTA", 500, FieldType.FLOAT);
+	public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 504, FieldType.FLOAT);
+	public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 508, FieldType.FLOAT);
+	public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 512, FieldType.FLOAT);
+	public static final Field ALTERNATORSTATUS_ITERM = Field.create("ALTERNATORSTATUS_ITERM", 516, FieldType.INT16).setScale(0.01);
+	public static final Field ALTERNATORSTATUS_DTERM = Field.create("ALTERNATORSTATUS_DTERM", 518, FieldType.INT16).setScale(0.01);
+	public static final Field ALTERNATORSTATUS_OUTPUT = Field.create("ALTERNATORSTATUS_OUTPUT", 520, FieldType.INT16).setScale(0.01);
+	public static final Field ALTERNATORSTATUS_ERROR = Field.create("ALTERNATORSTATUS_ERROR", 522, FieldType.INT16).setScale(0.01);
+	public static final Field ALTERNATORSTATUS_RESETCOUNTER = Field.create("ALTERNATORSTATUS_RESETCOUNTER", 524, FieldType.INT).setScale(1.0);
+	public static final Field IDLESTATUS_ITERM = Field.create("IDLESTATUS_ITERM", 528, FieldType.INT16).setScale(0.01);
+	public static final Field IDLESTATUS_DTERM = Field.create("IDLESTATUS_DTERM", 530, FieldType.INT16).setScale(0.01);
+	public static final Field IDLESTATUS_OUTPUT = Field.create("IDLESTATUS_OUTPUT", 532, FieldType.INT16).setScale(0.01);
+	public static final Field IDLESTATUS_ERROR = Field.create("IDLESTATUS_ERROR", 534, FieldType.INT16).setScale(0.01);
+	public static final Field IDLESTATUS_RESETCOUNTER = Field.create("IDLESTATUS_RESETCOUNTER", 536, FieldType.INT).setScale(1.0);
+	public static final Field ETBSTATUS_ITERM = Field.create("ETBSTATUS_ITERM", 540, FieldType.INT16).setScale(0.01);
+	public static final Field ETBSTATUS_DTERM = Field.create("ETBSTATUS_DTERM", 542, FieldType.INT16).setScale(0.01);
+	public static final Field ETBSTATUS_OUTPUT = Field.create("ETBSTATUS_OUTPUT", 544, FieldType.INT16).setScale(0.01);
+	public static final Field ETBSTATUS_ERROR = Field.create("ETBSTATUS_ERROR", 546, FieldType.INT16).setScale(0.01);
+	public static final Field ETBSTATUS_RESETCOUNTER = Field.create("ETBSTATUS_RESETCOUNTER", 548, FieldType.INT).setScale(1.0);
+	public static final Field BOOSTSTATUS_ITERM = Field.create("BOOSTSTATUS_ITERM", 552, FieldType.INT16).setScale(0.01);
+	public static final Field BOOSTSTATUS_DTERM = Field.create("BOOSTSTATUS_DTERM", 554, FieldType.INT16).setScale(0.01);
+	public static final Field BOOSTSTATUS_OUTPUT = Field.create("BOOSTSTATUS_OUTPUT", 556, FieldType.INT16).setScale(0.01);
+	public static final Field BOOSTSTATUS_ERROR = Field.create("BOOSTSTATUS_ERROR", 558, FieldType.INT16).setScale(0.01);
+	public static final Field BOOSTSTATUS_RESETCOUNTER = Field.create("BOOSTSTATUS_RESETCOUNTER", 560, FieldType.INT).setScale(1.0);
+	public static final Field AUXSPEED1 = Field.create("AUXSPEED1", 564, FieldType.INT16).setScale(1.0);
+	public static final Field AUXSPEED2 = Field.create("AUXSPEED2", 566, FieldType.INT16).setScale(1.0);
+	public static final Field UNUSEDATTHEEND1 = Field.create("UNUSEDATTHEEND1", 568, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND2 = Field.create("UNUSEDATTHEEND2", 569, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND3 = Field.create("UNUSEDATTHEEND3", 570, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND4 = Field.create("UNUSEDATTHEEND4", 571, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND5 = Field.create("UNUSEDATTHEEND5", 572, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND6 = Field.create("UNUSEDATTHEEND6", 573, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND7 = Field.create("UNUSEDATTHEEND7", 574, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND8 = Field.create("UNUSEDATTHEEND8", 575, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND9 = Field.create("UNUSEDATTHEEND9", 576, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND10 = Field.create("UNUSEDATTHEEND10", 577, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND11 = Field.create("UNUSEDATTHEEND11", 578, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND12 = Field.create("UNUSEDATTHEEND12", 579, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND13 = Field.create("UNUSEDATTHEEND13", 580, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND14 = Field.create("UNUSEDATTHEEND14", 581, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND15 = Field.create("UNUSEDATTHEEND15", 582, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND16 = Field.create("UNUSEDATTHEEND16", 583, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND17 = Field.create("UNUSEDATTHEEND17", 584, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND18 = Field.create("UNUSEDATTHEEND18", 585, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND19 = Field.create("UNUSEDATTHEEND19", 586, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND20 = Field.create("UNUSEDATTHEEND20", 587, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND21 = Field.create("UNUSEDATTHEEND21", 588, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND22 = Field.create("UNUSEDATTHEEND22", 589, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND23 = Field.create("UNUSEDATTHEEND23", 590, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND24 = Field.create("UNUSEDATTHEEND24", 591, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND25 = Field.create("UNUSEDATTHEEND25", 592, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND26 = Field.create("UNUSEDATTHEEND26", 593, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND27 = Field.create("UNUSEDATTHEEND27", 594, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND28 = Field.create("UNUSEDATTHEEND28", 595, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND29 = Field.create("UNUSEDATTHEEND29", 596, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND30 = Field.create("UNUSEDATTHEEND30", 597, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND31 = Field.create("UNUSEDATTHEEND31", 598, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND32 = Field.create("UNUSEDATTHEEND32", 599, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND33 = Field.create("UNUSEDATTHEEND33", 600, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND34 = Field.create("UNUSEDATTHEEND34", 601, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND35 = Field.create("UNUSEDATTHEEND35", 602, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND36 = Field.create("UNUSEDATTHEEND36", 603, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND37 = Field.create("UNUSEDATTHEEND37", 604, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND38 = Field.create("UNUSEDATTHEEND38", 605, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND39 = Field.create("UNUSEDATTHEEND39", 606, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND40 = Field.create("UNUSEDATTHEEND40", 607, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND41 = Field.create("UNUSEDATTHEEND41", 608, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND42 = Field.create("UNUSEDATTHEEND42", 609, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND43 = Field.create("UNUSEDATTHEEND43", 610, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND44 = Field.create("UNUSEDATTHEEND44", 611, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND45 = Field.create("UNUSEDATTHEEND45", 612, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND46 = Field.create("UNUSEDATTHEEND46", 613, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND47 = Field.create("UNUSEDATTHEEND47", 614, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND48 = Field.create("UNUSEDATTHEEND48", 615, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND49 = Field.create("UNUSEDATTHEEND49", 616, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND50 = Field.create("UNUSEDATTHEEND50", 617, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND51 = Field.create("UNUSEDATTHEEND51", 618, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND52 = Field.create("UNUSEDATTHEEND52", 619, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND53 = Field.create("UNUSEDATTHEEND53", 620, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND54 = Field.create("UNUSEDATTHEEND54", 621, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND55 = Field.create("UNUSEDATTHEEND55", 622, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND56 = Field.create("UNUSEDATTHEEND56", 623, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND57 = Field.create("UNUSEDATTHEEND57", 624, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND58 = Field.create("UNUSEDATTHEEND58", 625, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND59 = Field.create("UNUSEDATTHEEND59", 626, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND60 = Field.create("UNUSEDATTHEEND60", 627, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND61 = Field.create("UNUSEDATTHEEND61", 628, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND62 = Field.create("UNUSEDATTHEEND62", 629, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND63 = Field.create("UNUSEDATTHEEND63", 630, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND64 = Field.create("UNUSEDATTHEEND64", 631, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND65 = Field.create("UNUSEDATTHEEND65", 632, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND66 = Field.create("UNUSEDATTHEEND66", 633, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND67 = Field.create("UNUSEDATTHEEND67", 634, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND68 = Field.create("UNUSEDATTHEEND68", 635, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND69 = Field.create("UNUSEDATTHEEND69", 636, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND70 = Field.create("UNUSEDATTHEEND70", 637, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND71 = Field.create("UNUSEDATTHEEND71", 638, FieldType.INT8).setScale(1.0);
+	public static final Field UNUSEDATTHEEND72 = Field.create("UNUSEDATTHEEND72", 639, FieldType.INT8).setScale(1.0);
+	public static final Field[] VALUES = {
+	SD_PRESENT,
+	ISIGNITIONENABLEDINDICATOR,
+	ISINJECTIONENABLEDINDICATOR,
+	SD_LOGGING_INTERNAL,
+	UNUSEDB4,
+	ISFUELPUMPON,
+	ISFANON,
+	ISO2HEATERON,
+	CHECKENGINE,
+	NEEDBURN,
+	SD_MSD,
+	CLUTCHUPSTATE,
+	CLUTCHDOWNSTATE,
+	ISFAN2ON,
+	ALTERNATORONOFF,
+	BRAKEPEDALSTATE,
+	TOOTHLOGREADY,
+	ACSWITCHSTATE,
+	ISTPSERROR,
+	ISCLTERROR,
+	ISMAPERROR,
+	ISIATERROR,
+	ACSTATE,
+	ISTRIGGERERROR,
+	HASCRITICALERROR,
+	ISWARNNOW,
+	ISPEDALERROR,
+	ISKNOCKCHIPOK,
+	LAUNCHTRIGGERED,
+	ISTPS2ERROR,
+	ISIDLECLOSEDLOOP,
+	ISIDLECOASTING,
+	RPMVALUE,
+	RPMACCELERATION,
+	SPEEDTORPMRATIO,
+	VEHICLESPEEDKPH,
+	INTERNALMCUTEMPERATURE,
+	COOLANT,
+	INTAKE,
+	AUXTEMP1,
+	AUXTEMP2,
+	TPSVALUE,
+	THROTTLEPEDALPOSITION,
+	TPSADC,
+	RAWMAF,
+	MAFMEASURED,
+	MAPVALUE,
+	BAROPRESSURE,
+	LAMBDAVALUE,
+	KNOCKRETARD,
+	IDLECURRENTPOSITION,
+	VBATT,
+	OILPRESSURE,
+	VVTPOSITIONB1I,
+	CHARGEAIRMASS,
+	CRANKINGFUELMS,
+	CURRENTTARGETAFR,
+	BASEFUEL,
+	FUELRUNNING,
+	ACTUALLASTINJECTION,
+	INJECTORDUTYCYCLE,
+	VEVALUE,
+	INJECTIONOFFSET,
+	TCHARGE,
+	INJECTORLAGMS,
+	IATCORRECTION,
+	CLTCORRECTION,
+	BAROCORRECTION,
+	CURRENTENGINEPHASE,
+	WALLFUELAMOUNT,
+	WALLFUELCORRECTION,
+	REVOLUTIONCOUNTERSINCESTART,
+	DELTATPS,
+	CANREADCOUNTER,
+	TPSACCELFUEL,
+	IGNITIONADVANCE,
+	SPARKDWELLVALUE,
+	COILDUTYCYCLE,
+	IDLEAIRVALVEPOSITION,
+	ETBTARGET,
+	ETB1DUTYCYCLE,
+	ETB1ERROR,
+	FUELTANKLEVEL,
+	TOTALFUELCONSUMPTION,
+	FUELFLOWRATE,
+	VETABLEYAXIS,
+	AFRTABLEYAXIS,
+	KNOCKLEVEL,
+	SECONDS,
+	ENGINEMODE,
+	FIRMWAREVERSION,
+	TSCONFIGVERSION,
+	CALIBRATIONVALUE,
+	CALIBRATIONMODE,
+	IDLETARGETPOSITION,
+	FUELINGLOAD,
+	IGNITIONLOAD,
+	ENGINEMAKECODENAMECRC16,
+	TOTALTRIGGERERRORCOUNTER,
+	ORDERINGERRORCOUNTER,
+	WARNINGCOUNTER,
+	LASTERRORCODE,
+	RECENTERRORCODE1,
+	RECENTERRORCODE2,
+	RECENTERRORCODE3,
+	RECENTERRORCODE4,
+	RECENTERRORCODE5,
+	RECENTERRORCODE6,
+	RECENTERRORCODE7,
+	RECENTERRORCODE8,
+	DEBUGFLOATFIELD1,
+	DEBUGFLOATFIELD2,
+	DEBUGFLOATFIELD3,
+	DEBUGFLOATFIELD4,
+	DEBUGFLOATFIELD5,
+	DEBUGFLOATFIELD6,
+	DEBUGFLOATFIELD7,
+	DEBUGINTFIELD1,
+	DEBUGINTFIELD2,
+	DEBUGINTFIELD3,
+	DEBUGINTFIELD4,
+	DEBUGINTFIELD5,
+	ACCELERATIONX,
+	ACCELERATIONY,
+	EGT1,
+	EGT2,
+	EGT3,
+	EGT4,
+	EGT5,
+	EGT6,
+	EGT7,
+	EGT8,
+	TPS2VALUE,
+	RAWTPS1PRIMARY,
+	RAWPPSPRIMARY,
+	RAWCLT,
+	RAWIAT,
+	RAWOILPRESSURE,
+	TUNECRC16,
+	FUELCLOSEDLOOPBINIDX,
+	TCUCURRENTGEAR,
+	RAWPPSSECONDARY,
+	KNOCK1,
+	KNOCK2,
+	KNOCK3,
+	KNOCK4,
+	KNOCK5,
+	KNOCK6,
+	KNOCK7,
+	KNOCK8,
+	KNOCK9,
+	KNOCK10,
+	KNOCK11,
+	KNOCK12,
+	TCUDESIREDGEAR,
+	FLEXPERCENT,
+	RAWIDLEPOSITIONSENSOR,
+	RAWWASTEGATEPOSITION,
+	WASTEGATEPOSITIONSENSOR,
+	IDLEPOSITIONSENSOR,
+	RAWLOWFUELPRESSURE,
+	RAWHIGHFUELPRESSURE,
+	LOWFUELPRESSURE,
+	HIGHFUELPRESSURE,
+	TARGETLAMBDA,
+	AFRVALUE,
+	VSSACCELERATION,
+	LAMBDAVALUE2,
+	AFRVALUE2,
+	VVTPOSITIONB1E,
+	VVTPOSITIONB2I,
+	VVTPOSITIONB2E,
+	FUELPIDCORRECTION1,
+	FUELPIDCORRECTION2,
+	RAWTPS1SECONDARY,
+	RAWTPS2PRIMARY,
+	RAWTPS2SECONDARY,
+	KNOCKCOUNT,
+	ACCELERATIONZ,
+	ACCELERATIONROLL,
+	ACCELERATIONYAW,
+	VVTTARGETS1,
+	VVTTARGETS2,
+	VVTTARGETS3,
+	VVTTARGETS4,
+	TURBOSPEED,
+	WBTEMPERATURE1,
+	WBTEMPERATURE2,
+	WBHEATERDUTY1,
+	WBHEATERDUTY2,
+	TPS1SPLIT,
+	TPS2SPLIT,
+	TPS12SPLIT,
+	ACCPEDALSPLIT,
+	M_REQUESTED_PUMP,
+	BOOSTCONTROLTARGET,
+	SPARKCUTREASON,
+	FUELCUTREASON,
+	FUEL_REQUESTED_PERCENT,
+	FUEL_REQUESTED_PERCENT_PI,
+	M_I_SUM_PERCENT,
+	M_PRESSURETARGET_KPA,
+	MAFESTIMATE,
+	INSTANTRPM,
+	DI_NEXTSTART,
+	SYSTEMEVENTREUSE,
+	RAWMAP,
+	RAWAFR,
+	TPSACCELFROM,
+	TPSACCELTO,
+	CALIBRATIONVALUE2,
+	ISMAINRELAYON,
+	ISUSBCONNECTED,
+	UNUSEDBIT_182_2,
+	UNUSEDBIT_182_3,
+	UNUSEDBIT_182_4,
+	UNUSEDBIT_182_5,
+	UNUSEDBIT_182_6,
+	UNUSEDBIT_182_7,
+	UNUSEDBIT_182_8,
+	UNUSEDBIT_182_9,
+	UNUSEDBIT_182_10,
+	UNUSEDBIT_182_11,
+	UNUSEDBIT_182_12,
+	UNUSEDBIT_182_13,
+	UNUSEDBIT_182_14,
+	UNUSEDBIT_182_15,
+	UNUSEDBIT_182_16,
+	UNUSEDBIT_182_17,
+	UNUSEDBIT_182_18,
+	UNUSEDBIT_182_19,
+	UNUSEDBIT_182_20,
+	UNUSEDBIT_182_21,
+	UNUSEDBIT_182_22,
+	UNUSEDBIT_182_23,
+	UNUSEDBIT_182_24,
+	UNUSEDBIT_182_25,
+	UNUSEDBIT_182_26,
+	UNUSEDBIT_182_27,
+	UNUSEDBIT_182_28,
+	UNUSEDBIT_182_29,
+	UNUSEDBIT_182_30,
+	UNUSEDBIT_182_31,
+	LUAINVOCATIONCOUNTER,
+	LUALASTCYCLEDURATION,
+	TESTBENCHITER,
+	UNUSEDINTHEMIDDLE1,
+	UNUSEDINTHEMIDDLE2,
+	UNUSEDINTHEMIDDLE3,
+	UNUSEDINTHEMIDDLE4,
+	UNUSEDINTHEMIDDLE5,
+	UNUSEDINTHEMIDDLE6,
+	UNUSEDINTHEMIDDLE7,
+	UNUSEDINTHEMIDDLE8,
+	UNUSEDINTHEMIDDLE9,
+	UNUSEDINTHEMIDDLE10,
+	UNUSEDINTHEMIDDLE11,
+	UNUSEDINTHEMIDDLE12,
+	UNUSEDINTHEMIDDLE13,
+	UNUSEDINTHEMIDDLE14,
+	UNUSEDINTHEMIDDLE15,
+	AUXLINEAR1,
+	AUXLINEAR2,
+	LAUNCHSPEEDCONDITION,
+	LAUNCHRPMCONDITION,
+	LAUNCHTPSCONDITION,
+	LAUNCHACTIVATESWITCHCONDITION,
+	LAUNCHISLAUNCHCONDITION,
+	LAUNCHCOMBINEDCONDITIONS,
+	LAUNCHACTIVATEPINSTATE,
+	DFCOACTIVE,
+	TPSACCELACTIVE,
+	UNUSEDBIT_227_9,
+	UNUSEDBIT_227_10,
+	UNUSEDBIT_227_11,
+	UNUSEDBIT_227_12,
+	UNUSEDBIT_227_13,
+	UNUSEDBIT_227_14,
+	UNUSEDBIT_227_15,
+	UNUSEDBIT_227_16,
+	UNUSEDBIT_227_17,
+	UNUSEDBIT_227_18,
+	UNUSEDBIT_227_19,
+	UNUSEDBIT_227_20,
+	UNUSEDBIT_227_21,
+	UNUSEDBIT_227_22,
+	UNUSEDBIT_227_23,
+	UNUSEDBIT_227_24,
+	UNUSEDBIT_227_25,
+	UNUSEDBIT_227_26,
+	UNUSEDBIT_227_27,
+	UNUSEDBIT_227_28,
+	UNUSEDBIT_227_29,
+	UNUSEDBIT_227_30,
+	UNUSEDBIT_227_31,
+	TEMPLOG_MAP_AT_CYCLE_COUNT,
+	TEMPLOG_MAP_PEAK,
+	BOOSTCONTROLLEROUTPUT,
+	BOOSTCONTROLLEROPENLOOPPART,
+	TEMPLOG_MAP_AT_SPECIAL_POINT,
+	TEMPLOG_MAP_AT_DIFF,
+	VVTSYNCGAPRATIO,
+	VVTCURRENTPOSITION,
+	TRIGGERSYNCGAPRATIO,
+	TRIGGERSTATEINDEX,
+	VVTCOUNTER,
+	VVTSYNCCOUNTER,
+	VVTSTATEINDEX,
+	FALLBACKMAP,
+	BOOSTCONTROLLERCLOSEDLOOPPART,
+	DETECTEDGEAR,
+	TIMINGCLTCORRECTION,
+	TIMINGIATCORRECTION,
+	TIMINGPIDCORRECTION,
+	INSTANTMAPVALUE,
+	MOSTRECENTTIMEBETWEENSPARKEVENTS,
+	MOSTRECENTTIMEBETWEENIGNITIONEVENTS,
+	MAXLOCKEDDURATION,
+	MAXTRIGGERREENTRANT,
+	CANWRITEOK,
+	CANWRITENOTOK,
+	TRIGGERPRIMARYFALL,
+	TRIGGERPRIMARYRISE,
+	TRIGGERSECONDARYFALL,
+	TRIGGERSECONDARYRISE,
+	TRIGGERVVTFALL,
+	TRIGGERVVTRISE,
+	STARTSTOPSTATETOGGLECOUNTER,
+	STARTERSTATE,
+	STARTERRELAYDISABLE,
+	MULTISPARKCOUNTER,
+	IDLESTATE,
+	INJECTORFLOWPRESSURERATIO,
+	INJECTORFLOWPRESSUREDELTA,
+	ETBFEEDFORWARD,
+	ETBINTEGRALERROR,
+	ETBCURRENTTARGET,
+	ALTERNATORSTATUS_ITERM,
+	ALTERNATORSTATUS_DTERM,
+	ALTERNATORSTATUS_OUTPUT,
+	ALTERNATORSTATUS_ERROR,
+	ALTERNATORSTATUS_RESETCOUNTER,
+	IDLESTATUS_ITERM,
+	IDLESTATUS_DTERM,
+	IDLESTATUS_OUTPUT,
+	IDLESTATUS_ERROR,
+	IDLESTATUS_RESETCOUNTER,
+	ETBSTATUS_ITERM,
+	ETBSTATUS_DTERM,
+	ETBSTATUS_OUTPUT,
+	ETBSTATUS_ERROR,
+	ETBSTATUS_RESETCOUNTER,
+	BOOSTSTATUS_ITERM,
+	BOOSTSTATUS_DTERM,
+	BOOSTSTATUS_OUTPUT,
+	BOOSTSTATUS_ERROR,
+	BOOSTSTATUS_RESETCOUNTER,
+	AUXSPEED1,
+	AUXSPEED2,
+	UNUSEDATTHEEND1,
+	UNUSEDATTHEEND2,
+	UNUSEDATTHEEND3,
+	UNUSEDATTHEEND4,
+	UNUSEDATTHEEND5,
+	UNUSEDATTHEEND6,
+	UNUSEDATTHEEND7,
+	UNUSEDATTHEEND8,
+	UNUSEDATTHEEND9,
+	UNUSEDATTHEEND10,
+	UNUSEDATTHEEND11,
+	UNUSEDATTHEEND12,
+	UNUSEDATTHEEND13,
+	UNUSEDATTHEEND14,
+	UNUSEDATTHEEND15,
+	UNUSEDATTHEEND16,
+	UNUSEDATTHEEND17,
+	UNUSEDATTHEEND18,
+	UNUSEDATTHEEND19,
+	UNUSEDATTHEEND20,
+	UNUSEDATTHEEND21,
+	UNUSEDATTHEEND22,
+	UNUSEDATTHEEND23,
+	UNUSEDATTHEEND24,
+	UNUSEDATTHEEND25,
+	UNUSEDATTHEEND26,
+	UNUSEDATTHEEND27,
+	UNUSEDATTHEEND28,
+	UNUSEDATTHEEND29,
+	UNUSEDATTHEEND30,
+	UNUSEDATTHEEND31,
+	UNUSEDATTHEEND32,
+	UNUSEDATTHEEND33,
+	UNUSEDATTHEEND34,
+	UNUSEDATTHEEND35,
+	UNUSEDATTHEEND36,
+	UNUSEDATTHEEND37,
+	UNUSEDATTHEEND38,
+	UNUSEDATTHEEND39,
+	UNUSEDATTHEEND40,
+	UNUSEDATTHEEND41,
+	UNUSEDATTHEEND42,
+	UNUSEDATTHEEND43,
+	UNUSEDATTHEEND44,
+	UNUSEDATTHEEND45,
+	UNUSEDATTHEEND46,
+	UNUSEDATTHEEND47,
+	UNUSEDATTHEEND48,
+	UNUSEDATTHEEND49,
+	UNUSEDATTHEEND50,
+	UNUSEDATTHEEND51,
+	UNUSEDATTHEEND52,
+	UNUSEDATTHEEND53,
+	UNUSEDATTHEEND54,
+	UNUSEDATTHEEND55,
+	UNUSEDATTHEEND56,
+	UNUSEDATTHEEND57,
+	UNUSEDATTHEEND58,
+	UNUSEDATTHEEND59,
+	UNUSEDATTHEEND60,
+	UNUSEDATTHEEND61,
+	UNUSEDATTHEEND62,
+	UNUSEDATTHEEND63,
+	UNUSEDATTHEEND64,
+	UNUSEDATTHEEND65,
+	UNUSEDATTHEEND66,
+	UNUSEDATTHEEND67,
+	UNUSEDATTHEEND68,
+	UNUSEDATTHEEND69,
+	UNUSEDATTHEEND70,
+	UNUSEDATTHEEND71,
+	UNUSEDATTHEEND72,
+	};
+}
diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java
index fbfaa1ddf6..8344c671cf 100644
--- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java
@@ -1,394 +1,11 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\wall_fuel_state.txt Thu Apr 14 15:45:20 EDT 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\wall_fuel_state.txt Thu Apr 14 20:48:22 EDT 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
 
 public class WallFuelState {
-	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_FSIO_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 = 8;
-	public static final int ENGINE_SNIFFER_UNIT_US = 10;
-	public static final int ENUM_16_BITS = 60000;
-	public static final int ENUM_32_BITS = 2000000000;
-	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 = 10009;
-	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_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: counter";
-	public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";
-	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_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_EVENT_TYPES = 6;
-	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_MAP_ESTIMATE = 100;
-	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 = 20200310;
-	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 int TS_OUTPUT_SIZE = 640;
-	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 WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT);
 	public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT);
 	public static final Field[] VALUES = {
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index f42c4577e1..84ffc5a15d 100644
Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
index 4d122bea6e..ff4751acdc 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
@@ -143,8 +143,14 @@ public class ConfigDefinition {
                     romRaiderDestination = args[i + 1];
                     break;
                 case KEY_PREPEND:
-                    prependFiles.add(args[i + 1]);
-                    state.inputFiles.add(args[i + 1]);
+                    {
+                        String value = args[i + 1];
+                        // see UsagesReader use-case with dynamic prepend usage
+                        if (!value.trim().isEmpty()) {
+                            prependFiles.add(value);
+                            state.inputFiles.add(value);
+                        }
+                    }
                     break;
                 case KEY_SIGNATURE:
                     signaturePrependFile = args[i + 1];
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java
index 82833e37f1..77214dad2f 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java
@@ -48,6 +48,22 @@ public class UsagesReader {
 
             String javaName = (String) elements.get(0);
             String folder = (String) elements.get(1);
+
+
+            String withCDefines = "false";
+            String prepend = "";
+            for (int i = 2; i < elements.size(); i++) {
+                String keyValue = (String) elements.get(i);
+                String[] pair = keyValue.trim().split("=");
+                String key = pair[0];
+                String value = pair[1];
+                if (key.equals(ConfigDefinition.KEY_WITH_C_DEFINES)) {
+                    withCDefines  = value;
+                } else if (key.equals(ConfigDefinition.KEY_PREPEND)) {
+                    prepend = value;
+                }
+            }
+
 //            String macroName = elements.size() > 2 ? ((String)elements.get(2)).trim() : "";
 
 
@@ -55,10 +71,10 @@ public class UsagesReader {
                     ConfigDefinition.KEY_DEFINITION,
                     folder + File.separator + name + ".txt",
                     ConfigDefinition.KEY_WITH_C_DEFINES,
-                    "false",
+                    withCDefines,
 
                     ConfigDefinition.KEY_PREPEND,
-                    "integration/rusefi_config.txt",
+                    prepend,
 
                     ConfigDefinition.KEY_JAVA_DESTINATION,
                     "../java_console/models/src/main/java/com/rusefi/config/generated/" + javaName,