diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h
index 9f81016590..9961fc9306 100644
--- a/firmware/controllers/generated/signature_all.h
+++ b/firmware/controllers/generated/signature_all.h
@@ -4,5 +4,5 @@
 
 #define SIGNATURE_BOARD all
 #define SIGNATURE_DATE 2020.07.26
-#define SIGNATURE_HASH 2235815951
-#define TS_SIGNATURE "rusEFI 2020.07.26.all.2235815951"
+#define SIGNATURE_HASH 4076325589
+#define TS_SIGNATURE "rusEFI 2020.07.26.all.4076325589"
diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h
index afb83eed56..7ae73d3c7e 100644
--- a/firmware/controllers/generated/signature_frankenso_na6.h
+++ b/firmware/controllers/generated/signature_frankenso_na6.h
@@ -4,5 +4,5 @@
 
 #define SIGNATURE_BOARD frankenso_na6
 #define SIGNATURE_DATE 2020.07.26
-#define SIGNATURE_HASH 1539618028
-#define TS_SIGNATURE "rusEFI 2020.07.26.frankenso_na6.1539618028"
+#define SIGNATURE_HASH 745580086
+#define TS_SIGNATURE "rusEFI 2020.07.26.frankenso_na6.745580086"
diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h
index 15a246b54a..531221d3e1 100644
--- a/firmware/controllers/generated/signature_kin.h
+++ b/firmware/controllers/generated/signature_kin.h
@@ -4,5 +4,5 @@
 
 #define SIGNATURE_BOARD kin
 #define SIGNATURE_DATE 2020.07.26
-#define SIGNATURE_HASH 1216152725
-#define TS_SIGNATURE "rusEFI 2020.07.26.kin.1216152725"
+#define SIGNATURE_HASH 1070143055
+#define TS_SIGNATURE "rusEFI 2020.07.26.kin.1070143055"
diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h
index f5d5e20f26..b76ab37d2e 100644
--- a/firmware/controllers/generated/signature_mre_f4.h
+++ b/firmware/controllers/generated/signature_mre_f4.h
@@ -4,5 +4,5 @@
 
 #define SIGNATURE_BOARD mre_f4
 #define SIGNATURE_DATE 2020.07.26
-#define SIGNATURE_HASH 3434942081
-#define TS_SIGNATURE "rusEFI 2020.07.26.mre_f4.3434942081"
+#define SIGNATURE_HASH 3137936475
+#define TS_SIGNATURE "rusEFI 2020.07.26.mre_f4.3137936475"
diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h
index a009a2ca83..54807b7baa 100644
--- a/firmware/controllers/generated/signature_mre_f7.h
+++ b/firmware/controllers/generated/signature_mre_f7.h
@@ -4,5 +4,5 @@
 
 #define SIGNATURE_BOARD mre_f7
 #define SIGNATURE_DATE 2020.07.26
-#define SIGNATURE_HASH 3434942081
-#define TS_SIGNATURE "rusEFI 2020.07.26.mre_f7.3434942081"
+#define SIGNATURE_HASH 3137936475
+#define TS_SIGNATURE "rusEFI 2020.07.26.mre_f7.3137936475"
diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h
index 7645c8d5b4..deb5be0b91 100644
--- a/firmware/controllers/generated/signature_prometheus_405.h
+++ b/firmware/controllers/generated/signature_prometheus_405.h
@@ -4,5 +4,5 @@
 
 #define SIGNATURE_BOARD prometheus_405
 #define SIGNATURE_DATE 2020.07.26
-#define SIGNATURE_HASH 1885274251
-#define TS_SIGNATURE "rusEFI 2020.07.26.prometheus_405.1885274251"
+#define SIGNATURE_HASH 132846161
+#define TS_SIGNATURE "rusEFI 2020.07.26.prometheus_405.132846161"
diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h
index 048f7b7ad8..6357fd3668 100644
--- a/firmware/controllers/generated/signature_prometheus_469.h
+++ b/firmware/controllers/generated/signature_prometheus_469.h
@@ -4,5 +4,5 @@
 
 #define SIGNATURE_BOARD prometheus_469
 #define SIGNATURE_DATE 2020.07.26
-#define SIGNATURE_HASH 1885274251
-#define TS_SIGNATURE "rusEFI 2020.07.26.prometheus_469.1885274251"
+#define SIGNATURE_HASH 132846161
+#define TS_SIGNATURE "rusEFI 2020.07.26.prometheus_469.132846161"
diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h
index 77df2e3bec..bba5387b80 100644
--- a/firmware/controllers/generated/signature_proteus_f4.h
+++ b/firmware/controllers/generated/signature_proteus_f4.h
@@ -4,5 +4,5 @@
 
 #define SIGNATURE_BOARD proteus_f4
 #define SIGNATURE_DATE 2020.07.26
-#define SIGNATURE_HASH 148023744
-#define TS_SIGNATURE "rusEFI 2020.07.26.proteus_f4.148023744"
+#define SIGNATURE_HASH 2137439002
+#define TS_SIGNATURE "rusEFI 2020.07.26.proteus_f4.2137439002"
diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h
index 1f20c84724..6ca4cefe41 100644
--- a/firmware/controllers/generated/signature_proteus_f7.h
+++ b/firmware/controllers/generated/signature_proteus_f7.h
@@ -4,5 +4,5 @@
 
 #define SIGNATURE_BOARD proteus_f7
 #define SIGNATURE_DATE 2020.07.26
-#define SIGNATURE_HASH 148023744
-#define TS_SIGNATURE "rusEFI 2020.07.26.proteus_f7.148023744"
+#define SIGNATURE_HASH 2137439002
+#define TS_SIGNATURE "rusEFI 2020.07.26.proteus_f7.2137439002"
diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip
index b7f865c304..2982ee9d5d 100644
Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ
diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini
index dc007f9c07..a9f3604312 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 2020.07.26.all.2235815951" 
+ 	signature    = "rusEFI 2020.07.26.all.4076325589" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.07.26.all.2235815951" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.26.all.4076325589" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -76,7 +76,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:04:21 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:12:58 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -4148,13 +4148,13 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = veTableMap, South
 
 	dialog = etbPidDialog, "PID settings"
-		field = "pFactor",								etb_pFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "iFactor",								etb_iFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "dFactor",								etb_dFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "pid min",								etb_minValue, {throttlePedalPositionAdcChannel != 16}
-		field = "pid max",								etb_maxValue, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMin",								etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMax",								etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
+		field = "pFactor",								etb_pFactor
+		field = "iFactor",								etb_iFactor
+		field = "dFactor",								etb_dFactor
+		field = "pid min",								etb_minValue
+		field = "pid max",								etb_maxValue
+		field = "iTermMin",								etb_iTermMin
+		field = "iTermMax",								etb_iTermMax
 
 	dialog = etbIdleDialog, "ETB Idle"
 		field = "use ETB for idle",						useETBforIdleControl
@@ -4162,12 +4162,12 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 
 	dialog = etbDialogLeft
 		field = "https://rusefi.com/s/etb"
-		field = "Late 90s German DC Motor idle",		dcMotorIdleValve
+		field = "Late 90s German DC Motor idle",		dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
 		field = "Detailed status in console",			isVerboseETB
 		field = "Disable ETB Motor",					pauseEtbControl
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve  }
+		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
 
 	dialog = etbAutotune, "PID Autotune"
 		commandButton = "Start ETB PID Autotune", cmd_etb_autotune
@@ -4179,8 +4179,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Debug mode",							debugMode
 
 	dialog = etbDialogRight
-		panel = etbIdleDialog
-		panel = etbPidDialog
+		panel = etbIdleDialog, {  throttlePedalPositionAdcChannel != 16  }
+		panel = etbPidDialog,  { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
 		panel = etbAutotune
 
 		; Neutral position handling not yet implemented!
diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
index 2989186d21..6617e6b205 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 2020.07.26.frankenso_na6.1539618028" 
+ 	signature    = "rusEFI 2020.07.26.frankenso_na6.745580086" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.07.26.frankenso_na6.1539618028" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.26.frankenso_na6.745580086" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -76,7 +76,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:04:25 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:13:02 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -4148,13 +4148,13 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = veTableMap, South
 
 	dialog = etbPidDialog, "PID settings"
-		field = "pFactor",								etb_pFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "iFactor",								etb_iFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "dFactor",								etb_dFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "pid min",								etb_minValue, {throttlePedalPositionAdcChannel != 16}
-		field = "pid max",								etb_maxValue, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMin",								etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMax",								etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
+		field = "pFactor",								etb_pFactor
+		field = "iFactor",								etb_iFactor
+		field = "dFactor",								etb_dFactor
+		field = "pid min",								etb_minValue
+		field = "pid max",								etb_maxValue
+		field = "iTermMin",								etb_iTermMin
+		field = "iTermMax",								etb_iTermMax
 
 	dialog = etbIdleDialog, "ETB Idle"
 		field = "use ETB for idle",						useETBforIdleControl
@@ -4162,12 +4162,12 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 
 	dialog = etbDialogLeft
 		field = "https://rusefi.com/s/etb"
-		field = "Late 90s German DC Motor idle",		dcMotorIdleValve
+		field = "Late 90s German DC Motor idle",		dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
 		field = "Detailed status in console",			isVerboseETB
 		field = "Disable ETB Motor",					pauseEtbControl
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve  }
+		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
 
 	dialog = etbAutotune, "PID Autotune"
 		commandButton = "Start ETB PID Autotune", cmd_etb_autotune
@@ -4179,8 +4179,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Debug mode",							debugMode
 
 	dialog = etbDialogRight
-		panel = etbIdleDialog
-		panel = etbPidDialog
+		panel = etbIdleDialog, {  throttlePedalPositionAdcChannel != 16  }
+		panel = etbPidDialog,  { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
 		panel = etbAutotune
 
 		; Neutral position handling not yet implemented!
diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini
index 9cc2435163..e64cef1ff9 100644
--- a/firmware/tunerstudio/generated/rusefi_kinetis.ini
+++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2020.07.26.kin.1216152725" 
+ 	signature    = "rusEFI 2020.07.26.kin.1070143055" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.07.26.kin.1216152725" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.26.kin.1070143055" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -76,7 +76,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 26 18:04:37 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 26 18:13:09 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -4149,13 +4149,13 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = veTableMap, South
 
 	dialog = etbPidDialog, "PID settings"
-		field = "pFactor",								etb_pFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "iFactor",								etb_iFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "dFactor",								etb_dFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "pid min",								etb_minValue, {throttlePedalPositionAdcChannel != 16}
-		field = "pid max",								etb_maxValue, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMin",								etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMax",								etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
+		field = "pFactor",								etb_pFactor
+		field = "iFactor",								etb_iFactor
+		field = "dFactor",								etb_dFactor
+		field = "pid min",								etb_minValue
+		field = "pid max",								etb_maxValue
+		field = "iTermMin",								etb_iTermMin
+		field = "iTermMax",								etb_iTermMax
 
 	dialog = etbIdleDialog, "ETB Idle"
 		field = "use ETB for idle",						useETBforIdleControl
@@ -4163,12 +4163,12 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 
 	dialog = etbDialogLeft
 		field = "https://rusefi.com/s/etb"
-		field = "Late 90s German DC Motor idle",		dcMotorIdleValve
+		field = "Late 90s German DC Motor idle",		dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
 		field = "Detailed status in console",			isVerboseETB
 		field = "Disable ETB Motor",					pauseEtbControl
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve  }
+		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
 
 	dialog = etbAutotune, "PID Autotune"
 		commandButton = "Start ETB PID Autotune", cmd_etb_autotune
@@ -4180,8 +4180,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Debug mode",							debugMode
 
 	dialog = etbDialogRight
-		panel = etbIdleDialog
-		panel = etbPidDialog
+		panel = etbIdleDialog, {  throttlePedalPositionAdcChannel != 16  }
+		panel = etbPidDialog,  { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
 		panel = etbAutotune
 
 		; Neutral position handling not yet implemented!
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
index f180f13f29..e982abfb0d 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 2020.07.26.mre_f4.3434942081" 
+ 	signature    = "rusEFI 2020.07.26.mre_f4.3137936475" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.07.26.mre_f4.3434942081" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.26.mre_f4.3137936475" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -76,7 +76,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:04:24 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:13:01 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -4125,13 +4125,13 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = veTableMap, South
 
 	dialog = etbPidDialog, "PID settings"
-		field = "pFactor",								etb_pFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "iFactor",								etb_iFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "dFactor",								etb_dFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "pid min",								etb_minValue, {throttlePedalPositionAdcChannel != 16}
-		field = "pid max",								etb_maxValue, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMin",								etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMax",								etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
+		field = "pFactor",								etb_pFactor
+		field = "iFactor",								etb_iFactor
+		field = "dFactor",								etb_dFactor
+		field = "pid min",								etb_minValue
+		field = "pid max",								etb_maxValue
+		field = "iTermMin",								etb_iTermMin
+		field = "iTermMax",								etb_iTermMax
 
 	dialog = etbIdleDialog, "ETB Idle"
 		field = "use ETB for idle",						useETBforIdleControl
@@ -4139,12 +4139,12 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 
 	dialog = etbDialogLeft
 		field = "https://rusefi.com/s/etb"
-		field = "Late 90s German DC Motor idle",		dcMotorIdleValve
+		field = "Late 90s German DC Motor idle",		dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
 		field = "Detailed status in console",			isVerboseETB
 		field = "Disable ETB Motor",					pauseEtbControl
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve  }
+		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
 
 	dialog = etbAutotune, "PID Autotune"
 		commandButton = "Start ETB PID Autotune", cmd_etb_autotune
@@ -4156,8 +4156,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Debug mode",							debugMode
 
 	dialog = etbDialogRight
-		panel = etbIdleDialog
-		panel = etbPidDialog
+		panel = etbIdleDialog, {  throttlePedalPositionAdcChannel != 16  }
+		panel = etbPidDialog,  { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
 		panel = etbAutotune
 
 		; Neutral position handling not yet implemented!
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
index 143f835481..c5d3ba3781 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 2020.07.26.mre_f7.3434942081" 
+ 	signature    = "rusEFI 2020.07.26.mre_f7.3137936475" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.07.26.mre_f7.3434942081" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.26.mre_f7.3137936475" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -76,7 +76,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:04:23 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:13:00 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -4125,13 +4125,13 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = veTableMap, South
 
 	dialog = etbPidDialog, "PID settings"
-		field = "pFactor",								etb_pFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "iFactor",								etb_iFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "dFactor",								etb_dFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "pid min",								etb_minValue, {throttlePedalPositionAdcChannel != 16}
-		field = "pid max",								etb_maxValue, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMin",								etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMax",								etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
+		field = "pFactor",								etb_pFactor
+		field = "iFactor",								etb_iFactor
+		field = "dFactor",								etb_dFactor
+		field = "pid min",								etb_minValue
+		field = "pid max",								etb_maxValue
+		field = "iTermMin",								etb_iTermMin
+		field = "iTermMax",								etb_iTermMax
 
 	dialog = etbIdleDialog, "ETB Idle"
 		field = "use ETB for idle",						useETBforIdleControl
@@ -4139,12 +4139,12 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 
 	dialog = etbDialogLeft
 		field = "https://rusefi.com/s/etb"
-		field = "Late 90s German DC Motor idle",		dcMotorIdleValve
+		field = "Late 90s German DC Motor idle",		dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
 		field = "Detailed status in console",			isVerboseETB
 		field = "Disable ETB Motor",					pauseEtbControl
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve  }
+		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
 
 	dialog = etbAutotune, "PID Autotune"
 		commandButton = "Start ETB PID Autotune", cmd_etb_autotune
@@ -4156,8 +4156,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Debug mode",							debugMode
 
 	dialog = etbDialogRight
-		panel = etbIdleDialog
-		panel = etbPidDialog
+		panel = etbIdleDialog, {  throttlePedalPositionAdcChannel != 16  }
+		panel = etbPidDialog,  { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
 		panel = etbAutotune
 
 		; Neutral position handling not yet implemented!
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
index e62ef4d639..d5b52e1048 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 2020.07.26.prometheus_405.1885274251" 
+ 	signature    = "rusEFI 2020.07.26.prometheus_405.132846161" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.07.26.prometheus_405.1885274251" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.26.prometheus_405.132846161" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -76,7 +76,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:04:28 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:13:05 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -4144,13 +4144,13 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = veTableMap, South
 
 	dialog = etbPidDialog, "PID settings"
-		field = "pFactor",								etb_pFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "iFactor",								etb_iFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "dFactor",								etb_dFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "pid min",								etb_minValue, {throttlePedalPositionAdcChannel != 16}
-		field = "pid max",								etb_maxValue, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMin",								etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMax",								etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
+		field = "pFactor",								etb_pFactor
+		field = "iFactor",								etb_iFactor
+		field = "dFactor",								etb_dFactor
+		field = "pid min",								etb_minValue
+		field = "pid max",								etb_maxValue
+		field = "iTermMin",								etb_iTermMin
+		field = "iTermMax",								etb_iTermMax
 
 	dialog = etbIdleDialog, "ETB Idle"
 		field = "use ETB for idle",						useETBforIdleControl
@@ -4158,12 +4158,12 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 
 	dialog = etbDialogLeft
 		field = "https://rusefi.com/s/etb"
-		field = "Late 90s German DC Motor idle",		dcMotorIdleValve
+		field = "Late 90s German DC Motor idle",		dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
 		field = "Detailed status in console",			isVerboseETB
 		field = "Disable ETB Motor",					pauseEtbControl
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve  }
+		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
 
 	dialog = etbAutotune, "PID Autotune"
 		commandButton = "Start ETB PID Autotune", cmd_etb_autotune
@@ -4175,8 +4175,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Debug mode",							debugMode
 
 	dialog = etbDialogRight
-		panel = etbIdleDialog
-		panel = etbPidDialog
+		panel = etbIdleDialog, {  throttlePedalPositionAdcChannel != 16  }
+		panel = etbPidDialog,  { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
 		panel = etbAutotune
 
 		; Neutral position handling not yet implemented!
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
index 0f8bf32250..389f302c6b 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 2020.07.26.prometheus_469.1885274251" 
+ 	signature    = "rusEFI 2020.07.26.prometheus_469.132846161" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.07.26.prometheus_469.1885274251" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.26.prometheus_469.132846161" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -76,7 +76,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:04:27 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:13:04 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -4144,13 +4144,13 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = veTableMap, South
 
 	dialog = etbPidDialog, "PID settings"
-		field = "pFactor",								etb_pFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "iFactor",								etb_iFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "dFactor",								etb_dFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "pid min",								etb_minValue, {throttlePedalPositionAdcChannel != 16}
-		field = "pid max",								etb_maxValue, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMin",								etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMax",								etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
+		field = "pFactor",								etb_pFactor
+		field = "iFactor",								etb_iFactor
+		field = "dFactor",								etb_dFactor
+		field = "pid min",								etb_minValue
+		field = "pid max",								etb_maxValue
+		field = "iTermMin",								etb_iTermMin
+		field = "iTermMax",								etb_iTermMax
 
 	dialog = etbIdleDialog, "ETB Idle"
 		field = "use ETB for idle",						useETBforIdleControl
@@ -4158,12 +4158,12 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 
 	dialog = etbDialogLeft
 		field = "https://rusefi.com/s/etb"
-		field = "Late 90s German DC Motor idle",		dcMotorIdleValve
+		field = "Late 90s German DC Motor idle",		dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
 		field = "Detailed status in console",			isVerboseETB
 		field = "Disable ETB Motor",					pauseEtbControl
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve  }
+		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
 
 	dialog = etbAutotune, "PID Autotune"
 		commandButton = "Start ETB PID Autotune", cmd_etb_autotune
@@ -4175,8 +4175,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Debug mode",							debugMode
 
 	dialog = etbDialogRight
-		panel = etbIdleDialog
-		panel = etbPidDialog
+		panel = etbIdleDialog, {  throttlePedalPositionAdcChannel != 16  }
+		panel = etbPidDialog,  { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
 		panel = etbAutotune
 
 		; Neutral position handling not yet implemented!
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
index c919e012ae..71391ef7af 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 2020.07.26.proteus_f4.148023744" 
+ 	signature    = "rusEFI 2020.07.26.proteus_f4.2137439002" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.07.26.proteus_f4.148023744" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.26.proteus_f4.2137439002" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -76,7 +76,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:04:32 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:13:08 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -4115,13 +4115,13 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = veTableMap, South
 
 	dialog = etbPidDialog, "PID settings"
-		field = "pFactor",								etb_pFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "iFactor",								etb_iFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "dFactor",								etb_dFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "pid min",								etb_minValue, {throttlePedalPositionAdcChannel != 16}
-		field = "pid max",								etb_maxValue, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMin",								etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMax",								etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
+		field = "pFactor",								etb_pFactor
+		field = "iFactor",								etb_iFactor
+		field = "dFactor",								etb_dFactor
+		field = "pid min",								etb_minValue
+		field = "pid max",								etb_maxValue
+		field = "iTermMin",								etb_iTermMin
+		field = "iTermMax",								etb_iTermMax
 
 	dialog = etbIdleDialog, "ETB Idle"
 		field = "use ETB for idle",						useETBforIdleControl
@@ -4129,12 +4129,12 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 
 	dialog = etbDialogLeft
 		field = "https://rusefi.com/s/etb"
-		field = "Late 90s German DC Motor idle",		dcMotorIdleValve
+		field = "Late 90s German DC Motor idle",		dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
 		field = "Detailed status in console",			isVerboseETB
 		field = "Disable ETB Motor",					pauseEtbControl
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve  }
+		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
 
 	dialog = etbAutotune, "PID Autotune"
 		commandButton = "Start ETB PID Autotune", cmd_etb_autotune
@@ -4146,8 +4146,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Debug mode",							debugMode
 
 	dialog = etbDialogRight
-		panel = etbIdleDialog
-		panel = etbPidDialog
+		panel = etbIdleDialog, {  throttlePedalPositionAdcChannel != 16  }
+		panel = etbPidDialog,  { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
 		panel = etbAutotune
 
 		; Neutral position handling not yet implemented!
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
index 9ad88f6c84..10a6d1d716 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 2020.07.26.proteus_f7.148023744" 
+ 	signature    = "rusEFI 2020.07.26.proteus_f7.2137439002" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.07.26.proteus_f7.148023744" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.26.proteus_f7.2137439002" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -76,7 +76,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:04:29 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 26 18:13:06 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -4115,13 +4115,13 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = veTableMap, South
 
 	dialog = etbPidDialog, "PID settings"
-		field = "pFactor",								etb_pFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "iFactor",								etb_iFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "dFactor",								etb_dFactor, {throttlePedalPositionAdcChannel != 16}
-		field = "pid min",								etb_minValue, {throttlePedalPositionAdcChannel != 16}
-		field = "pid max",								etb_maxValue, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMin",								etb_iTermMin, {throttlePedalPositionAdcChannel != 16}
-		field = "iTermMax",								etb_iTermMax, {throttlePedalPositionAdcChannel != 16}
+		field = "pFactor",								etb_pFactor
+		field = "iFactor",								etb_iFactor
+		field = "dFactor",								etb_dFactor
+		field = "pid min",								etb_minValue
+		field = "pid max",								etb_maxValue
+		field = "iTermMin",								etb_iTermMin
+		field = "iTermMax",								etb_iTermMax
 
 	dialog = etbIdleDialog, "ETB Idle"
 		field = "use ETB for idle",						useETBforIdleControl
@@ -4129,12 +4129,12 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 
 	dialog = etbDialogLeft
 		field = "https://rusefi.com/s/etb"
-		field = "Late 90s German DC Motor idle",		dcMotorIdleValve
+		field = "Late 90s German DC Motor idle",		dcMotorIdleValve, { throttlePedalPositionAdcChannel == 16 }
 		field = "Detailed status in console",			isVerboseETB
 		field = "Disable ETB Motor",					pauseEtbControl
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve  }
+		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != 16 || (useStepperIdle && useHbridges) || dcMotorIdleValve }
 
 	dialog = etbAutotune, "PID Autotune"
 		commandButton = "Start ETB PID Autotune", cmd_etb_autotune
@@ -4146,8 +4146,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Debug mode",							debugMode
 
 	dialog = etbDialogRight
-		panel = etbIdleDialog
-		panel = etbPidDialog
+		panel = etbIdleDialog, {  throttlePedalPositionAdcChannel != 16  }
+		panel = etbPidDialog,  { (throttlePedalPositionAdcChannel != 16) || dcMotorIdleValve }
 		panel = etbAutotune
 
 		; Neutral position handling not yet implemented!