diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h
index 3ccde7c813..78812593fd 100644
--- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h
@@ -1026,7 +1026,7 @@
 #define SENT_INPUT_COUNT 1
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH snap_36933
+#define SIGNATURE_HASH snap_40486
 #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
@@ -1298,7 +1298,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI 2022.11.02.cypress.snap_36933"
+#define TS_SIGNATURE "rusEFI 2022.11.02.cypress.snap_40486"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
index 83a0d727a9..a64511de71 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -1026,7 +1026,7 @@
 #define SENT_INPUT_COUNT 1
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH snap_12937
+#define SIGNATURE_HASH snap_15594
 #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
@@ -1298,7 +1298,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI 2022.11.02.kin.snap_12937"
+#define TS_SIGNATURE "rusEFI 2022.11.02.kin.snap_15594"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
index b7c72d1d9b..f90d96f2c9 100644
--- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
@@ -992,7 +992,7 @@
 #define show_Frankenso_presets false
 #define show_Proteus_presets false
 #define show_test_presets false
-#define SIGNATURE_HASH snap_18847
+#define SIGNATURE_HASH snap_18428
 #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
@@ -1265,7 +1265,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI 2022.11.02.subaru_eg33_f7.snap_18847"
+#define TS_SIGNATURE "rusEFI 2022.11.02.subaru_eg33_f7.snap_18428"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index f6ca659721..5a543a6c44 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -1026,7 +1026,7 @@
 #define SENT_INPUT_COUNT 1
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH snap_36933
+#define SIGNATURE_HASH snap_40486
 #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
@@ -1298,7 +1298,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI 2022.11.02.all.snap_36933"
+#define TS_SIGNATURE "rusEFI 2022.11.02.all.snap_40486"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h
index 8e3ae62a7d..c259155207 100644
--- 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 snap_38922
-#define TS_SIGNATURE "rusEFI 2022.11.02.48way.snap_38922"
+#define SIGNATURE_HASH snap_38505
+#define TS_SIGNATURE "rusEFI 2022.11.02.48way.snap_38505"
diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h
index 629613f127..56d3703866 100644
--- a/firmware/controllers/generated/signature_all.h
+++ b/firmware/controllers/generated/signature_all.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH snap_36933
-#define TS_SIGNATURE "rusEFI 2022.11.02.all.snap_36933"
+#define SIGNATURE_HASH snap_40486
+#define TS_SIGNATURE "rusEFI 2022.11.02.all.snap_40486"
diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h
index 5f69b54c99..7f28e595db 100644
--- 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 snap_3369
-#define TS_SIGNATURE "rusEFI 2022.11.02.alphax-2chan.snap_3369"
+#define SIGNATURE_HASH snap_842
+#define TS_SIGNATURE "rusEFI 2022.11.02.alphax-2chan.snap_842"
diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h
index 840e2fbf7c..6696b2413d 100644
--- 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 snap_21450
-#define TS_SIGNATURE "rusEFI 2022.11.02.alphax-4chan.snap_21450"
+#define SIGNATURE_HASH snap_23977
+#define TS_SIGNATURE "rusEFI 2022.11.02.alphax-4chan.snap_23977"
diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h
index c4d32a023b..ae3f4d6abd 100644
--- 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 snap_25954
-#define TS_SIGNATURE "rusEFI 2022.11.02.atlas.snap_25954"
+#define SIGNATURE_HASH snap_27393
+#define TS_SIGNATURE "rusEFI 2022.11.02.atlas.snap_27393"
diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h
index 452c286a6a..9c519c7316 100644
--- 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 snap_49596
-#define TS_SIGNATURE "rusEFI 2022.11.02.core8.snap_49596"
+#define SIGNATURE_HASH snap_53215
+#define TS_SIGNATURE "rusEFI 2022.11.02.core8.snap_53215"
diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h
index 3b1947c815..d8f72a4344 100644
--- 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 snap_36933
-#define TS_SIGNATURE "rusEFI 2022.11.02.cypress.snap_36933"
+#define SIGNATURE_HASH snap_40486
+#define TS_SIGNATURE "rusEFI 2022.11.02.cypress.snap_40486"
diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h
index 176fc9f273..c7c0d44312 100644
--- 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 snap_36933
-#define TS_SIGNATURE "rusEFI 2022.11.02.f407-discovery.snap_36933"
+#define SIGNATURE_HASH snap_40486
+#define TS_SIGNATURE "rusEFI 2022.11.02.f407-discovery.snap_40486"
diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h
index 9eb85fb06b..acd2901992 100644
--- 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 snap_36933
-#define TS_SIGNATURE "rusEFI 2022.11.02.f429-discovery.snap_36933"
+#define SIGNATURE_HASH snap_40486
+#define TS_SIGNATURE "rusEFI 2022.11.02.f429-discovery.snap_40486"
diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h
index 432a459608..a85023a3d8 100644
--- 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 snap_27777
-#define TS_SIGNATURE "rusEFI 2022.11.02.frankenso_na6.snap_27777"
+#define SIGNATURE_HASH snap_25314
+#define TS_SIGNATURE "rusEFI 2022.11.02.frankenso_na6.snap_25314"
diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h
index b544eaf2de..471bfce338 100644
--- 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 snap_38250
-#define TS_SIGNATURE "rusEFI 2022.11.02.harley81.snap_38250"
+#define SIGNATURE_HASH snap_39689
+#define TS_SIGNATURE "rusEFI 2022.11.02.harley81.snap_39689"
diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h
index 2d9f74cb7d..fc97567684 100644
--- 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 snap_4164
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellen-gm-e67.snap_4164"
+#define SIGNATURE_HASH snap_7719
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellen-gm-e67.snap_7719"
diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h
index 4d00b2ba29..89d533a903 100644
--- 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 snap_41353
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellen-nb1.snap_41353"
+#define SIGNATURE_HASH snap_45034
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellen-nb1.snap_45034"
diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h
index 4c31cf4bac..ee95515711 100644
--- 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 snap_10415
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellen121nissan.snap_10415"
+#define SIGNATURE_HASH snap_9932
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellen121nissan.snap_9932"
diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h
index 2a88e4166c..f944006dcc 100644
--- 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 snap_21311
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellen121vag.snap_21311"
+#define SIGNATURE_HASH snap_23900
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellen121vag.snap_23900"
diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h
index edc6a37847..f18ac8eac0 100644
--- 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 snap_60798
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellen128.snap_60798"
+#define SIGNATURE_HASH snap_58141
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellen128.snap_58141"
diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h
index 5cfc048e82..2760ba5192 100644
--- 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 snap_9837
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellen154hyundai.snap_9837"
+#define SIGNATURE_HASH snap_10254
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellen154hyundai.snap_10254"
diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h
index 2f4d150f9c..b5a1cc8df7 100644
--- 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 snap_40654
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellen72.snap_40654"
+#define SIGNATURE_HASH snap_37037
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellen72.snap_37037"
diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h
index b505ab0fdc..cbcf6e7b08 100644
--- 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 snap_18511
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellen81.snap_18511"
+#define SIGNATURE_HASH snap_17964
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellen81.snap_17964"
diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h
index 359a2d6af5..614a7b6a41 100644
--- 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 snap_33673
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellen88bmw.snap_33673"
+#define SIGNATURE_HASH snap_36330
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellen88bmw.snap_36330"
diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h
index b6381599b6..09d0d6d104 100644
--- 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 snap_8562
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellenNA6.snap_8562"
+#define SIGNATURE_HASH snap_12049
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellenNA6.snap_12049"
diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h
index e72496b244..85495c8237 100644
--- 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 snap_8621
-#define TS_SIGNATURE "rusEFI 2022.11.02.hellenNA8_96.snap_8621"
+#define SIGNATURE_HASH snap_12238
+#define TS_SIGNATURE "rusEFI 2022.11.02.hellenNA8_96.snap_12238"
diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h
index 76590cc698..b0d12c3dbc 100644
--- 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 snap_12937
-#define TS_SIGNATURE "rusEFI 2022.11.02.kin.snap_12937"
+#define SIGNATURE_HASH snap_15594
+#define TS_SIGNATURE "rusEFI 2022.11.02.kin.snap_15594"
diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h
index 9edff54ac2..1a08d8e764 100644
--- 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 snap_63301
-#define TS_SIGNATURE "rusEFI 2022.11.02.mre_f4.snap_63301"
+#define SIGNATURE_HASH snap_63782
+#define TS_SIGNATURE "rusEFI 2022.11.02.mre_f4.snap_63782"
diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h
index cbf55ae24c..94b5b3819b 100644
--- 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 snap_63301
-#define TS_SIGNATURE "rusEFI 2022.11.02.mre_f7.snap_63301"
+#define SIGNATURE_HASH snap_63782
+#define TS_SIGNATURE "rusEFI 2022.11.02.mre_f7.snap_63782"
diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h
index 1338f5d2cf..6eca6494a9 100644
--- 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 snap_18851
-#define TS_SIGNATURE "rusEFI 2022.11.02.prometheus_405.snap_18851"
+#define SIGNATURE_HASH snap_18368
+#define TS_SIGNATURE "rusEFI 2022.11.02.prometheus_405.snap_18368"
diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h
index d7d4141477..532ac60427 100644
--- 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 snap_18851
-#define TS_SIGNATURE "rusEFI 2022.11.02.prometheus_469.snap_18851"
+#define SIGNATURE_HASH snap_18368
+#define TS_SIGNATURE "rusEFI 2022.11.02.prometheus_469.snap_18368"
diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h
index 43fcd170cf..176380ef9a 100644
--- 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 snap_22323
-#define TS_SIGNATURE "rusEFI 2022.11.02.proteus_f4.snap_22323"
+#define SIGNATURE_HASH snap_22864
+#define TS_SIGNATURE "rusEFI 2022.11.02.proteus_f4.snap_22864"
diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h
index b627079992..967f1ad4c5 100644
--- 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 snap_22323
-#define TS_SIGNATURE "rusEFI 2022.11.02.proteus_f7.snap_22323"
+#define SIGNATURE_HASH snap_22864
+#define TS_SIGNATURE "rusEFI 2022.11.02.proteus_f7.snap_22864"
diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h
index 9a121a79b7..2be7c92b33 100644
--- 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 snap_22323
-#define TS_SIGNATURE "rusEFI 2022.11.02.proteus_h7.snap_22323"
+#define SIGNATURE_HASH snap_22864
+#define TS_SIGNATURE "rusEFI 2022.11.02.proteus_h7.snap_22864"
diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h
index 29410c9443..7f9df91d75 100644
--- 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 snap_18847
-#define TS_SIGNATURE "rusEFI 2022.11.02.subaru_eg33_f7.snap_18847"
+#define SIGNATURE_HASH snap_18428
+#define TS_SIGNATURE "rusEFI 2022.11.02.subaru_eg33_f7.snap_18428"
diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h
index b4f83d147d..734e5f7d72 100644
--- 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 snap_24081
-#define TS_SIGNATURE "rusEFI 2022.11.02.tdg-pdm8.snap_24081"
+#define SIGNATURE_HASH snap_20594
+#define TS_SIGNATURE "rusEFI 2022.11.02.tdg-pdm8.snap_20594"
diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini
index 2684ba34b2..6385dfbd33 100644
--- a/firmware/tunerstudio/generated/rusefi.ini
+++ b/firmware/tunerstudio/generated/rusefi.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.all.snap_36933"
+	signature	= "rusEFI 2022.11.02.all.snap_40486"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.all.snap_36933" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.all.snap_40486" ; 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
@@ -86,7 +86,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 Nov 02 02:49:49 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:38 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6132,15 +6132,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6170,12 +6170,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6186,8 +6186,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6199,8 +6199,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6267,14 +6267,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6870,10 +6870,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6922,7 +6922,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6980,7 +6980,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7660,18 +7660,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7687,10 +7687,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7832,7 +7832,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7977,13 +7977,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini
index 0e212a7da1..41d19c89b3 100644
--- a/firmware/tunerstudio/generated/rusefi_48way.ini
+++ b/firmware/tunerstudio/generated/rusefi_48way.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.48way.snap_38922"
+	signature	= "rusEFI 2022.11.02.48way.snap_38505"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.48way.snap_38922" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.48way.snap_38505" ; 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
@@ -86,7 +86,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 Nov 02 02:49:27 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:21 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6130,15 +6130,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6168,12 +6168,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6184,8 +6184,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6197,8 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6265,14 +6265,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6866,10 +6866,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6918,7 +6918,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6976,7 +6976,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7655,18 +7655,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7682,10 +7682,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7827,7 +7827,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7969,13 +7969,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini
index 70c6ca1f7b..8d49161303 100644
--- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini
+++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.alphax-2chan.snap_3369"
+	signature	= "rusEFI 2022.11.02.alphax-2chan.snap_842"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.alphax-2chan.snap_3369" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.alphax-2chan.snap_842" ; 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
@@ -86,7 +86,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 Nov 02 02:48:51 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:56:54 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6126,15 +6126,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6164,12 +6164,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6180,8 +6180,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6193,8 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6851,10 +6851,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6903,7 +6903,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6961,7 +6961,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7634,18 +7634,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7661,10 +7661,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7939,13 +7939,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini
index d457461eb9..32a334a5f2 100644
--- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini
+++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.alphax-4chan.snap_21450"
+	signature	= "rusEFI 2022.11.02.alphax-4chan.snap_23977"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.alphax-4chan.snap_21450" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.alphax-4chan.snap_23977" ; 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
@@ -86,7 +86,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 Nov 02 02:48:53 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:56:56 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6129,15 +6129,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6167,12 +6167,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6183,8 +6183,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6196,8 +6196,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6264,14 +6264,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6855,10 +6855,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6907,7 +6907,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6965,7 +6965,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7638,18 +7638,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7665,10 +7665,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7943,13 +7943,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini
index ca6d302665..f4d1f8d616 100644
--- a/firmware/tunerstudio/generated/rusefi_atlas.ini
+++ b/firmware/tunerstudio/generated/rusefi_atlas.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.atlas.snap_25954"
+	signature	= "rusEFI 2022.11.02.atlas.snap_27393"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.atlas.snap_25954" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.atlas.snap_27393" ; 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
@@ -86,7 +86,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 Nov 02 02:49:45 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:35 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6132,15 +6132,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6170,12 +6170,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6186,8 +6186,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6199,8 +6199,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6267,14 +6267,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6862,10 +6862,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6914,7 +6914,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6972,7 +6972,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7652,18 +7652,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7679,10 +7679,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7968,13 +7968,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini
index 6a2f9a56a6..ca59b18414 100644
--- a/firmware/tunerstudio/generated/rusefi_core8.ini
+++ b/firmware/tunerstudio/generated/rusefi_core8.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.core8.snap_49596"
+	signature	= "rusEFI 2022.11.02.core8.snap_53215"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.core8.snap_49596" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.core8.snap_53215" ; 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
@@ -86,7 +86,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 Nov 02 02:49:25 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:19 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6130,15 +6130,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6168,12 +6168,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6184,8 +6184,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6197,8 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6265,14 +6265,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6866,10 +6866,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6918,7 +6918,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6976,7 +6976,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7655,18 +7655,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7682,10 +7682,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7827,7 +7827,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7969,13 +7969,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini
index d977193d83..c190d37d74 100644
--- a/firmware/tunerstudio/generated/rusefi_cypress.ini
+++ b/firmware/tunerstudio/generated/rusefi_cypress.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.cypress.snap_36933"
+	signature	= "rusEFI 2022.11.02.cypress.snap_40486"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.cypress.snap_36933" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.cypress.snap_40486" ; 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
@@ -86,7 +86,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 Nov 02 02:48:47 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Nov 02 02:56:52 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6132,15 +6132,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6170,12 +6170,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6186,8 +6186,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6199,8 +6199,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6267,14 +6267,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6870,10 +6870,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6922,7 +6922,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6980,7 +6980,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7660,18 +7660,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7687,10 +7687,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7832,7 +7832,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7977,13 +7977,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini
index 4e51c865d3..56585c3e31 100644
--- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini
+++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.f407-discovery.snap_36933"
+	signature	= "rusEFI 2022.11.02.f407-discovery.snap_40486"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.f407-discovery.snap_36933" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.f407-discovery.snap_40486" ; 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
@@ -86,7 +86,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 Nov 02 02:49:41 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:32 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6132,15 +6132,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6170,12 +6170,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6186,8 +6186,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6199,8 +6199,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6267,14 +6267,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6870,10 +6870,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6922,7 +6922,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6980,7 +6980,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7660,18 +7660,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7687,10 +7687,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7832,7 +7832,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7977,13 +7977,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
index d76d5363ff..a04525cdc7 100644
--- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
+++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.f429-discovery.snap_36933"
+	signature	= "rusEFI 2022.11.02.f429-discovery.snap_40486"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.f429-discovery.snap_36933" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.f429-discovery.snap_40486" ; 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
@@ -86,7 +86,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 Nov 02 02:49:43 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:33 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6132,15 +6132,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6170,12 +6170,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6186,8 +6186,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6199,8 +6199,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6267,14 +6267,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6870,10 +6870,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6922,7 +6922,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6980,7 +6980,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7660,18 +7660,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7687,10 +7687,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7832,7 +7832,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7977,13 +7977,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
index 0ab101cf8e..f2c5a5d626 100644
--- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
+++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.frankenso_na6.snap_27777"
+	signature	= "rusEFI 2022.11.02.frankenso_na6.snap_25314"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.frankenso_na6.snap_27777" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.frankenso_na6.snap_25314" ; 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
@@ -86,7 +86,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 Nov 02 02:49:29 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:22 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6132,15 +6132,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6170,12 +6170,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6186,8 +6186,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6199,8 +6199,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6267,14 +6267,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6870,10 +6870,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6922,7 +6922,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6980,7 +6980,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7660,18 +7660,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7687,10 +7687,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7832,7 +7832,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7977,13 +7977,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini
index 58dcf06b0b..ce8423ed88 100644
--- a/firmware/tunerstudio/generated/rusefi_harley81.ini
+++ b/firmware/tunerstudio/generated/rusefi_harley81.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.harley81.snap_38250"
+	signature	= "rusEFI 2022.11.02.harley81.snap_39689"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.harley81.snap_38250" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.harley81.snap_39689" ; 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
@@ -86,7 +86,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 Nov 02 02:48:55 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:56:57 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6128,15 +6128,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6166,12 +6166,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6182,8 +6182,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6195,8 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6852,10 +6852,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6904,7 +6904,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6962,7 +6962,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7635,18 +7635,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7662,10 +7662,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7941,13 +7941,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini
index 3711a71e9a..d7b80301e0 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellen-gm-e67.snap_4164"
+	signature	= "rusEFI 2022.11.02.hellen-gm-e67.snap_7719"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellen-gm-e67.snap_4164" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellen-gm-e67.snap_7719" ; 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
@@ -86,7 +86,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 Nov 02 02:49:14 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:11 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6129,15 +6129,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6167,12 +6167,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6183,8 +6183,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6196,8 +6196,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6264,14 +6264,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6855,10 +6855,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6907,7 +6907,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6965,7 +6965,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7636,18 +7636,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7663,10 +7663,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7941,13 +7941,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
index c88d31a947..67af672585 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellen-nb1.snap_41353"
+	signature	= "rusEFI 2022.11.02.hellen-nb1.snap_45034"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellen-nb1.snap_41353" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellen-nb1.snap_45034" ; 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
@@ -86,7 +86,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 Nov 02 02:49:12 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:10 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6129,15 +6129,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6167,12 +6167,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6183,8 +6183,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6196,8 +6196,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6264,14 +6264,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6855,10 +6855,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6907,7 +6907,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6965,7 +6965,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7636,18 +7636,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7663,10 +7663,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7942,13 +7942,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
index 69ccfd4030..b31fa47784 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellen121nissan.snap_10415"
+	signature	= "rusEFI 2022.11.02.hellen121nissan.snap_9932"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellen121nissan.snap_10415" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellen121nissan.snap_9932" ; 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
@@ -86,7 +86,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 Nov 02 02:49:02 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:02 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6128,15 +6128,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6166,12 +6166,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6182,8 +6182,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6195,8 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6852,10 +6852,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6904,7 +6904,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6962,7 +6962,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7632,18 +7632,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7659,10 +7659,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7940,13 +7940,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
index 5b075dd22a..43a72b1b49 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellen121vag.snap_21311"
+	signature	= "rusEFI 2022.11.02.hellen121vag.snap_23900"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellen121vag.snap_21311" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellen121vag.snap_23900" ; 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
@@ -86,7 +86,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 Nov 02 02:49:00 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:01 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6129,15 +6129,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6167,12 +6167,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6183,8 +6183,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6196,8 +6196,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6264,14 +6264,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6855,10 +6855,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6907,7 +6907,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6965,7 +6965,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7635,18 +7635,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7662,10 +7662,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7945,13 +7945,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
index 8eb2c47b3a..9016d399e8 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellen128.snap_60798"
+	signature	= "rusEFI 2022.11.02.hellen128.snap_58141"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellen128.snap_60798" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellen128.snap_58141" ; 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
@@ -86,7 +86,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 Nov 02 02:48:58 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:56:59 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6128,15 +6128,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6166,12 +6166,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6182,8 +6182,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6195,8 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6852,10 +6852,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6904,7 +6904,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6962,7 +6962,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7632,18 +7632,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7659,10 +7659,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7940,13 +7940,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
index 724c0d0725..73abb0a15a 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellen154hyundai.snap_9837"
+	signature	= "rusEFI 2022.11.02.hellen154hyundai.snap_10254"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellen154hyundai.snap_9837" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellen154hyundai.snap_10254" ; 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
@@ -86,7 +86,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 Nov 02 02:49:04 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:04 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6128,15 +6128,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6166,12 +6166,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6182,8 +6182,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6195,8 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6852,10 +6852,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6904,7 +6904,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6962,7 +6962,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7632,18 +7632,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7659,10 +7659,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7939,13 +7939,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini
index 574efb9978..8073b39d35 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen72.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellen72.snap_40654"
+	signature	= "rusEFI 2022.11.02.hellen72.snap_37037"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellen72.snap_40654" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellen72.snap_37037" ; 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
@@ -86,7 +86,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 Nov 02 02:49:08 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:07 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6129,15 +6129,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6167,12 +6167,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6183,8 +6183,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6196,8 +6196,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6264,14 +6264,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6855,10 +6855,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6907,7 +6907,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6965,7 +6965,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7636,18 +7636,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7663,10 +7663,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7942,13 +7942,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini
index 71214a0237..3ba8c92f32 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen81.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellen81.snap_18511"
+	signature	= "rusEFI 2022.11.02.hellen81.snap_17964"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellen81.snap_18511" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellen81.snap_17964" ; 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
@@ -86,7 +86,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 Nov 02 02:49:10 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:08 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6127,15 +6127,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6165,12 +6165,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6181,8 +6181,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6194,8 +6194,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6262,14 +6262,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6853,10 +6853,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6905,7 +6905,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6963,7 +6963,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7633,18 +7633,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7660,10 +7660,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7938,13 +7938,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
index 808b8672e5..7f2cbc8963 100644
--- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellen88bmw.snap_33673"
+	signature	= "rusEFI 2022.11.02.hellen88bmw.snap_36330"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellen88bmw.snap_33673" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellen88bmw.snap_36330" ; 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
@@ -86,7 +86,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 Nov 02 02:49:06 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:05 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6128,15 +6128,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6166,12 +6166,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6182,8 +6182,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6195,8 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6852,10 +6852,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6904,7 +6904,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6962,7 +6962,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7631,18 +7631,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7658,10 +7658,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7936,13 +7936,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
index 720d5fa349..b3763395b1 100644
--- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellenNA6.snap_8562"
+	signature	= "rusEFI 2022.11.02.hellenNA6.snap_12049"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellenNA6.snap_8562" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellenNA6.snap_12049" ; 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
@@ -86,7 +86,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 Nov 02 02:49:16 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:13 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6129,15 +6129,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6167,12 +6167,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6183,8 +6183,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6196,8 +6196,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6264,14 +6264,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6855,10 +6855,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6907,7 +6907,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6965,7 +6965,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7636,18 +7636,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7663,10 +7663,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7943,13 +7943,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini
index 9f1fbc96bf..2950b3745b 100644
--- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini
+++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.hellenNA8_96.snap_8621"
+	signature	= "rusEFI 2022.11.02.hellenNA8_96.snap_12238"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.hellenNA8_96.snap_8621" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.hellenNA8_96.snap_12238" ; 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
@@ -86,7 +86,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 Nov 02 02:49:18 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:14 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6129,15 +6129,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6167,12 +6167,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6183,8 +6183,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6196,8 +6196,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6264,14 +6264,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6855,10 +6855,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6907,7 +6907,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6965,7 +6965,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7636,18 +7636,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7663,10 +7663,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7941,13 +7941,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini
index a357745e2d..533fb54f45 100644
--- a/firmware/tunerstudio/generated/rusefi_kin.ini
+++ b/firmware/tunerstudio/generated/rusefi_kin.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.kin.snap_12937"
+	signature	= "rusEFI 2022.11.02.kin.snap_15594"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.kin.snap_12937" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.kin.snap_15594" ; 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
@@ -86,7 +86,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 Nov 02 02:48:45 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Nov 02 02:56:50 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6132,15 +6132,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6170,12 +6170,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6187,8 +6187,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6200,8 +6200,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6268,14 +6268,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6871,10 +6871,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6923,7 +6923,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6981,7 +6981,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7661,18 +7661,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7688,10 +7688,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7833,7 +7833,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7978,13 +7978,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
index ba57ea424c..bd9e38f12d 100644
--- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.mre_f4.snap_63301"
+	signature	= "rusEFI 2022.11.02.mre_f4.snap_63782"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.mre_f4.snap_63301" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.mre_f4.snap_63782" ; 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
@@ -86,7 +86,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 Nov 02 02:49:22 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:18 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6130,15 +6130,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6168,12 +6168,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6184,8 +6184,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6197,8 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6265,14 +6265,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6854,10 +6854,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6906,7 +6906,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6964,7 +6964,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7634,18 +7634,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7661,10 +7661,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7947,13 +7947,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
index 2c7de73885..a8c2157fb0 100644
--- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.mre_f7.snap_63301"
+	signature	= "rusEFI 2022.11.02.mre_f7.snap_63782"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.mre_f7.snap_63301" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.mre_f7.snap_63782" ; 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
@@ -86,7 +86,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 Nov 02 02:49:20 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:16 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6130,15 +6130,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6168,12 +6168,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6184,8 +6184,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6197,8 +6197,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6265,14 +6265,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6854,10 +6854,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6906,7 +6906,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6964,7 +6964,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7634,18 +7634,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7661,10 +7661,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7947,13 +7947,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
index 4311a69bef..f5adc4fa3d 100644
--- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.prometheus_405.snap_18851"
+	signature	= "rusEFI 2022.11.02.prometheus_405.snap_18368"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.prometheus_405.snap_18851" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.prometheus_405.snap_18368" ; 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
@@ -86,7 +86,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 Nov 02 02:49:32 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:25 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6126,15 +6126,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6164,12 +6164,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6180,8 +6180,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6193,8 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6864,10 +6864,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6916,7 +6916,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6974,7 +6974,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7654,18 +7654,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7681,10 +7681,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7826,7 +7826,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7971,13 +7971,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
index faf9da7808..df20f61207 100644
--- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
+++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.prometheus_469.snap_18851"
+	signature	= "rusEFI 2022.11.02.prometheus_469.snap_18368"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.prometheus_469.snap_18851" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.prometheus_469.snap_18368" ; 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
@@ -86,7 +86,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 Nov 02 02:49:30 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:24 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6126,15 +6126,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6164,12 +6164,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6180,8 +6180,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6193,8 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6864,10 +6864,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6916,7 +6916,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6974,7 +6974,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7654,18 +7654,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7681,10 +7681,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7826,7 +7826,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7971,13 +7971,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
index eca161e3ad..cc5acc3ffc 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.proteus_f4.snap_22323"
+	signature	= "rusEFI 2022.11.02.proteus_f4.snap_22864"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.proteus_f4.snap_22323" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.proteus_f4.snap_22864" ; 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
@@ -86,7 +86,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 Nov 02 02:49:37 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:29 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6126,15 +6126,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6164,12 +6164,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6180,8 +6180,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6193,8 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6846,10 +6846,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6898,7 +6898,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6956,7 +6956,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7623,18 +7623,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7650,10 +7650,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7795,7 +7795,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7939,13 +7939,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
index 29cf3fdea5..02d00666d4 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.proteus_f7.snap_22323"
+	signature	= "rusEFI 2022.11.02.proteus_f7.snap_22864"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.proteus_f7.snap_22323" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.proteus_f7.snap_22864" ; 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
@@ -86,7 +86,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 Nov 02 02:49:35 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:27 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6126,15 +6126,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6164,12 +6164,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6180,8 +6180,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6193,8 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6846,10 +6846,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6898,7 +6898,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6956,7 +6956,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7623,18 +7623,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7650,10 +7650,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7795,7 +7795,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7939,13 +7939,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini
index 1ac80c68f9..697857430f 100644
--- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini
+++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.proteus_h7.snap_22323"
+	signature	= "rusEFI 2022.11.02.proteus_h7.snap_22864"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.proteus_h7.snap_22323" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.proteus_h7.snap_22864" ; 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
@@ -86,7 +86,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 Nov 02 02:49:39 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:30 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6126,15 +6126,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6164,12 +6164,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6180,8 +6180,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6193,8 +6193,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6261,14 +6261,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6846,10 +6846,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6898,7 +6898,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6956,7 +6956,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7623,18 +7623,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7650,10 +7650,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7795,7 +7795,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7939,13 +7939,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
index 01aa2954b0..7cb9b7b5bc 100644
--- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
+++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.subaru_eg33_f7.snap_18847"
+	signature	= "rusEFI 2022.11.02.subaru_eg33_f7.snap_18428"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.subaru_eg33_f7.snap_18847" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.subaru_eg33_f7.snap_18428" ; 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
@@ -86,7 +86,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 Nov 02 02:48:49 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Nov 02 02:56:53 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6128,15 +6128,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6166,12 +6166,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6182,8 +6182,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6195,8 +6195,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6263,14 +6263,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6864,10 +6864,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6916,7 +6916,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6974,7 +6974,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7649,18 +7649,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7676,10 +7676,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7821,7 +7821,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7961,13 +7961,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini
index da2594eebc..aca5fd38f1 100644
--- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini
+++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI 2022.11.02.tdg-pdm8.snap_24081"
+	signature	= "rusEFI 2022.11.02.tdg-pdm8.snap_20594"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI 2022.11.02.tdg-pdm8.snap_24081" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI 2022.11.02.tdg-pdm8.snap_20594" ; 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
@@ -86,7 +86,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 Nov 02 02:49:46 UTC 2022
+; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:36 UTC 2022
 
 pageSize            = 22800
 page = 1
@@ -2127,7 +2127,7 @@ veBlends4_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1
 		recordField = time,				"Time",			8,			32,			0.001,	"ms"
 
 		; it seems that TS also needs to know the diff.size of a tooth
-		calcField = toothTime,			"ToothTime",	"ms",		{ time - pastValue(time, 1) }
+		calcField = toothTime,			"ToothTime",	"ms", { time - pastValue(time, 1) }
 
 
 [VeAnalyze]
@@ -3393,11 +3393,11 @@ esr = scalar, U16, 1276, "", 1, 0
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
 
-	maintainConstantValue = throttlePedalUpVoltage,			{ (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
+	maintainConstantValue = throttlePedalUpVoltage, { (calibrationMode == 12 ) ? calibrationValue  : throttlePedalUpVoltage }
 	maintainConstantValue = throttlePedalSecondaryUpVoltage, { (calibrationMode == 12 ) ? calibrationValue2 : throttlePedalSecondaryUpVoltage }
 
-	maintainConstantValue = throttlePedalWOTVoltage,			{ (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
-	maintainConstantValue = throttlePedalSecondaryWOTVoltage,{ (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
+	maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue  : throttlePedalWOTVoltage }
+	maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage }
 
 	requiresPowerCycle = useETBforIdleControl
 	requiresPowerCycle = warningLedPin
@@ -4371,14 +4371,14 @@ gaugeCategory = Debug
 	debugF5Gauge = debugFloatField5, {bitStringValue( debugFieldF5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
 	debugF6Gauge = debugFloatField6, {bitStringValue( debugFieldF6List,  debugMode )}, "",  -100,	100,	0,	0,	100,  100,	4,	4
 	debugF7Gauge = debugFloatField7, {bitStringValue( debugFieldF7List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	4,	4
-	debugI1Gauge = debugIntField1,	{bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI2Gauge = debugIntField2,	{bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI3Gauge = debugIntField3,	{bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI4Gauge = debugIntField4,	{bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
-	debugI5Gauge = debugIntField5,	{bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI1Gauge = debugIntField1, {bitStringValue( debugFieldI1List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI2Gauge = debugIntField2, {bitStringValue( debugFieldI2List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI3Gauge = debugIntField3, {bitStringValue( debugFieldI3List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI4Gauge = debugIntField4, {bitStringValue( debugFieldI4List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
+	debugI5Gauge = debugIntField5, {bitStringValue( debugFieldI5List,  debugMode )}, "",	0,	100,	0,	0,	100,  100,	0,	0
 
 gaugeCategory = Sensors - Basic
-	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0,	{rpmHardLimit + 2000},	200,	{cranking_rpm},	{rpmHardLimit - 500},  {rpmHardLimit},	0,	0
+	RPMGauge			= RPMValue,			"RPM - engine speed",		"RPM",		0, {rpmHardLimit + 2000},	200, {cranking_rpm}, {rpmHardLimit - 500},  {rpmHardLimit},	0,	0
 	CLTGauge			= coolant,		"Coolant temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	IATGauge			= intake,	"Intake air temp",		"C",		-40,	140,	-15,		1,		95,	110,	1,	1
 	afr1Gauge			= AFRValue, "Air/Fuel Ratio",			"",		10,	19.4,		12,	13,		15,	16,	2,	2
@@ -5337,8 +5337,8 @@ menuDialog = main
 
 		subMenu = std_separator
 		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop",			{ isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID",	{ isBoostControlEnabled && boostType == 1 }
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
 		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == 4 || etbFunctions2 == 4 }
 
@@ -6132,15 +6132,15 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "First gap to",							triggerGapOverrideTo1  , { overrideTriggerGaps == 1 }
 
 		field = "Second gap from",						triggerGapOverrideFrom2, { overrideTriggerGaps == 1 }
-		field = "Second gap to",						triggerGapOverrideTo2,	{ overrideTriggerGaps == 1 }
+		field = "Second gap to",						triggerGapOverrideTo2, { overrideTriggerGaps == 1 }
 
 		field = "Third gap from",						triggerGapOverrideFrom3, { overrideTriggerGaps == 1 }
-		field = "Third gap to",							triggerGapOverrideTo3,	{ overrideTriggerGaps == 1 }
+		field = "Third gap to",							triggerGapOverrideTo3, { overrideTriggerGaps == 1 }
 
 		field = "Gap #4 from",								triggerGapOverrideFrom4, { overrideTriggerGaps == 1 }
-		field = "Gap #4 to",								triggerGapOverrideTo4,	{ overrideTriggerGaps == 1 }
+		field = "Gap #4 to",								triggerGapOverrideTo4, { overrideTriggerGaps == 1 }
 		field = "Gap #5 from",								triggerGapOverrideFrom5, { overrideTriggerGaps == 1 }
-		field = "Gap #5 to",								triggerGapOverrideTo5,	{ overrideTriggerGaps == 1 }
+		field = "Gap #5 to",								triggerGapOverrideTo5, { overrideTriggerGaps == 1 }
 
 	dialog = triggerConfiguration_IO,	"Advanced Trigger"
 		field = "!https://rusefi.com/s/vvt"
@@ -6170,12 +6170,12 @@ dialog = wideband_stateDialog, "wideband_state"
 		; cam if
 		; two-stroke, or
 		; not crank trigger and ((vague trigger and cam choice) or not vague trigger)
-		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {	twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
+		field = "Cam Sensor (Primary channel)",		triggerInputPins1, 1, {twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )  }
 		field = "Crank Sensor (Primary channel)",		triggerInputPins1, 1, { !(twoStroke == 1 || ( !(trigger_type == 5 || trigger_type == 10 || trigger_type == 12 || trigger_type == 20 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 || trigger_type == 74) && ( ( (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || !(trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69)  ) )) }
 
 		field = "Invert Primary",						invertPrimaryTriggerSignal
-		field = "Secondary channel",					triggerInputPins2,				{ triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
-		field = "Invert Secondary",						invertSecondaryTriggerSignal, {									triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
+		field = "Secondary channel",					triggerInputPins2, { triggerInputPins2 != 0 || (triggerInputPins1 != 0 &&									(trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) ) }
+		field = "Invert Secondary",						invertSecondaryTriggerSignal, {triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) }
 		field = "#VVT or Cam for 60/2 goes below"
 		field = "#If your engine has no exhaust cam sensor, use intake cam inputs"
 		field = "Cam sensor bank 1 intake",			camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) }
@@ -6186,8 +6186,8 @@ dialog = wideband_stateDialog, "wideband_state"
 
 
 	dialog = triggerConfiguration
-		panel = triggerConfiguration_settings,	{1}, { consumeObdSensors == 0 }
-		panel = triggerInputs,						{1}, { consumeObdSensors == 0 }
+		panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 }
+		panel = triggerInputs, {1}, { consumeObdSensors == 0 }
 		field = "Display logic signals",				displayLogicLevelsInEngineSniffer
 
 ;			Engine->Injection Settings
@@ -6199,8 +6199,8 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary,		{isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary,	{isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
 
 	dialog = injectorOutputSettings, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -6267,14 +6267,14 @@ dialog = wideband_stateDialog, "wideband_state"
 
 	dialog = testInjectors, "Injector Test"
 		commandButton = "Injector #1", cmd_test_inj1
-		commandButton = "Injector #2", cmd_test_inj2,	{ cylindersCount >= 2 }
-		commandButton = "Injector #3", cmd_test_inj3,	{ cylindersCount >= 3 }
-		commandButton = "Injector #4", cmd_test_inj4,	{ cylindersCount >= 4 }
-		commandButton = "Injector #5", cmd_test_inj5,	{ cylindersCount >= 5 }
-		commandButton = "Injector #6", cmd_test_inj6,	{ cylindersCount >= 6 }
-		commandButton = "Injector #7", cmd_test_inj7,	{ cylindersCount >= 7 }
-		commandButton = "Injector #8", cmd_test_inj8,	{ cylindersCount >= 8 }
-		commandButton = "Injector #9", cmd_test_inj9,	{ cylindersCount >= 9 }
+		commandButton = "Injector #2", cmd_test_inj2, { cylindersCount >= 2 }
+		commandButton = "Injector #3", cmd_test_inj3, { cylindersCount >= 3 }
+		commandButton = "Injector #4", cmd_test_inj4, { cylindersCount >= 4 }
+		commandButton = "Injector #5", cmd_test_inj5, { cylindersCount >= 5 }
+		commandButton = "Injector #6", cmd_test_inj6, { cylindersCount >= 6 }
+		commandButton = "Injector #7", cmd_test_inj7, { cylindersCount >= 7 }
+		commandButton = "Injector #8", cmd_test_inj8, { cylindersCount >= 8 }
+		commandButton = "Injector #9", cmd_test_inj9, { cylindersCount >= 9 }
 		commandButton = "Injector #10", cmd_test_inj10, { cylindersCount >= 10 }
 		commandButton = "Injector #11", cmd_test_inj11, { cylindersCount >= 11 }
 		commandButton = "Injector #12", cmd_test_inj12, { cylindersCount >= 12 }
@@ -6870,10 +6870,10 @@ dialog = wideband_stateDialog, "wideband_state"
 ;			Sensors->MAP sensor
 	dialog = mapSensorAnalog, "MAP sensor", yAxis
 		field = "MAP ADC input",						map_sensor_hwChannel
-		field = "MAP type",								map_sensor_type,	{ map_sensor_hwChannel != 0 }
+		field = "MAP type",								map_sensor_type, { map_sensor_hwChannel != 0 }
 		field = "MAP value low point",				map_sensor_lowValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage low point",				mapLowValueVoltage,  { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
-		field = "MAP value high point",						map_sensor_highValue,{ map_sensor_hwChannel != 0 && map_sensor_type == 0 }
+		field = "MAP value high point",						map_sensor_highValue, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 		field = "MAP voltage high value",					mapHighValueVoltage, { map_sensor_hwChannel != 0 && map_sensor_type == 0 }
 
 	dialog = mapCommon, "MAP common settings"
@@ -6922,7 +6922,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Enable CAN Wideband",			enableAemXSeries, { canReadEnabled }
 		field = "Enable Innovate LC-2 Serial",			enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin }
 		panel = egoSettings_IO
-		panel = egoSettings_sensor,	{afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
+		panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin}
 
 ;			Engine->EGT inputs
 	dialog = egtInputs, "EGT inputs"
@@ -6980,7 +6980,7 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Stepper B-",								stepper_raw_output4
 
 	dialog = idleStepperHwType, ""
-		panel = idleStepperHw,	{ useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
+		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperHbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper && !useRawOutputToDriveIdleStepper }
 		panel = stepperDirectDriveHardware,  { useStepperIdle && !useHbridgesToDriveIdleStepper && useRawOutputToDriveIdleStepper }
 
@@ -7660,18 +7660,18 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Transmission Controller" transmissionControllerMode, { tcuEnabled }
 
 	dialog = shiftSolenoidPanel, "Shift Solenoids"
-		field = "Solenoid 1 output"	tcu_solenoid1,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output"	tcu_solenoid2,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output"	tcu_solenoid3,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output"	tcu_solenoid4,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output"	tcu_solenoid5,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output"	tcu_solenoid6,		{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
-		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6,	{ tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output"	tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 1 output Mode"	tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output"	tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 2 output Mode"	tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output"	tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 3 output Mode"	tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output"	tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 4 output Mode"	tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output"	tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 5 output Mode"	tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output"	tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
+		field = "Solenoid 6 output Mode"	tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) }
 		field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
@@ -7687,10 +7687,10 @@ dialog = wideband_stateDialog, "wideband_state"
 		field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) }
 
 	dialog = buttonShiftInputPanel, "Switch/Button Shift"
-		field = "Upshift Pin"		tcuUpshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin"		tcuDownshiftButtonPin,		{ tcuEnabled && gearControllerMode == 1 }
-		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode,	{ tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin"		tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Upshift Pin Mode"	tcuUpshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin"		tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 }
+		field = "Downshift Pin Mode"	tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 }
 
 	dialog = inputSpeedSensorPanel, "Input Speed Sensor"
 		field = "Input Pin", tcuInputSpeedSensorPin
@@ -7832,7 +7832,7 @@ dialog = tcuControls, "Transmission Settings"
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
 		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
-		panel = etbHbridgeHardware,		{ etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
+		panel = etbHbridgeHardware, { etbFunctions1 != 0 || etbFunctions2 != 0 || (useStepperIdle && useHbridgesToDriveIdleStepper) } 
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"
@@ -7977,13 +7977,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Enable Launch Control",						launchControlEnabled
 		field = "Activation Mode",							launchActivationMode
 
-		field = "Launch Button",								launchActivatePin,		{ launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
+		field = "Launch Button",								launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)}
 		field = "Launch Button inverted",				launchActivateInverted
 		field = "Launch Button mode",						launchActivatePinMode,  {launchActivationMode == 0 && launchControlEnabled == 1}
 
-		field = "Clutch Down",							clutchDownPin,			{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down",							clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = "Clutch Down inverted",					clutchDownPinInverted
-		field = "Clutch Down mode",						clutchDownPinMode,		{launchActivationMode == 1 && launchControlEnabled == 1}
+		field = "Clutch Down mode",						clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1}
 		field = ""
 
 ; dead code		field = "Rpm Threshold",								launchRpmThreshold,  {launchControlEnabled == 1}
diff --git 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
index a724a2df8d..23d24cb1c8 100644
--- 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 Nov 02 02:49:52 UTC 2022
+// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Nov 02 02:57:40 UTC 2022
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -1180,7 +1180,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 2022.11.02.all.snap_36933";
+	public static final String TS_SIGNATURE = "rusEFI 2022.11.02.all.snap_40486";
 	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 = 1280;