diff --git a/firmware/Makefile b/firmware/Makefile
index f0d7e97c6a..0ccdc594e2 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -296,8 +296,8 @@ INCDIR = $(CHIBIOS)/os/license \
 	ext_algo \
 	console_util \
 	$(CONSOLE_INC) \
-	$(PROJECT_DIR)/hw_layer \
-	$(PROJECT_DIR)/mass_storage \
+	$(HW_LAYER_INC) \
+	$(PROJECT_DIR)/hw_layer/mass_storage \
 	$(PROJECT_DIR)/hw_layer/serial_over_usb \
 	$(PROJECT_DIR)/hw_layer/algo \
 	$(PROJECT_DIR)/hw_layer/lcd \
diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile
index 6e5a232229..110a5e05fa 100644
--- a/firmware/bootloader/src/Makefile
+++ b/firmware/bootloader/src/Makefile
@@ -247,7 +247,8 @@ INCDIR = .. $(CHIBIOS)/os/license \
 	$(PROJECT_DIR)/console/binary_log \
 	$(PROJECT_DIR)/console/fl_binary \
 	$(PROJECT_DIR)/hw_layer \
-	$(PROJECT_DIR)/mass_storage \
+	$(PROJECT_DIR)/hw_layer/adc \
+	$(PROJECT_DIR)/hw_layer/mass_storage \
 	$(PROJECT_DIR)/hw_layer/serial_over_usb \
 	$(PROJECT_DIR)/hw_layer/algo \
 	$(PROJECT_DIR)/hw_layer/lcd \
diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
index fddf5689a1..1ebce53639 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:45:49 UTC 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 02:06:34 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -3541,4 +3541,4 @@ struct persistent_config_s {
 typedef struct persistent_config_s persistent_config_s;
 
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:45:49 UTC 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 02:06:34 UTC 2020
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 e2e01f0676..84cbe82702 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -1078,8 +1078,8 @@
 #define showHumanReadableWarning_offset 976
 #define showSdCardWarning_offset 76
 #define SIGNATURE_BOARD kin
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 3824537910
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 220050204
 #define silentTriggerError_offset 1464
 #define slowAdcAlpha_offset 2088
 #define sparkDwellRpmBins_offset 332
@@ -1316,12 +1316,12 @@
 #define TS_GET_STRUCT '9'
 #define TS_GET_TEXT 'G'
 #define TS_HELLO_COMMAND 'S'
-#define TS_IO_TEST_COMMAND 'w'
+#define TS_IO_TEST_COMMAND 'Z'
 #define TS_ONLINE_PROTOCOL 'z'
 #define TS_OUTPUT_COMMAND 'O'
 #define TS_OUTPUT_SIZE 288
 #define TS_PAGE_COMMAND 'P'
-#define TS_PERF_TRACE_BEGIN 'r'
+#define TS_PERF_TRACE_BEGIN '_'
 #define TS_PERF_TRACE_GET_BUFFER 'b'
 #define TS_PROTOCOL "001"
 #define TS_READ_COMMAND 'R'
@@ -1349,7 +1349,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator true
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3824537910"
+#define TS_SIGNATURE "rusEFI 2020.08.03.kin.220050204"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define tunerStudioSerialSpeed_offset 728
 #define twoWireBatchIgnition_offset 1476
diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp
index 8898c53ad1..cd9e189de1 100644
--- a/firmware/config/engines/custom_engine.cpp
+++ b/firmware/config/engines/custom_engine.cpp
@@ -630,7 +630,17 @@ void setTest33816EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 
 	CONFIG(isSdCardEnabled) = false;
 
-	CONFIG(mc33_hvolt) = 63;
-
 	CONFIG(mc33816spiDevice) = SPI_DEVICE_3;
+
+	// This is the configuration for bosch HDEV 5 injectors
+	CONFIG(mc33_hvolt) = 65;
+	CONFIG(mc33_i_boost) = 13000;
+	CONFIG(mc33_i_peak) = 9400;
+	CONFIG(mc33_i_hold) = 3700;
+	CONFIG(mc33_t_max_boost) = 470;
+	CONFIG(mc33_t_peak_off) = 10;
+	CONFIG(mc33_t_peak_tot) = 700;
+	CONFIG(mc33_t_bypass) = 15;
+	CONFIG(mc33_t_hold_off) = 60;
+	CONFIG(mc33_t_hold_tot) = 10000;
 }
diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index 03841e0c8a..216b39516a 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -482,6 +482,8 @@ static bool isKnownCommand(char command) {
 			|| command == TS_GET_FIRMWARE_VERSION
 			|| command == TS_PERF_TRACE_BEGIN
 			|| command == TS_PERF_TRACE_GET_BUFFER
+			|| command == TS_SD_R_COMMAND
+			|| command == TS_SD_W_COMMAND
 			|| command == TS_GET_CONFIG_ERROR;
 }
 
@@ -775,6 +777,14 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin
 	case TS_GET_FIRMWARE_VERSION:
 		handleGetVersion(tsChannel, TS_CRC);
 		break;
+#if EFI_FILE_LOGGING
+	case TS_SD_R_COMMAND:
+		handleTsR(data);
+		break;
+	case TS_SD_W_COMMAND:
+		handleTsW(data);
+		break;
+#endif //EFI_FILE_LOGGING
 	case TS_GET_TEXT:
 		handleGetText(tsChannel);
 		break;
diff --git a/firmware/controllers/date_stamp.h b/firmware/controllers/date_stamp.h
index e317540f62..39f98bbc3e 100644
--- a/firmware/controllers/date_stamp.h
+++ b/firmware/controllers/date_stamp.h
@@ -1,2 +1,2 @@
 #pragma once
-#define VCS_DATE 20200802
+#define VCS_DATE 20200803
diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h
index 8eb7893b8b..193677426d 100644
--- a/firmware/controllers/generated/engine_configuration_generated_structures.h
+++ b/firmware/controllers/generated/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
@@ -3541,4 +3541,4 @@ struct persistent_config_s {
 typedef struct persistent_config_s persistent_config_s;
 
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def
index 9eebce4569..80ebaaaa37 100644
--- a/firmware/controllers/generated/fsio_enums_generated.def
+++ b/firmware/controllers/generated/fsio_enums_generated.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 	FSIO_SETTING_FANONTEMPERATURE = 1000,
diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def
index 27d156831c..37df69d54c 100644
--- a/firmware/controllers/generated/fsio_getters.def
+++ b/firmware/controllers/generated/fsio_getters.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 	case FSIO_SETTING_FANONTEMPERATURE:
diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def
index 52d1ba5493..1b1721f89d 100644
--- a/firmware/controllers/generated/fsio_names.def
+++ b/firmware/controllers/generated/fsio_names.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");
diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def
index af38e8ebb3..5a8744bc94 100644
--- a/firmware/controllers/generated/fsio_strings.def
+++ b/firmware/controllers/generated/fsio_strings.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 	case FSIO_SETTING_FANONTEMPERATURE:
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index 89e8958df7..0dcbc3209b 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -1078,8 +1078,8 @@
 #define showHumanReadableWarning_offset 976
 #define showSdCardWarning_offset 76
 #define SIGNATURE_BOARD all
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 785059244
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 3223547782
 #define silentTriggerError_offset 1464
 #define slowAdcAlpha_offset 2088
 #define sparkDwellRpmBins_offset 332
@@ -1316,12 +1316,12 @@
 #define TS_GET_STRUCT '9'
 #define TS_GET_TEXT 'G'
 #define TS_HELLO_COMMAND 'S'
-#define TS_IO_TEST_COMMAND 'w'
+#define TS_IO_TEST_COMMAND 'Z'
 #define TS_ONLINE_PROTOCOL 'z'
 #define TS_OUTPUT_COMMAND 'O'
 #define TS_OUTPUT_SIZE 288
 #define TS_PAGE_COMMAND 'P'
-#define TS_PERF_TRACE_BEGIN 'r'
+#define TS_PERF_TRACE_BEGIN '_'
 #define TS_PERF_TRACE_GET_BUFFER 'b'
 #define TS_PROTOCOL "001"
 #define TS_READ_COMMAND 'R'
@@ -1349,7 +1349,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2020.08.02.all.785059244"
+#define TS_SIGNATURE "rusEFI 2020.08.03.all.3223547782"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define tunerStudioSerialSpeed_offset 728
 #define twoWireBatchIgnition_offset 1476
diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h
index c39c8a97f2..47c5b61bf1 100644
--- a/firmware/controllers/generated/signature_all.h
+++ b/firmware/controllers/generated/signature_all.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD all
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 785059244
-#define TS_SIGNATURE "rusEFI 2020.08.02.all.785059244"
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 3223547782
+#define TS_SIGNATURE "rusEFI 2020.08.03.all.3223547782"
diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h
index d425b08874..60f2fc7266 100644
--- a/firmware/controllers/generated/signature_frankenso_na6.h
+++ b/firmware/controllers/generated/signature_frankenso_na6.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD frankenso_na6
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 4031537487
-#define TS_SIGNATURE "rusEFI 2020.08.02.frankenso_na6.4031537487"
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 514065253
+#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.514065253"
diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h
index d283db199d..11751cc76e 100644
--- a/firmware/controllers/generated/signature_kin.h
+++ b/firmware/controllers/generated/signature_kin.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD kin
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 3824537910
-#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3824537910"
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 220050204
+#define TS_SIGNATURE "rusEFI 2020.08.03.kin.220050204"
diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h
index 1e79edf76f..f00175ef3e 100644
--- a/firmware/controllers/generated/signature_mre_f4.h
+++ b/firmware/controllers/generated/signature_mre_f4.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD mre_f4
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 1731582754
-#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f4.1731582754"
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 2313009416
+#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.2313009416"
diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h
index b07775a7af..5561b94ba6 100644
--- a/firmware/controllers/generated/signature_mre_f7.h
+++ b/firmware/controllers/generated/signature_mre_f7.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD mre_f7
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 1731582754
-#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f7.1731582754"
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 2313009416
+#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.2313009416"
diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h
index eb802ffe22..0db80fd046 100644
--- a/firmware/controllers/generated/signature_prometheus_405.h
+++ b/firmware/controllers/generated/signature_prometheus_405.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD prometheus_405
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 3688355112
-#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_405.3688355112"
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 893368066
+#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.893368066"
diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h
index 6b020d27c6..f65f05cbe1 100644
--- a/firmware/controllers/generated/signature_prometheus_469.h
+++ b/firmware/controllers/generated/signature_prometheus_469.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD prometheus_469
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 3688355112
-#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_469.3688355112"
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 893368066
+#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.893368066"
diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h
index 71417f2a68..9bdc45dec8 100644
--- a/firmware/controllers/generated/signature_proteus_f4.h
+++ b/firmware/controllers/generated/signature_proteus_f4.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD proteus_f4
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 2740616291
-#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f4.2740616291"
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 1303518793
+#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.1303518793"
diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h
index 0898b058a4..2ca822fdfe 100644
--- a/firmware/controllers/generated/signature_proteus_f7.h
+++ b/firmware/controllers/generated/signature_proteus_f7.h
@@ -3,6 +3,6 @@
 //
 
 #define SIGNATURE_BOARD proteus_f7
-#define SIGNATURE_DATE 2020.08.02
-#define SIGNATURE_HASH 2740616291
-#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f7.2740616291"
+#define SIGNATURE_DATE 2020.08.03
+#define SIGNATURE_HASH 1303518793
+#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.1303518793"
diff --git a/firmware/hw_layer/AdcConfiguration.h b/firmware/hw_layer/adc/AdcConfiguration.h
similarity index 100%
rename from firmware/hw_layer/AdcConfiguration.h
rename to firmware/hw_layer/adc/AdcConfiguration.h
diff --git a/firmware/hw_layer/adc_external.h b/firmware/hw_layer/adc/adc_external.h
similarity index 100%
rename from firmware/hw_layer/adc_external.h
rename to firmware/hw_layer/adc/adc_external.h
diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp
similarity index 100%
rename from firmware/hw_layer/adc_inputs.cpp
rename to firmware/hw_layer/adc/adc_inputs.cpp
diff --git a/firmware/hw_layer/adc_inputs.h b/firmware/hw_layer/adc/adc_inputs.h
similarity index 100%
rename from firmware/hw_layer/adc_inputs.h
rename to firmware/hw_layer/adc/adc_inputs.h
diff --git a/firmware/hw_layer/adc_subscription.cpp b/firmware/hw_layer/adc/adc_subscription.cpp
similarity index 100%
rename from firmware/hw_layer/adc_subscription.cpp
rename to firmware/hw_layer/adc/adc_subscription.cpp
diff --git a/firmware/hw_layer/adc_subscription.h b/firmware/hw_layer/adc/adc_subscription.h
similarity index 100%
rename from firmware/hw_layer/adc_subscription.h
rename to firmware/hw_layer/adc/adc_subscription.h
diff --git a/firmware/hw_layer/mcp3208.c b/firmware/hw_layer/adc/mcp3208.c
similarity index 100%
rename from firmware/hw_layer/mcp3208.c
rename to firmware/hw_layer/adc/mcp3208.c
diff --git a/firmware/hw_layer/mcp3208.h b/firmware/hw_layer/adc/mcp3208.h
similarity index 100%
rename from firmware/hw_layer/mcp3208.h
rename to firmware/hw_layer/adc/mcp3208.h
diff --git a/firmware/hw_layer/digital_input.cpp b/firmware/hw_layer/digital_input/digital_input.cpp
similarity index 100%
rename from firmware/hw_layer/digital_input.cpp
rename to firmware/hw_layer/digital_input/digital_input.cpp
diff --git a/firmware/hw_layer/digital_input.h b/firmware/hw_layer/digital_input/digital_input.h
similarity index 100%
rename from firmware/hw_layer/digital_input.h
rename to firmware/hw_layer/digital_input/digital_input.h
diff --git a/firmware/hw_layer/digital_input_exti.cpp b/firmware/hw_layer/digital_input/digital_input_exti.cpp
similarity index 100%
rename from firmware/hw_layer/digital_input_exti.cpp
rename to firmware/hw_layer/digital_input/digital_input_exti.cpp
diff --git a/firmware/hw_layer/digital_input_exti.h b/firmware/hw_layer/digital_input/digital_input_exti.h
similarity index 100%
rename from firmware/hw_layer/digital_input_exti.h
rename to firmware/hw_layer/digital_input/digital_input_exti.h
diff --git a/firmware/hw_layer/digital_input_icu.cpp b/firmware/hw_layer/digital_input/digital_input_icu.cpp
similarity index 100%
rename from firmware/hw_layer/digital_input_icu.cpp
rename to firmware/hw_layer/digital_input/digital_input_icu.cpp
diff --git a/firmware/hw_layer/digital_input_icu.h b/firmware/hw_layer/digital_input/digital_input_icu.h
similarity index 100%
rename from firmware/hw_layer/digital_input_icu.h
rename to firmware/hw_layer/digital_input/digital_input_icu.h
diff --git a/firmware/hw_layer/trigger_input.cpp b/firmware/hw_layer/digital_input/trigger/trigger_input.cpp
similarity index 100%
rename from firmware/hw_layer/trigger_input.cpp
rename to firmware/hw_layer/digital_input/trigger/trigger_input.cpp
diff --git a/firmware/hw_layer/trigger_input.h b/firmware/hw_layer/digital_input/trigger/trigger_input.h
similarity index 100%
rename from firmware/hw_layer/trigger_input.h
rename to firmware/hw_layer/digital_input/trigger/trigger_input.h
diff --git a/firmware/hw_layer/trigger_input_comp.cpp b/firmware/hw_layer/digital_input/trigger/trigger_input_comp.cpp
similarity index 100%
rename from firmware/hw_layer/trigger_input_comp.cpp
rename to firmware/hw_layer/digital_input/trigger/trigger_input_comp.cpp
diff --git a/firmware/hw_layer/trigger_input_exti.cpp b/firmware/hw_layer/digital_input/trigger/trigger_input_exti.cpp
similarity index 100%
rename from firmware/hw_layer/trigger_input_exti.cpp
rename to firmware/hw_layer/digital_input/trigger/trigger_input_exti.cpp
diff --git a/firmware/hw_layer/trigger_input_icu.cpp b/firmware/hw_layer/digital_input/trigger/trigger_input_icu.cpp
similarity index 100%
rename from firmware/hw_layer/trigger_input_icu.cpp
rename to firmware/hw_layer/digital_input/trigger/trigger_input_icu.cpp
diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk
index ada8b876c0..c378ebcee1 100644
--- a/firmware/hw_layer/hw_layer.mk
+++ b/firmware/hw_layer/hw_layer.mk
@@ -1,6 +1,10 @@
 HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/serial_over_usb/usbcfg.c \
 	$(PROJECT_DIR)/hw_layer/serial_over_usb/usbconsole.c
 
+HW_LAYER_INC=	$(PROJECT_DIR)/hw_layer $(PROJECT_DIR)/hw_layer/adc \
+	$(PROJECT_DIR)/hw_layer/digital_input \
+	$(PROJECT_DIR)/hw_layer/digital_input/trigger
+
 HW_INC = hw_layer/$(CPU_HWLAYER) \
 	$(PROJECT_DIR)/hw_layer/ports
 
@@ -8,28 +12,29 @@ HW_LAYER_EGT_CPP = \
 	$(PROJECT_DIR)/hw_layer/max31855.cpp
 
 HW_LAYER_EMS = $(HW_LAYER_EGT) \
-	$(PROJECT_DIR)/hw_layer/mcp3208.c \
-	$(PROJECT_DIR)/hw_layer/mc33816_data.c \
+	$(PROJECT_DIR)/hw_layer/adc/mcp3208.c \
+	$(PROJECT_DIR)/hw_layer/mc33816_data.c
 
 HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
 	$(PROJECT_DIR)/hw_layer/pin_repository.cpp \
 	$(PROJECT_DIR)/hw_layer/microsecond_timer.cpp \
-	$(PROJECT_DIR)/hw_layer/digital_input.cpp \
-	$(PROJECT_DIR)/hw_layer/digital_input_icu.cpp \
-	$(PROJECT_DIR)/hw_layer/digital_input_exti.cpp \
+	$(PROJECT_DIR)/hw_layer/digital_input/digital_input.cpp \
+	$(PROJECT_DIR)/hw_layer/digital_input/digital_input_icu.cpp \
+	$(PROJECT_DIR)/hw_layer/digital_input/digital_input_exti.cpp \
+	$(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input.cpp \
+	$(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input_icu.cpp \
+	$(PROJECT_DIR)/hw_layer/digital_input/trigger/trigger_input_exti.cpp \
 	$(PROJECT_DIR)/hw_layer/hardware.cpp \
 	$(PROJECT_DIR)/hw_layer/smart_gpio.cpp \
 	$(PROJECT_DIR)/hw_layer/neo6m.cpp \
 	$(PROJECT_DIR)/hw_layer/mmc_card.cpp \
+	$(PROJECT_DIR)/hw_layer/mmc_card_access.cpp \
 	$(PROJECT_DIR)/hw_layer/lcd/lcd_HD44780.cpp \
-	$(PROJECT_DIR)/hw_layer/adc_inputs.cpp \
-	$(PROJECT_DIR)/hw_layer/adc_subscription.cpp \
-	$(PROJECT_DIR)/hw_layer/trigger_input.cpp \
-	$(PROJECT_DIR)/hw_layer/trigger_input_icu.cpp \
-	$(PROJECT_DIR)/hw_layer/trigger_input_exti.cpp \
-	$(PROJECT_DIR)/hw_layer/hip9011.cpp \
+	$(PROJECT_DIR)/hw_layer/adc/adc_inputs.cpp \
+	$(PROJECT_DIR)/hw_layer/adc/adc_subscription.cpp \
+	$(PROJECT_DIR)/hw_layer/sensors/hip9011.cpp \
+	$(PROJECT_DIR)/hw_layer/sensors/hip9011_logic.cpp \
 	$(PROJECT_DIR)/hw_layer/mc33816.cpp \
-	$(PROJECT_DIR)/hw_layer/hip9011_logic.cpp \
 	$(PROJECT_DIR)/hw_layer/vehicle_speed.cpp \
 	$(PROJECT_DIR)/hw_layer/stepper.cpp \
 	$(PROJECT_DIR)/hw_layer/stepper_dual_hbridge.cpp \
@@ -37,7 +42,7 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
 	$(PROJECT_DIR)/hw_layer/io_pins.cpp \
 	$(PROJECT_DIR)/hw_layer/rtc_helper.cpp \
 	$(PROJECT_DIR)/hw_layer/cdm_ion_sense.cpp \
-	$(PROJECT_DIR)/hw_layer/backup_ram.cpp \
+	$(PROJECT_DIR)/hw_layer/backup_ram.cpp
 
 #
 # '-include' is a magic kind of 'include' which would survive if file to be included is not found
diff --git a/firmware/hw_layer/mmc_card.h b/firmware/hw_layer/mmc_card.h
index d3106b675c..c2aa434db3 100644
--- a/firmware/hw_layer/mmc_card.h
+++ b/firmware/hw_layer/mmc_card.h
@@ -9,18 +9,11 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
 void initMmcCard(void);
 bool isSdCardAlive(void);
 void appendToLog(const char *line, size_t length);
 
 void readLogFileContent(char *buffer, short fileId, short offset, short length);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+void handleTsR(char *input);
+void handleTsW(char *input);
diff --git a/firmware/hw_layer/mmc_card_access.cpp b/firmware/hw_layer/mmc_card_access.cpp
new file mode 100644
index 0000000000..d78a1a2c9b
--- /dev/null
+++ b/firmware/hw_layer/mmc_card_access.cpp
@@ -0,0 +1,29 @@
+/**
+ * @file	mmc_card_access.cpp
+ *
+ */
+
+#include "global.h"
+
+#if EFI_FILE_LOGGING
+#include "mmc_card.h"
+
+extern LoggingWithStorage sharedLogger;
+
+static char *buffer[2048];
+
+
+void handleTsR(char *input) {
+	if (input[1] == 0 && input[2] == 7) {
+		scheduleMsg(&sharedLogger, "TS_SD: RTC read command");
+		memset(buffer, 0, 9);
+	}
+
+}
+
+void handleTsW(char *input) {
+
+}
+
+
+#endif // EFI_FILE_LOGGING
diff --git a/firmware/hw_layer/hip9011.cpp b/firmware/hw_layer/sensors/hip9011.cpp
similarity index 100%
rename from firmware/hw_layer/hip9011.cpp
rename to firmware/hw_layer/sensors/hip9011.cpp
diff --git a/firmware/hw_layer/hip9011.h b/firmware/hw_layer/sensors/hip9011.h
similarity index 100%
rename from firmware/hw_layer/hip9011.h
rename to firmware/hw_layer/sensors/hip9011.h
diff --git a/firmware/hw_layer/hip9011_logic.cpp b/firmware/hw_layer/sensors/hip9011_logic.cpp
similarity index 100%
rename from firmware/hw_layer/hip9011_logic.cpp
rename to firmware/hw_layer/sensors/hip9011_logic.cpp
diff --git a/firmware/hw_layer/hip9011_logic.h b/firmware/hw_layer/sensors/hip9011_logic.h
similarity index 100%
rename from firmware/hw_layer/hip9011_logic.h
rename to firmware/hw_layer/sensors/hip9011_logic.h
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 994deacb74..d387c15aec 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -741,7 +741,7 @@ pin_output_mode_e hip9011IntHoldPinMode;
 	! 536870911 = 2^29-1, the maximum valid extended ID
 	uint32_t verboseCanBaseAddress;;"", 1, 0, 0, 536870911, 0
 
-	uint8_t mc33_hvolt;;"v",        1,     0,  0,    100,  0
+	uint8_t mc33_hvolt;;"v",        1,     0,  40,    70,  0
 	uint8_t fsio_visible acIdleExtraMin;+Additional idle PID minValue while A/C is active;"Percent", 1, 0, 0, 255, 0
 
 	uint8_t[2] unusedHere;;"units", 1, 0, -20, 100, 0
@@ -1321,15 +1321,15 @@ uint8_t[4] unusedsw;;"units", 1, 0, -20, 100, 0
 
 	gppwm_channel[GPPWM_CHANNELS iterate] gppwm;
 
-	uint16_t mc33_i_boost;;"X",   1,   0.0,        0,  64000,   0
-	uint16_t mc33_i_peak;;"X",   1,   0.0,        0,  64000,   0
-	uint16_t mc33_i_hold;;"X",   1,   0.0,        0,  64000,   0
-	uint16_t mc33_t_max_boost;;"X",   1,   0.0,        0,  64000,   0
-	uint16_t mc33_t_peak_off;;"X",   1,   0.0,        0,  64000,   0
-	uint16_t mc33_t_peak_tot;;"X",   1,   0.0,        0,  64000,   0
-	uint16_t mc33_t_bypass;;"X",   1,   0.0,        0,  64000,   0
-	uint16_t mc33_t_hold_off;;"X",   1,   0.0,        0,  64000,   0
-	uint16_t mc33_t_hold_tot;;"X",   1,   0.0,        0,  64000,   0
+	uint16_t mc33_i_boost;;"mA",      1,   0.0,     1000,  25000,   0
+	uint16_t mc33_i_peak;;"mA",       1,   0.0,     1000,  20000,   0
+	uint16_t mc33_i_hold;;"mA",       1,   0.0,     1000,  20000,   0
+	uint16_t mc33_t_max_boost;;"us",  1,   0.0,        0,  10000,   0
+	uint16_t mc33_t_peak_off;;"us",   1,   0.0,        0,  10000,   0
+	uint16_t mc33_t_peak_tot;;"us",   1,   0.0,        0,  10000,   0
+	uint16_t mc33_t_bypass;;"us",     1,   0.0,        0,  10000,   0
+	uint16_t mc33_t_hold_off;;"us",   1,   0.0,        0,  10000,   0
+	uint16_t mc33_t_hold_tot;;"us",   1,   0.0,        0,  10000,   0
 
 ! just a reminder that 'int' and 'float' are 4 bytes each
 	int[371] mainUnusedEnd;;"units", 1, 0, -20, 100, 0
@@ -1633,7 +1633,7 @@ end_struct
 #define TS_COMPOSITE_DISABLE 2
 
 // Performance tracing
-#define TS_PERF_TRACE_BEGIN 'r'
+#define TS_PERF_TRACE_BEGIN '_'
 #define TS_PERF_TRACE_GET_BUFFER 'b'
 
 // 0x50
@@ -1653,7 +1653,7 @@ end_struct
 // 0x42 burnCommand
 #define TS_BURN_COMMAND 'B' 
 // 0x77
-#define TS_IO_TEST_COMMAND 'w'
+#define TS_IO_TEST_COMMAND 'Z'
 
 #define TS_RESPONSE_OK 0
 #define TS_RESPONSE_BURN_OK 4
diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip
index 7bdd14401a..edeea8bdc2 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 8c62c0c6fc..0d12aac516 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.08.02.all.785059244" 
+ 	signature    = "rusEFI 2020.08.03.all.3223547782" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.08.02.all.785059244" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.08.03.all.3223547782" ; 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 Aug 02 17:45:38 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -396,7 +396,7 @@ page = 1
 	hip9011IntHoldPin			 = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
-	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 0, 100, 0
+	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 40, 70, 0
 	acIdleExtraMin					= scalar, U08,	761,	"Percent", 1, 0, 0, 255, 0
 	unusedHere						= array, U08,	762,	[2],	"units", 1, 0, -20, 100, 0
 	gpioPinModes1				 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1087,15 +1087,15 @@ page = 1
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
-	mc33_i_boost					= scalar, U16,	4496,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_peak						= scalar, U16,	4498,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_hold						= scalar, U16,	4500,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_max_boost				= scalar, U16,	4502,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_off					= scalar, U16,	4504,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_tot					= scalar, U16,	4506,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
+	mc33_i_boost					= scalar, U16,	4496,	"mA", 1, 0.0, 1000, 25000, 0
+	mc33_i_peak						= scalar, U16,	4498,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_i_hold						= scalar, U16,	4500,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_t_max_boost				= scalar, U16,	4502,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_off					= scalar, U16,	4504,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_tot					= scalar, U16,	4506,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_bypass					= scalar, U16,	4508,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_off					= scalar, U16,	4510,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_tot					= scalar, U16,	4512,	"us", 1, 0.0, 0, 10000, 0
 	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
@@ -3092,20 +3092,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
index ab3cf90260..a4c35b5bba 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.08.02.frankenso_na6.4031537487" 
+ 	signature    = "rusEFI 2020.08.03.frankenso_na6.514065253" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.08.02.frankenso_na6.4031537487" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.08.03.frankenso_na6.514065253" ; 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 Aug 02 17:45:42 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:27 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -396,7 +396,7 @@ page = 1
 	hip9011IntHoldPin			 = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
-	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 0, 100, 0
+	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 40, 70, 0
 	acIdleExtraMin					= scalar, U08,	761,	"Percent", 1, 0, 0, 255, 0
 	unusedHere						= array, U08,	762,	[2],	"units", 1, 0, -20, 100, 0
 	gpioPinModes1				 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1087,15 +1087,15 @@ page = 1
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
-	mc33_i_boost					= scalar, U16,	4496,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_peak						= scalar, U16,	4498,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_hold						= scalar, U16,	4500,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_max_boost				= scalar, U16,	4502,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_off					= scalar, U16,	4504,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_tot					= scalar, U16,	4506,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
+	mc33_i_boost					= scalar, U16,	4496,	"mA", 1, 0.0, 1000, 25000, 0
+	mc33_i_peak						= scalar, U16,	4498,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_i_hold						= scalar, U16,	4500,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_t_max_boost				= scalar, U16,	4502,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_off					= scalar, U16,	4504,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_tot					= scalar, U16,	4506,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_bypass					= scalar, U16,	4508,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_off					= scalar, U16,	4510,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_tot					= scalar, U16,	4512,	"us", 1, 0.0, 0, 10000, 0
 	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
@@ -3092,20 +3092,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini
index f64ba1164e..5adb9997f8 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.08.02.kin.3824537910" 
+ 	signature    = "rusEFI 2020.08.03.kin.220050204" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.08.02.kin.3824537910" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.08.03.kin.220050204" ; 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 Aug 02 17:45:49 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 02:06:34 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -396,7 +396,7 @@ page = 1
 	hip9011IntHoldPin			 = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
-	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 0, 100, 0
+	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 40, 70, 0
 	acIdleExtraMin					= scalar, U08,	761,	"Percent", 1, 0, 0, 255, 0
 	unusedHere						= array, U08,	762,	[2],	"units", 1, 0, -20, 100, 0
 	gpioPinModes1				 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1087,15 +1087,15 @@ page = 1
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
-	mc33_i_boost					= scalar, U16,	4496,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_peak						= scalar, U16,	4498,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_hold						= scalar, U16,	4500,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_max_boost				= scalar, U16,	4502,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_off					= scalar, U16,	4504,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_tot					= scalar, U16,	4506,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
+	mc33_i_boost					= scalar, U16,	4496,	"mA", 1, 0.0, 1000, 25000, 0
+	mc33_i_peak						= scalar, U16,	4498,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_i_hold						= scalar, U16,	4500,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_t_max_boost				= scalar, U16,	4502,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_off					= scalar, U16,	4504,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_tot					= scalar, U16,	4506,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_bypass					= scalar, U16,	4508,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_off					= scalar, U16,	4510,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_tot					= scalar, U16,	4512,	"us", 1, 0.0, 0, 10000, 0
 	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
@@ -3093,20 +3093,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini
index ae8f2090a1..dda7bca03e 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.08.02.mre_f4.1731582754" 
+ 	signature    = "rusEFI 2020.08.03.mre_f4.2313009416" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.08.02.mre_f4.1731582754" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.08.03.mre_f4.2313009416" ; 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 Aug 02 17:45:41 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:26 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -396,7 +396,7 @@ page = 1
 	hip9011IntHoldPin			 = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
-	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 0, 100, 0
+	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 40, 70, 0
 	acIdleExtraMin					= scalar, U08,	761,	"Percent", 1, 0, 0, 255, 0
 	unusedHere						= array, U08,	762,	[2],	"units", 1, 0, -20, 100, 0
 	gpioPinModes1				 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1087,15 +1087,15 @@ page = 1
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
-	mc33_i_boost					= scalar, U16,	4496,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_peak						= scalar, U16,	4498,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_hold						= scalar, U16,	4500,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_max_boost				= scalar, U16,	4502,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_off					= scalar, U16,	4504,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_tot					= scalar, U16,	4506,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
+	mc33_i_boost					= scalar, U16,	4496,	"mA", 1, 0.0, 1000, 25000, 0
+	mc33_i_peak						= scalar, U16,	4498,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_i_hold						= scalar, U16,	4500,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_t_max_boost				= scalar, U16,	4502,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_off					= scalar, U16,	4504,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_tot					= scalar, U16,	4506,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_bypass					= scalar, U16,	4508,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_off					= scalar, U16,	4510,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_tot					= scalar, U16,	4512,	"us", 1, 0.0, 0, 10000, 0
 	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
@@ -3087,20 +3087,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini
index 35dd3431d9..21044eab08 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.08.02.mre_f7.1731582754" 
+ 	signature    = "rusEFI 2020.08.03.mre_f7.2313009416" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.08.02.mre_f7.1731582754" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.08.03.mre_f7.2313009416" ; 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 Aug 02 17:45:40 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:25 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -396,7 +396,7 @@ page = 1
 	hip9011IntHoldPin			 = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
-	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 0, 100, 0
+	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 40, 70, 0
 	acIdleExtraMin					= scalar, U08,	761,	"Percent", 1, 0, 0, 255, 0
 	unusedHere						= array, U08,	762,	[2],	"units", 1, 0, -20, 100, 0
 	gpioPinModes1				 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1087,15 +1087,15 @@ page = 1
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
-	mc33_i_boost					= scalar, U16,	4496,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_peak						= scalar, U16,	4498,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_hold						= scalar, U16,	4500,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_max_boost				= scalar, U16,	4502,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_off					= scalar, U16,	4504,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_tot					= scalar, U16,	4506,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
+	mc33_i_boost					= scalar, U16,	4496,	"mA", 1, 0.0, 1000, 25000, 0
+	mc33_i_peak						= scalar, U16,	4498,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_i_hold						= scalar, U16,	4500,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_t_max_boost				= scalar, U16,	4502,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_off					= scalar, U16,	4504,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_tot					= scalar, U16,	4506,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_bypass					= scalar, U16,	4508,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_off					= scalar, U16,	4510,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_tot					= scalar, U16,	4512,	"us", 1, 0.0, 0, 10000, 0
 	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
@@ -3087,20 +3087,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini
index 78554c6621..85d59e71a8 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.08.02.prometheus_405.3688355112" 
+ 	signature    = "rusEFI 2020.08.03.prometheus_405.893368066" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.08.02.prometheus_405.3688355112" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.08.03.prometheus_405.893368066" ; 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 Aug 02 17:45:45 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:30 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -396,7 +396,7 @@ page = 1
 	hip9011IntHoldPin			 = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
-	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 0, 100, 0
+	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 40, 70, 0
 	acIdleExtraMin					= scalar, U08,	761,	"Percent", 1, 0, 0, 255, 0
 	unusedHere						= array, U08,	762,	[2],	"units", 1, 0, -20, 100, 0
 	gpioPinModes1				 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1087,15 +1087,15 @@ page = 1
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
-	mc33_i_boost					= scalar, U16,	4496,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_peak						= scalar, U16,	4498,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_hold						= scalar, U16,	4500,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_max_boost				= scalar, U16,	4502,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_off					= scalar, U16,	4504,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_tot					= scalar, U16,	4506,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
+	mc33_i_boost					= scalar, U16,	4496,	"mA", 1, 0.0, 1000, 25000, 0
+	mc33_i_peak						= scalar, U16,	4498,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_i_hold						= scalar, U16,	4500,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_t_max_boost				= scalar, U16,	4502,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_off					= scalar, U16,	4504,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_tot					= scalar, U16,	4506,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_bypass					= scalar, U16,	4508,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_off					= scalar, U16,	4510,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_tot					= scalar, U16,	4512,	"us", 1, 0.0, 0, 10000, 0
 	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
@@ -3088,20 +3088,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini
index 7349c7b22e..306fea2de9 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.08.02.prometheus_469.3688355112" 
+ 	signature    = "rusEFI 2020.08.03.prometheus_469.893368066" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.08.02.prometheus_469.3688355112" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.08.03.prometheus_469.893368066" ; 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 Aug 02 17:45:44 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:29 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -396,7 +396,7 @@ page = 1
 	hip9011IntHoldPin			 = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
-	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 0, 100, 0
+	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 40, 70, 0
 	acIdleExtraMin					= scalar, U08,	761,	"Percent", 1, 0, 0, 255, 0
 	unusedHere						= array, U08,	762,	[2],	"units", 1, 0, -20, 100, 0
 	gpioPinModes1				 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1087,15 +1087,15 @@ page = 1
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
-	mc33_i_boost					= scalar, U16,	4496,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_peak						= scalar, U16,	4498,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_hold						= scalar, U16,	4500,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_max_boost				= scalar, U16,	4502,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_off					= scalar, U16,	4504,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_tot					= scalar, U16,	4506,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
+	mc33_i_boost					= scalar, U16,	4496,	"mA", 1, 0.0, 1000, 25000, 0
+	mc33_i_peak						= scalar, U16,	4498,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_i_hold						= scalar, U16,	4500,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_t_max_boost				= scalar, U16,	4502,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_off					= scalar, U16,	4504,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_tot					= scalar, U16,	4506,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_bypass					= scalar, U16,	4508,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_off					= scalar, U16,	4510,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_tot					= scalar, U16,	4512,	"us", 1, 0.0, 0, 10000, 0
 	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
@@ -3088,20 +3088,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini
index b8397ed9c6..6f48f5bfde 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.08.02.proteus_f4.2740616291" 
+ 	signature    = "rusEFI 2020.08.03.proteus_f4.1303518793" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.08.02.proteus_f4.2740616291" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.08.03.proteus_f4.1303518793" ; 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 Aug 02 17:45:48 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:33 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -396,7 +396,7 @@ page = 1
 	hip9011IntHoldPin			 = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
-	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 0, 100, 0
+	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 40, 70, 0
 	acIdleExtraMin					= scalar, U08,	761,	"Percent", 1, 0, 0, 255, 0
 	unusedHere						= array, U08,	762,	[2],	"units", 1, 0, -20, 100, 0
 	gpioPinModes1				 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1087,15 +1087,15 @@ page = 1
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
-	mc33_i_boost					= scalar, U16,	4496,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_peak						= scalar, U16,	4498,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_hold						= scalar, U16,	4500,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_max_boost				= scalar, U16,	4502,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_off					= scalar, U16,	4504,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_tot					= scalar, U16,	4506,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
+	mc33_i_boost					= scalar, U16,	4496,	"mA", 1, 0.0, 1000, 25000, 0
+	mc33_i_peak						= scalar, U16,	4498,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_i_hold						= scalar, U16,	4500,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_t_max_boost				= scalar, U16,	4502,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_off					= scalar, U16,	4504,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_tot					= scalar, U16,	4506,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_bypass					= scalar, U16,	4508,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_off					= scalar, U16,	4510,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_tot					= scalar, U16,	4512,	"us", 1, 0.0, 0, 10000, 0
 	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
@@ -3083,20 +3083,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini
index 55434d89a5..8bd96511cf 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.08.02.proteus_f7.2740616291" 
+ 	signature    = "rusEFI 2020.08.03.proteus_f7.1303518793" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.08.02.proteus_f7.2740616291" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.08.03.proteus_f7.1303518793" ; 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 Aug 02 17:45:46 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:31 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -396,7 +396,7 @@ page = 1
 	hip9011IntHoldPin			 = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	hip9011IntHoldPinMode		 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted"
 	verboseCanBaseAddress			= scalar, U32,	756,	"", 1, 0, 0, 536870911, 0
-	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 0, 100, 0
+	mc33_hvolt						= scalar, U08,	760,	"v", 1, 0, 40, 70, 0
 	acIdleExtraMin					= scalar, U08,	761,	"Percent", 1, 0, 0, 255, 0
 	unusedHere						= array, U08,	762,	[2],	"units", 1, 0, -20, 100, 0
 	gpioPinModes1				 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted"
@@ -1087,15 +1087,15 @@ page = 1
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
-	mc33_i_boost					= scalar, U16,	4496,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_peak						= scalar, U16,	4498,	"X", 1, 0.0, 0, 64000, 0
-	mc33_i_hold						= scalar, U16,	4500,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_max_boost				= scalar, U16,	4502,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_off					= scalar, U16,	4504,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_peak_tot					= scalar, U16,	4506,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
-	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
+	mc33_i_boost					= scalar, U16,	4496,	"mA", 1, 0.0, 1000, 25000, 0
+	mc33_i_peak						= scalar, U16,	4498,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_i_hold						= scalar, U16,	4500,	"mA", 1, 0.0, 1000, 20000, 0
+	mc33_t_max_boost				= scalar, U16,	4502,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_off					= scalar, U16,	4504,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_peak_tot					= scalar, U16,	4506,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_bypass					= scalar, U16,	4508,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_off					= scalar, U16,	4510,	"us", 1, 0.0, 0, 10000, 0
+	mc33_t_hold_tot					= scalar, U16,	4512,	"us", 1, 0.0, 0, 10000, 0
 	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
@@ -3083,20 +3083,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 798fb9fa42..0545a07b4b 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -1795,20 +1795,24 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		panel = pedalGauges, East
 
     dialog = mc33Dialog, "GDI Dreams" 
-    	field = mc33816_cs,								mc33816_cs
-		field = mc33816_rstb,							mc33816_rstb
-		field = mc33816_flag0,							mc33816_flag0
-		field = "mc33972 SPI",							mc33972spiDevice
-		field = mc33_hvolt,								mc33_hvolt
-		field = mc33_i_boost,							mc33_i_boost
-		field = mc33_i_peak,							mc33_i_peak
-		field = mc33_i_hold,							mc33_i_hold
-		field = mc33_t_max_boost,						mc33_t_max_boost
-		field = mc33_t_peak_off,						mc33_t_peak_off
-		field = mc33_t_peak_tot,						mc33_t_peak_tot
-		field = mc33_t_bypass,							mc33_t_bypass
-		field = mc33_t_hold_off,						mc33_t_hold_off
-		field = mc33_t_hold_tot,						mc33_t_hold_tot
+    	field = "MC33816 cs",							mc33816_cs
+		field = "MC33816 rstb",							mc33816_rstb
+		field = "MC33816 flag0",						mc33816_flag0
+		field = "MC33816 SPI Device",					mc33972spiDevice
+
+		field = "Boost voltage",						mc33_hvolt
+
+		field = "Boost current target",					mc33_i_boost
+		field = "Max boost time (timeout)",				mc33_t_max_boost
+		field = "Boost -> Peak Bypass Time",			mc33_t_peak_off
+
+		field = "Peak current target",					mc33_i_peak
+		field = "Peak time",							mc33_t_peak_tot
+		field = "Peak -> Hold Bypass Time",				mc33_t_bypass
+
+		field = "Hold current target",					mc33_i_hold
+		field = "mc33_t_hold_off ?????",				mc33_t_hold_off
+		field = "Maximum injection duration",			mc33_t_hold_tot
     
 
 ;			Sensor Inputs
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 621800da38..eb26623f7c 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 Sun Aug 02 17:45:38 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -1060,7 +1060,6 @@ public class Fields {
 	public static final int servoOutputPins8_offset = 3147;
 	public static final int showHumanReadableWarning_offset = 976;
 	public static final int showSdCardWarning_offset = 76;
-	public static final int SIGNATURE_HASH = 785059244;
 	public static final int silentTriggerError_offset = 1464;
 	public static final int slowAdcAlpha_offset = 2088;
 	public static final int sparkDwellRpmBins_offset = 332;
@@ -1294,12 +1293,12 @@ public class Fields {
 	public static final char TS_GET_STRUCT = '9';
 	public static final char TS_GET_TEXT = 'G';
 	public static final char TS_HELLO_COMMAND = 'S';
-	public static final char TS_IO_TEST_COMMAND = 'w';
+	public static final char TS_IO_TEST_COMMAND = 'Z';
 	public static final char TS_ONLINE_PROTOCOL = 'z';
 	public static final char TS_OUTPUT_COMMAND = 'O';
 	public static final int TS_OUTPUT_SIZE = 288;
 	public static final char TS_PAGE_COMMAND = 'P';
-	public static final char TS_PERF_TRACE_BEGIN = 'r';
+	public static final char TS_PERF_TRACE_BEGIN = '_';
 	public static final char TS_PERF_TRACE_GET_BUFFER = 'b';
 	public static final String TS_PROTOCOL = "001";
 	public static final char TS_READ_COMMAND = 'R';
@@ -1309,7 +1308,7 @@ public class Fields {
 	public static final char TS_SD_R_COMMAND = 'r';
 	public static final char TS_SD_W_COMMAND = 'w';
 	public static final char TS_SET_LOGGER_SWITCH = 'l';
-	public static final String TS_SIGNATURE = "rusEFI 2020.08.02.all.785059244";
+	public static final String TS_SIGNATURE = "rusEFI 2020.08.03.all.3223547782";
 	public static final char TS_SINGLE_WRITE_COMMAND = 'W';
 	public static final int tunerStudioSerialSpeed_offset = 728;
 	public static final int twoWireBatchIgnition_offset = 1476;
diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml
index ec746f584a..51b5768ba5 100644
--- a/java_console/rusefi.xml
+++ b/java_console/rusefi.xml
@@ -1,6 +1,6 @@
 <roms>
 
-<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sun Aug 02 17:45:39 UTC 2020 -->
+<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Mon Aug 03 02:06:24 UTC 2020 -->
 
     <rom>
         <romid>
diff --git a/java_tools/ts_plugin_launcher/.idea/misc.xml b/java_tools/ts_plugin_launcher/.idea/misc.xml
index 05483570e0..3c61ee806f 100644
--- a/java_tools/ts_plugin_launcher/.idea/misc.xml
+++ b/java_tools/ts_plugin_launcher/.idea/misc.xml
@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="MavenBuildProjectComponent">
+    <option name="mavenExecutable" value="" />
+    <option name="Settings File" value="" />
+    <option name="mavenCommandLineParams" value="" />
+    <option name="vmOptions" value="" />
+    <option name="useMavenEmbedder" value="false" />
+    <option name="useFilter" value="false" />
+    <option name="Batch Mode" value="false" />
+    <option name="Check Plugin Updates" value="false" />
+    <option name="Debug" value="false" />
+    <option name="Errors" value="false" />
+    <option name="Fail At End" value="false" />
+    <option name="Fail Fast" value="false" />
+    <option name="Fail Never" value="false" />
+    <option name="Lax Checksums" value="false" />
+    <option name="No Plugin Registry" value="false" />
+    <option name="No Plugin Updates" value="false" />
+    <option name="Non Recursive" value="false" />
+    <option name="Offline" value="false" />
+    <option name="Reactor" value="false" />
+    <option name="Strict Checksums" value="false" />
+    <option name="Update Plugins" value="false" />
+    <option name="Update Snapshots" value="false" />
+    <option name="Skip Tests" value="false" />
+    <pom-list />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
diff --git a/simulator/Makefile b/simulator/Makefile
index 71eea1e812..6a289cc2e5 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -196,7 +196,7 @@ INCDIR = . \
           $(PROJECT_DIR)/config/engines \
           $(PROJECT_DIR)/ext_algo \
          $(HW_LAYER_DRIVERS_INC) \
-          $(PROJECT_DIR)/hw_layer \
+          $(HW_LAYER_INC) $(HW_SENSORS_INC) \
           $(PROJECT_DIR)/hw_layer/algo \
           $(PROJECT_DIR)/hw_layer/drivers/can \
           $(HW_SENSORS_INC) \
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index c1f3596319..5be8744c26 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -179,10 +179,10 @@ INCDIR = . \
 	$(CONSOLE_INC) \
  	$(DEVELOPMENT_DIR) \
 	$(PROJECT_DIR)/ext_algo \
-	$(PROJECT_DIR)/hw_layer \
-	$(PROJECT_DIR)/hw_layer/algo \
-	$(PROJECT_DIR)/hw_layer/sensors/ \
 	$(PROJECT_DIR)/init/ \
+	$(PROJECT_DIR)/hw_layer/algo \
+	$(HW_LAYER_INC) \
+	$(HW_SENSORS_INC) \
 	$(HW_LAYER_DRIVERS_INC) \
 	test_data_structures \
 	googletest/googlemock/include \