Auto-generated configs and docs

2023-04-12 14:28:16 +00:00 · 2023-04-12 14:28:16 +00:00 · a3fb582d88
parent 7360840ece
commit a3fb582d88
83 changed files with 275 additions and 352 deletions
--- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h
@ -1063,7 +1063,7 @@
 #define SentEtbType_NONE 0
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH 3637768076
+#define SIGNATURE_HASH 788718350
 #define specs_s_size 12
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
@ -1357,7 +1357,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI master.2023.04.12.cypress.3637768076"
+#define TS_SIGNATURE "rusEFI master.2023.04.12.cypress.788718350"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@ -1063,7 +1063,7 @@
 #define SentEtbType_NONE 0
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH 2953071936
+#define SIGNATURE_HASH 1205158338
 #define specs_s_size 12
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
@ -1357,7 +1357,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI master.2023.04.12.kin.2953071936"
+#define TS_SIGNATURE "rusEFI master.2023.04.12.kin.1205158338"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
--- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
@ -1014,7 +1014,7 @@
 #define show_Frankenso_presets false
 #define show_Proteus_presets false
 #define show_test_presets false
-#define SIGNATURE_HASH 2869869857
+#define SIGNATURE_HASH 1558163875
 #define specs_s_size 12
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
@ -1309,7 +1309,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI master.2023.04.12.subaru_eg33_f7.2869869857"
+#define TS_SIGNATURE "rusEFI master.2023.04.12.subaru_eg33_f7.1558163875"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
--- a/firmware/console/binary/generated/data_logs.ini
+++ b/firmware/console/binary/generated/data_logs.ini
@ -38,7 +38,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/console/binary/generated/output_channels.ini
+++ b/firmware/console/binary/generated/output_channels.ini
@ -41,8 +41,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
--- a/firmware/console/binary/generated/sensors.java
+++ b/firmware/console/binary/generated/sensors.java
@ -15,8 +15,8 @@ mafMeasured("MAF", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 28, 0.1, 0.0,
 MAPValue("MAP", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 30, 0.03333333333333333, 0.0, 0.0, "kPa"),
 baroPressure("baroPressure", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 32, 0.03333333333333333, 0.0, 0.0, "kPa"),
 lambdaValue("Lambda", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 34, 1.0E-4, 0.0, 0.0, ""),
-knockRetard("knock: retard", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 36, 0.1, 0.0, 0.0, "deg"),
-idleCurrentPosition("idleCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 37, 0.5, 0.0, 100.0, "%"),
+idleCurrentPosition("idleCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 36, 0.5, 0.0, 100.0, "%"),
+alignmentFill_at_37("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 37, 1.0, -20.0, 100.0, "units"),
 VBatt("VBatt", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 38, 0.001, 0.0, 0.0, "V"),
 oilPressure("Oil Pressure", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 40, 0.03333333333333333, 0.0, 0.0, "kPa"),
 vvtPositionB1I("VVT: bank 1 intake", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 42, 0.02, 0.0, 0.0, "deg"),
--- a/firmware/console/binary/output_channels_generated.h
+++ b/firmware/console/binary/output_channels_generated.h
@ -1,4 +1,4 @@
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Apr 12 14:18:00 UTC 2023
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Apr 12 14:27:21 UTC 2023
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@ -228,16 +228,16 @@ struct output_channels_s {
 	 */
 	scaled_channel<uint16_t, 10000, 1> lambdaValue = (uint16_t)0;
 	/**
-	 * @@GAUGE_NAME_KNOCK_RETARD@@
-	deg
+	%
 	 * offset 36
 	 */
-	scaled_channel<uint8_t, 10, 1> knockRetard = (uint8_t)0;
+	scaled_channel<uint8_t, 2, 1> idleCurrentPosition = (uint8_t)0;
 	/**
-	%
+	 * need 4 byte alignment
+	units
 	 * offset 37
 	 */
-	scaled_channel<uint8_t, 2, 1> idleCurrentPosition = (uint8_t)0;
+	uint8_t alignmentFill_at_37[1];
 	/**
 	 * @@GAUGE_NAME_VBAT@@
 	V
@ -1393,4 +1393,4 @@ struct output_channels_s {
 static_assert(sizeof(output_channels_s) == 780);

 // end
-// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Apr 12 14:18:00 UTC 2023
+// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Apr 12 14:27:21 UTC 2023
--- a/firmware/console/binary_log/log_fields_generated.h
+++ b/firmware/console/binary_log/log_fields_generated.h
@ -17,7 +17,6 @@ static constexpr LogField fields[] = {
 	{engine->outputChannels.MAPValue, "MAP", "kPa", 1},
 	{engine->outputChannels.baroPressure, "baroPressure", "kPa", 1},
 	{engine->outputChannels.lambdaValue, "Lambda", "", 3},
-	{engine->outputChannels.knockRetard, "knock: retard", "deg", 1},
 	{engine->outputChannels.idleCurrentPosition, "idleCurrentPosition", "%", 1},
 	{engine->outputChannels.VBatt, "VBatt", "V", 2},
 	{engine->outputChannels.oilPressure, "Oil Pressure", "kPa", 0},
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@ -1063,7 +1063,7 @@
 #define SentEtbType_NONE 0
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH 2963075370
+#define SIGNATURE_HASH 1196293544
 #define specs_s_size 12
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
@ -1357,7 +1357,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI master.2023.04.12.f407-discovery.2963075370"
+#define TS_SIGNATURE "rusEFI master.2023.04.12.f407-discovery.1196293544"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
--- a/firmware/controllers/generated/signature_48way.h
+++ b/firmware/controllers/generated/signature_48way.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 2006346988
-#define TS_SIGNATURE "rusEFI master.2023.04.12.48way.2006346988"
+#define SIGNATURE_HASH 2152161390
+#define TS_SIGNATURE "rusEFI master.2023.04.12.48way.2152161390"
--- a/firmware/controllers/generated/signature_alphax-2chan.h
+++ b/firmware/controllers/generated/signature_alphax-2chan.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 2229532223
-#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-2chan.2229532223"
+#define SIGNATURE_HASH 1932720829
+#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-2chan.1932720829"
--- a/firmware/controllers/generated/signature_alphax-4chan.h
+++ b/firmware/controllers/generated/signature_alphax-4chan.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 666524169
-#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-4chan.666524169"
+#define SIGNATURE_HASH 3496695435
+#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-4chan.3496695435"
--- a/firmware/controllers/generated/signature_alphax-8chan.h
+++ b/firmware/controllers/generated/signature_alphax-8chan.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 168414886
-#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-8chan.168414886"
+#define SIGNATURE_HASH 4258841124
+#define TS_SIGNATURE "rusEFI master.2023.04.12.alphax-8chan.4258841124"
--- a/firmware/controllers/generated/signature_atlas.h
+++ b/firmware/controllers/generated/signature_atlas.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 3289979563
-#define TS_SIGNATURE "rusEFI master.2023.04.12.atlas.3289979563"
+#define SIGNATURE_HASH 868750889
+#define TS_SIGNATURE "rusEFI master.2023.04.12.atlas.868750889"
--- a/firmware/controllers/generated/signature_core8.h
+++ b/firmware/controllers/generated/signature_core8.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 191621600
-#define TS_SIGNATURE "rusEFI master.2023.04.12.core8.191621600"
+#define SIGNATURE_HASH 4240106850
+#define TS_SIGNATURE "rusEFI master.2023.04.12.core8.4240106850"
--- a/firmware/controllers/generated/signature_cypress.h
+++ b/firmware/controllers/generated/signature_cypress.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer
 //

-#define SIGNATURE_HASH 3637768076
-#define TS_SIGNATURE "rusEFI master.2023.04.12.cypress.3637768076"
+#define SIGNATURE_HASH 788718350
+#define TS_SIGNATURE "rusEFI master.2023.04.12.cypress.788718350"
--- a/firmware/controllers/generated/signature_f407-discovery.h
+++ b/firmware/controllers/generated/signature_f407-discovery.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 2963075370
-#define TS_SIGNATURE "rusEFI master.2023.04.12.f407-discovery.2963075370"
+#define SIGNATURE_HASH 1196293544
+#define TS_SIGNATURE "rusEFI master.2023.04.12.f407-discovery.1196293544"
--- a/firmware/controllers/generated/signature_f429-discovery.h
+++ b/firmware/controllers/generated/signature_f429-discovery.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 3637768076
-#define TS_SIGNATURE "rusEFI master.2023.04.12.f429-discovery.3637768076"
+#define SIGNATURE_HASH 788718350
+#define TS_SIGNATURE "rusEFI master.2023.04.12.f429-discovery.788718350"
--- a/firmware/controllers/generated/signature_frankenso_na6.h
+++ b/firmware/controllers/generated/signature_frankenso_na6.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 4202762054
-#define TS_SIGNATURE "rusEFI master.2023.04.12.frankenso_na6.4202762054"
+#define SIGNATURE_HASH 223347652
+#define TS_SIGNATURE "rusEFI master.2023.04.12.frankenso_na6.223347652"
--- a/firmware/controllers/generated/signature_harley81.h
+++ b/firmware/controllers/generated/signature_harley81.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 4292500164
-#define TS_SIGNATURE "rusEFI master.2023.04.12.harley81.4292500164"
+#define SIGNATURE_HASH 134960710
+#define TS_SIGNATURE "rusEFI master.2023.04.12.harley81.134960710"
--- a/firmware/controllers/generated/signature_hellen-gm-e67.h
+++ b/firmware/controllers/generated/signature_hellen-gm-e67.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 2206676558
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-gm-e67.2206676558"
+#define SIGNATURE_HASH 1951808204
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-gm-e67.1951808204"
--- a/firmware/controllers/generated/signature_hellen-honda-k.h
+++ b/firmware/controllers/generated/signature_hellen-honda-k.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 364607386
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-honda-k.364607386"
+#define SIGNATURE_HASH 3798629144
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-honda-k.3798629144"
--- a/firmware/controllers/generated/signature_hellen-nb1.h
+++ b/firmware/controllers/generated/signature_hellen-nb1.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 842301197
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-nb1.842301197"
+#define SIGNATURE_HASH 3320148879
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen-nb1.3320148879"
--- a/firmware/controllers/generated/signature_hellen121nissan.h
+++ b/firmware/controllers/generated/signature_hellen121nissan.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 871236730
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen121nissan.871236730"
+#define SIGNATURE_HASH 3292465400
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen121nissan.3292465400"
--- a/firmware/controllers/generated/signature_hellen121vag.h
+++ b/firmware/controllers/generated/signature_hellen121vag.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 1467455180
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen121vag.1467455180"
+#define SIGNATURE_HASH 2695273038
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen121vag.2695273038"
--- a/firmware/controllers/generated/signature_hellen128.h
+++ b/firmware/controllers/generated/signature_hellen128.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 2128874999
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen128.2128874999"
+#define SIGNATURE_HASH 2301952373
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen128.2301952373"
--- a/firmware/controllers/generated/signature_hellen154hyundai.h
+++ b/firmware/controllers/generated/signature_hellen154hyundai.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 4006032883
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen154hyundai.4006032883"
+#define SIGNATURE_HASH 420886897
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen154hyundai.420886897"
--- a/firmware/controllers/generated/signature_hellen72.h
+++ b/firmware/controllers/generated/signature_hellen72.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 219589625
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen72.219589625"
+#define SIGNATURE_HASH 4207388539
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen72.4207388539"
--- a/firmware/controllers/generated/signature_hellen81.h
+++ b/firmware/controllers/generated/signature_hellen81.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 2652638417
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen81.2652638417"
+#define SIGNATURE_HASH 1775042643
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen81.1775042643"
--- a/firmware/controllers/generated/signature_hellen88bmw.h
+++ b/firmware/controllers/generated/signature_hellen88bmw.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 3392588125
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen88bmw.3392588125"
+#define SIGNATURE_HASH 1038599647
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellen88bmw.1038599647"
--- a/firmware/controllers/generated/signature_hellenNA6.h
+++ b/firmware/controllers/generated/signature_hellenNA6.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 4068026199
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellenNA6.4068026199"
+#define SIGNATURE_HASH 94907349
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellenNA6.94907349"
--- a/firmware/controllers/generated/signature_hellenNA8_96.h
+++ b/firmware/controllers/generated/signature_hellenNA8_96.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 3651196779
-#define TS_SIGNATURE "rusEFI master.2023.04.12.hellenNA8_96.3651196779"
+#define SIGNATURE_HASH 779213801
+#define TS_SIGNATURE "rusEFI master.2023.04.12.hellenNA8_96.779213801"
--- a/firmware/controllers/generated/signature_kin.h
+++ b/firmware/controllers/generated/signature_kin.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer
 //

-#define SIGNATURE_HASH 2953071936
-#define TS_SIGNATURE "rusEFI master.2023.04.12.kin.2953071936"
+#define SIGNATURE_HASH 1205158338
+#define TS_SIGNATURE "rusEFI master.2023.04.12.kin.1205158338"
--- a/firmware/controllers/generated/signature_m74_9.h
+++ b/firmware/controllers/generated/signature_m74_9.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 123548343
-#define TS_SIGNATURE "rusEFI master.2023.04.12.m74_9.123548343"
+#define SIGNATURE_HASH 4035722805
+#define TS_SIGNATURE "rusEFI master.2023.04.12.m74_9.4035722805"
--- a/firmware/controllers/generated/signature_mre_f4.h
+++ b/firmware/controllers/generated/signature_mre_f4.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 607117740
-#define TS_SIGNATURE "rusEFI master.2023.04.12.mre_f4.607117740"
+#define SIGNATURE_HASH 3556699438
+#define TS_SIGNATURE "rusEFI master.2023.04.12.mre_f4.3556699438"
--- a/firmware/controllers/generated/signature_mre_f7.h
+++ b/firmware/controllers/generated/signature_mre_f7.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 607117740
-#define TS_SIGNATURE "rusEFI master.2023.04.12.mre_f7.607117740"
+#define SIGNATURE_HASH 3556699438
+#define TS_SIGNATURE "rusEFI master.2023.04.12.mre_f7.3556699438"
--- a/firmware/controllers/generated/signature_prometheus_405.h
+++ b/firmware/controllers/generated/signature_prometheus_405.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 2285450858
-#define TS_SIGNATURE "rusEFI master.2023.04.12.prometheus_405.2285450858"
+#define SIGNATURE_HASH 2145925864
+#define TS_SIGNATURE "rusEFI master.2023.04.12.prometheus_405.2145925864"
--- a/firmware/controllers/generated/signature_prometheus_469.h
+++ b/firmware/controllers/generated/signature_prometheus_469.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 2285450858
-#define TS_SIGNATURE "rusEFI master.2023.04.12.prometheus_469.2285450858"
+#define SIGNATURE_HASH 2145925864
+#define TS_SIGNATURE "rusEFI master.2023.04.12.prometheus_469.2145925864"
--- a/firmware/controllers/generated/signature_proteus_f4.h
+++ b/firmware/controllers/generated/signature_proteus_f4.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 4128536187
-#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_f4.4128536187"
+#define SIGNATURE_HASH 29719289
+#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_f4.29719289"
--- a/firmware/controllers/generated/signature_proteus_f7.h
+++ b/firmware/controllers/generated/signature_proteus_f7.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 4128536187
-#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_f7.4128536187"
+#define SIGNATURE_HASH 29719289
+#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_f7.29719289"
--- a/firmware/controllers/generated/signature_proteus_h7.h
+++ b/firmware/controllers/generated/signature_proteus_h7.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 4128536187
-#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_h7.4128536187"
+#define SIGNATURE_HASH 29719289
+#define TS_SIGNATURE "rusEFI master.2023.04.12.proteus_h7.29719289"
--- a/firmware/controllers/generated/signature_s105.h
+++ b/firmware/controllers/generated/signature_s105.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 4155149010
-#define TS_SIGNATURE "rusEFI master.2023.04.12.s105.4155149010"
+#define SIGNATURE_HASH 8095312
+#define TS_SIGNATURE "rusEFI master.2023.04.12.s105.8095312"
--- a/firmware/controllers/generated/signature_subaru_eg33_f7.h
+++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 2869869857
-#define TS_SIGNATURE "rusEFI master.2023.04.12.subaru_eg33_f7.2869869857"
+#define SIGNATURE_HASH 1558163875
+#define TS_SIGNATURE "rusEFI master.2023.04.12.subaru_eg33_f7.1558163875"
--- a/firmware/controllers/generated/signature_tdg-pdm8.h
+++ b/firmware/controllers/generated/signature_tdg-pdm8.h
@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //

-#define SIGNATURE_HASH 1383973806
-#define TS_SIGNATURE "rusEFI master.2023.04.12.tdg-pdm8.1383973806"
+#define SIGNATURE_HASH 2779565868
+#define TS_SIGNATURE "rusEFI master.2023.04.12.tdg-pdm8.2779565868"
--- a/firmware/controllers/lua/generated/output_lookup_generated.cpp
+++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp
@ -124,9 +124,6 @@ float getOutputValueByName(const char *name) {
 // lambdaValue
 		case -1119268893:
 			return engine->outputChannels.lambdaValue;
-// knockRetard
-		case -2096715875:
-			return engine->outputChannels.knockRetard;
 // idleCurrentPosition
 		case -736671365:
 			return engine->outputChannels.idleCurrentPosition;
--- a/firmware/tunerstudio/generated/rusefi.ini
+++ b/firmware/tunerstudio/generated/rusefi.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.f407-discovery.2963075370"
+	signature	= "rusEFI master.2023.04.12.f407-discovery.1196293544"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.f407-discovery.2963075370" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.f407-discovery.1196293544" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:45 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:13 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_48way.ini
+++ b/firmware/tunerstudio/generated/rusefi_48way.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.48way.2006346988"
+	signature	= "rusEFI master.2023.04.12.48way.2152161390"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.48way.2006346988" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.48way.2152161390" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:29 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:55 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini
+++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.alphax-2chan.2229532223"
+	signature	= "rusEFI master.2023.04.12.alphax-2chan.1932720829"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.alphax-2chan.2229532223" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.alphax-2chan.1932720829" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:04 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:26 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini
+++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.alphax-4chan.666524169"
+	signature	= "rusEFI master.2023.04.12.alphax-4chan.3496695435"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.alphax-4chan.666524169" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.alphax-4chan.3496695435" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:06 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:29 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini
+++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.alphax-8chan.168414886"
+	signature	= "rusEFI master.2023.04.12.alphax-8chan.4258841124"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.alphax-8chan.168414886" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.alphax-8chan.4258841124" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:07 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:30 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_atlas.ini
+++ b/firmware/tunerstudio/generated/rusefi_atlas.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.atlas.3289979563"
+	signature	= "rusEFI master.2023.04.12.atlas.868750889"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.atlas.3289979563" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.atlas.868750889" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:42 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:10 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_core8.ini
+++ b/firmware/tunerstudio/generated/rusefi_core8.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.core8.191621600"
+	signature	= "rusEFI master.2023.04.12.core8.4240106850"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.core8.191621600" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.core8.4240106850" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:28 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:53 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_cypress.ini
+++ b/firmware/tunerstudio/generated/rusefi_cypress.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.cypress.3637768076"
+	signature	= "rusEFI master.2023.04.12.cypress.788718350"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.cypress.3637768076" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.cypress.788718350" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Apr 12 14:18:02 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Apr 12 14:27:24 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini
+++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.f407-discovery.2963075370"
+	signature	= "rusEFI master.2023.04.12.f407-discovery.1196293544"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.f407-discovery.2963075370" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.f407-discovery.1196293544" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:40 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:07 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
+++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.f429-discovery.3637768076"
+	signature	= "rusEFI master.2023.04.12.f429-discovery.788718350"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.f429-discovery.3637768076" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.f429-discovery.788718350" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:41 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:09 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
+++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.frankenso_na6.4202762054"
+	signature	= "rusEFI master.2023.04.12.frankenso_na6.223347652"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.frankenso_na6.4202762054" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.frankenso_na6.223347652" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:33 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:59 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_harley81.ini
+++ b/firmware/tunerstudio/generated/rusefi_harley81.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.harley81.4292500164"
+	signature	= "rusEFI master.2023.04.12.harley81.134960710"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.harley81.4292500164" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.harley81.134960710" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:08 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:32 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen-gm-e67.2206676558"
+	signature	= "rusEFI master.2023.04.12.hellen-gm-e67.1951808204"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen-gm-e67.2206676558" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen-gm-e67.1951808204" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:21 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:46 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen-honda-k.364607386"
+	signature	= "rusEFI master.2023.04.12.hellen-honda-k.3798629144"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen-honda-k.364607386" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen-honda-k.3798629144" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:14 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:38 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen-nb1.842301197"
+	signature	= "rusEFI master.2023.04.12.hellen-nb1.3320148879"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen-nb1.842301197" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen-nb1.3320148879" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:20 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:45 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen121nissan.871236730"
+	signature	= "rusEFI master.2023.04.12.hellen121nissan.3292465400"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen121nissan.871236730" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen121nissan.3292465400" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:12 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:36 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen121vag.1467455180"
+	signature	= "rusEFI master.2023.04.12.hellen121vag.2695273038"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen121vag.1467455180" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen121vag.2695273038" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:11 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:35 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen128.2128874999"
+	signature	= "rusEFI master.2023.04.12.hellen128.2301952373"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen128.2128874999" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen128.2301952373" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:09 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:33 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen154hyundai.4006032883"
+	signature	= "rusEFI master.2023.04.12.hellen154hyundai.420886897"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen154hyundai.4006032883" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen154hyundai.420886897" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:15 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:39 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen72.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen72.219589625"
+	signature	= "rusEFI master.2023.04.12.hellen72.4207388539"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen72.219589625" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen72.4207388539" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:18 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:42 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen81.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen81.2652638417"
+	signature	= "rusEFI master.2023.04.12.hellen81.1775042643"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen81.2652638417" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen81.1775042643" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:19 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:43 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellen88bmw.3392588125"
+	signature	= "rusEFI master.2023.04.12.hellen88bmw.1038599647"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellen88bmw.3392588125" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellen88bmw.1038599647" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:16 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:40 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellenNA6.4068026199"
+	signature	= "rusEFI master.2023.04.12.hellenNA6.94907349"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellenNA6.4068026199" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellenNA6.94907349" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:23 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:48 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.hellenNA8_96.3651196779"
+	signature	= "rusEFI master.2023.04.12.hellenNA8_96.779213801"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.hellenNA8_96.3651196779" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.hellenNA8_96.779213801" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:24 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:49 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_kin.ini
+++ b/firmware/tunerstudio/generated/rusefi_kin.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.kin.2953071936"
+	signature	= "rusEFI master.2023.04.12.kin.1205158338"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.kin.2953071936" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.kin.1205158338" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Apr 12 14:18:01 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Apr 12 14:27:23 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_m74_9.ini
+++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.m74_9.123548343"
+	signature	= "rusEFI master.2023.04.12.m74_9.4035722805"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.m74_9.123548343" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.m74_9.4035722805" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:30 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:56 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.mre_f4.607117740"
+	signature	= "rusEFI master.2023.04.12.mre_f4.3556699438"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.mre_f4.607117740" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.mre_f4.3556699438" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:26 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:52 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4463,7 +4462,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.mre_f7.607117740"
+	signature	= "rusEFI master.2023.04.12.mre_f7.3556699438"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.mre_f7.607117740" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.mre_f7.3556699438" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:25 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:51 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4463,7 +4462,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.prometheus_405.2285450858"
+	signature	= "rusEFI master.2023.04.12.prometheus_405.2145925864"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.prometheus_405.2285450858" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.prometheus_405.2145925864" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:35 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:01 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.prometheus_469.2285450858"
+	signature	= "rusEFI master.2023.04.12.prometheus_469.2145925864"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.prometheus_469.2285450858" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.prometheus_469.2145925864" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:34 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:00 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.proteus_f4.4128536187"
+	signature	= "rusEFI master.2023.04.12.proteus_f4.29719289"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.proteus_f4.4128536187" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.proteus_f4.29719289" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:38 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:04 UTC 2023

 pageSize            = 26432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.proteus_f7.4128536187"
+	signature	= "rusEFI master.2023.04.12.proteus_f7.29719289"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.proteus_f7.4128536187" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.proteus_f7.29719289" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:36 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:03 UTC 2023

 pageSize            = 26432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.proteus_h7.4128536187"
+	signature	= "rusEFI master.2023.04.12.proteus_h7.29719289"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.proteus_h7.4128536187" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.proteus_h7.29719289" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:39 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:06 UTC 2023

 pageSize            = 26432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_s105.ini
+++ b/firmware/tunerstudio/generated/rusefi_s105.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.s105.4155149010"
+	signature	= "rusEFI master.2023.04.12.s105.8095312"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.s105.4155149010" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.s105.8095312" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:31 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:57 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.subaru_eg33_f7.2869869857"
+	signature	= "rusEFI master.2023.04.12.subaru_eg33_f7.1558163875"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.subaru_eg33_f7.2869869857" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.subaru_eg33_f7.1558163875" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:03 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Apr 12 14:27:25 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini
+++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini
@ -34,12 +34,12 @@ enable2ndByteCanID = false

 [MegaTune]
 ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.04.12.tdg-pdm8.1383973806"
+	signature	= "rusEFI master.2023.04.12.tdg-pdm8.2779565868"

 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.04.12.tdg-pdm8.1383973806" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.04.12.tdg-pdm8.2779565868" ; signature is expected to be 7 or more characters.

 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@ -87,7 +87,7 @@ enable2ndByteCanID = false
 	;  name					= scalar, type, offset,			units,	scale, translate,	lo,		hi, digits

 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:44 UTC 2023
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:11 UTC 2023

 pageSize            = 22432
 page = 1
@ -2281,8 +2281,7 @@ mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0
 MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0
 baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0
 lambdaValue = scalar, U16, 34, "", 1.0E-4, 0
-knockRetard = scalar, U08, 36, "deg", 0.1, 0
-idleCurrentPosition = scalar, U08, 37, "%", 0.5, 0
+idleCurrentPosition = scalar, U08, 36, "%", 0.5, 0
 VBatt = scalar, U16, 38, "V", 0.001, 0
 oilPressure = scalar, U16, 40, "kPa", 0.03333333333333333, 0
 vvtPositionB1I = scalar, S16, 42, "deg", 0.02, 0
@ -4292,7 +4291,7 @@ gaugeCategory = Knock
 	knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
 	knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0
-	knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
+	knockRetardGauge = m_knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1
 	knockCountGauge = m_knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0

 gaugeCategory = DynoView
@ -4462,7 +4461,6 @@ entry = mafMeasured, "MAF", float,  "%.3f"
 entry = MAPValue, "MAP", float,  "%.3f"
 entry = baroPressure, "baroPressure", float,  "%.3f"
 entry = lambdaValue, "Lambda", float,  "%.3f"
-entry = knockRetard, "knock: retard", float,  "%.3f"
 entry = idleCurrentPosition, "idleCurrentPosition", float,  "%.3f"
 entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
--- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
@ -1,6 +1,6 @@
 package com.rusefi.config.generated;

-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:18:47 UTC 2023
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 12 14:28:15 UTC 2023

 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@ -1006,6 +1006,7 @@ public class Fields {
 	public static final int SentEtbType_FORD_TYPE_1 = 2;
 	public static final int SentEtbType_GM_TYPE_1 = 1;
 	public static final int SentEtbType_NONE = 0;
+	public static final int SIGNATURE_HASH = 1196293544;
 	public static final int specs_s_size = 12;
 	public static final int spi_device_e_SPI_DEVICE_1 = 1;
 	public static final int spi_device_e_SPI_DEVICE_2 = 2;
@ -1231,7 +1232,7 @@ public class Fields {
 	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 String TS_SIGNATURE = "rusEFI master.2023.04.12.f407-discovery.2963075370";
+	public static final String TS_SIGNATURE = "rusEFI master.2023.04.12.f407-discovery.1196293544";
 	public static final char TS_SINGLE_WRITE_COMMAND = 'W';
 	public static final char TS_TEST_COMMAND = 't';
 	public static final int TS_TOTAL_OUTPUT_SIZE = 1376;
--- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java
+++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java
@ -1,6 +1,6 @@
 package com.rusefi.config.generated;

-// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Apr 12 14:18:00 UTC 2023
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Apr 12 14:27:21 UTC 2023

 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@ -448,8 +448,8 @@ public class TsOutputs {
 	public static final Field MAPVALUE = Field.create("MAPVALUE", 30, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(0);
 	public static final Field BAROPRESSURE = Field.create("BAROPRESSURE", 32, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(0);
 	public static final Field LAMBDAVALUE = Field.create("LAMBDAVALUE", 34, FieldType.INT16).setScale(1.0E-4).setBaseOffset(0);
-	public static final Field KNOCKRETARD = Field.create("KNOCKRETARD", 36, FieldType.INT8).setScale(0.1).setBaseOffset(0);
-	public static final Field IDLECURRENTPOSITION = Field.create("IDLECURRENTPOSITION", 37, FieldType.INT8).setScale(0.5).setBaseOffset(0);
+	public static final Field IDLECURRENTPOSITION = Field.create("IDLECURRENTPOSITION", 36, FieldType.INT8).setScale(0.5).setBaseOffset(0);
+	public static final Field ALIGNMENTFILL_AT_37 = Field.create("ALIGNMENTFILL_AT_37", 37, FieldType.INT8).setScale(1.0).setBaseOffset(0);
 	public static final Field VBATT = Field.create("VBATT", 38, FieldType.INT16).setScale(0.001).setBaseOffset(0);
 	public static final Field OILPRESSURE = Field.create("OILPRESSURE", 40, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(0);
 	public static final Field VVTPOSITIONB1I = Field.create("VVTPOSITIONB1I", 42, FieldType.INT16).setScale(0.02).setBaseOffset(0);
@ -929,8 +929,8 @@ public class TsOutputs {
 	MAPVALUE,
 	BAROPRESSURE,
 	LAMBDAVALUE,
-	KNOCKRETARD,
 	IDLECURRENTPOSITION,
+	ALIGNMENTFILL_AT_37,
 	VBATT,
 	OILPRESSURE,
 	VVTPOSITIONB1I,