Fresh generated - auto

2020-05-19 08:38:31 -04:00 · 2020-05-19 08:38:31 -04:00 · e78aaf5d80
parent 2a55cda78e
commit e78aaf5d80
12 changed files with 1391 additions and 1192 deletions
--- 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 kineris_gen_config.bat integration/rusefi_config.txt Sun May 10 10:09:06 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Tue May 19 08:38:26 EDT 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -3165,8 +3165,49 @@ struct engine_configuration_s {
 	/**
 	 * offset 4496
 	 */
-	int mainUnusedEnd[376];
-	/** total size 6000*/
+	uint16_t mc33_i_boost;
+	/**
+	 * offset 4498
+	 */
+	uint16_t mc33_i_peak;
+	/**
+	 * offset 4500
+	 */
+	uint16_t mc33_i_hold;
+	/**
+	 * offset 4502
+	 */
+	uint16_t mc33_t_max_boost;
+	/**
+	 * offset 4504
+	 */
+	uint16_t mc33_t_peak_off;
+	/**
+	 * offset 4506
+	 */
+	uint16_t mc33_t_peak_tot;
+	/**
+	 * offset 4508
+	 */
+	uint16_t mc33_t_bypass;
+	/**
+	 * offset 4510
+	 */
+	uint16_t mc33_t_hold_off;
+	/**
+	 * offset 4512
+	 */
+	uint16_t mc33_t_hold_tot;
+	/**
+	 * need 4 byte alignment
+	 * offset 4514
+	 */
+	uint8_t alignmentFill_at_4514[2];
+	/**
+	 * offset 4516
+	 */
+	int mainUnusedEnd[358];
+	/** total size 5948*/
 };

 typedef struct engine_configuration_s engine_configuration_s;
@ -3178,295 +3219,295 @@ struct persistent_config_s {
 	 */
 	engine_configuration_s engineConfiguration;
 	/**
-	 * offset 6000
+	 * offset 5948
 	 */
 	error_message_t warning_message;
 	/**
-	 * offset 6120
+	 * offset 6068
 	 */
 	float afterstartCoolantBins[AFTERSTART_HOLD_CURVE_SIZE];
 	/**
-	 * offset 6152
+	 * offset 6100
 	 */
 	float afterstartHoldTime[AFTERSTART_HOLD_CURVE_SIZE];
 	/**
-	 * offset 6184
+	 * offset 6132
 	 */
 	float afterstartEnrich[AFTERSTART_ENRICH_CURVE_SIZE];
 	/**
-	 * offset 6216
+	 * offset 6164
 	 */
 	float afterstartDecayTime[AFTERSTART_DECAY_CURVE_SIZE];
 	/**
-	 * offset 6248
+	 * offset 6196
 	 */
 	boost_table_t boostTableOpenLoop;
 	/**
-	 * offset 6312
+	 * offset 6260
 	 */
 	uint8_t unused6312[8];
 	/**
-	 * offset 6320
+	 * offset 6268
 	 */
 	uint8_t boostRpmBins[BOOST_RPM_COUNT];
 	/**
-	 * offset 6328
+	 * offset 6276
 	 */
 	boost_table_t boostTableClosedLoop;
 	/**
-	 * offset 6392
+	 * offset 6340
 	 */
 	uint8_t boostTpsBins[BOOST_LOAD_COUNT];
 	/**
-	 * offset 6400
+	 * offset 6348
 	 */
 	pedal_to_tps_t pedalToTpsTable;
 	/**
-	 * offset 6464
+	 * offset 6412
 	 */
 	uint8_t pedalToTpsPedalBins[PEDAL_TO_TPS_SIZE];
 	/**
-	 * offset 6472
+	 * offset 6420
 	 */
 	uint8_t pedalToTpsRpmBins[PEDAL_TO_TPS_SIZE];
 	/**
 	 * CLT-based cranking position multiplier for simple manual idle controller
-	 * offset 6480
+	 * offset 6428
 	 */
 	float cltCrankingCorrBins[CLT_CRANKING_CURVE_SIZE];
 	/**
 	 * CLT-based cranking position multiplier for simple manual idle controller
-	 * offset 6512
+	 * offset 6460
 	 */
 	float cltCrankingCorr[CLT_CRANKING_CURVE_SIZE];
 	/**
 	 * Optional timing advance table for Idle (see useSeparateAdvanceForIdle)
-	 * offset 6544
+	 * offset 6492
 	 */
 	float idleAdvanceBins[IDLE_ADVANCE_CURVE_SIZE];
 	/**
 	 * Optional timing advance table for Idle (see useSeparateAdvanceForIdle)
-	 * offset 6576
+	 * offset 6524
 	 */
 	float idleAdvance[IDLE_ADVANCE_CURVE_SIZE];
 	/**
 	 * Optional VE table for Idle (see useSeparateVEForIdle)
-	 * offset 6608
+	 * offset 6556
 	 */
 	float idleVeBins[IDLE_VE_CURVE_SIZE];
 	/**
 	 *  Optional VE table for Idle (see useSeparateVEForIdle)
-	 * offset 6640
+	 * offset 6588
 	 */
 	float idleVe[IDLE_VE_CURVE_SIZE];
 	/**
-	 * offset 6672
+	 * offset 6620
 	 */
 	le_formula_t fsioFormulas[FSIO_COMMAND_COUNT];
 	/**
-	 * offset 9872
+	 * offset 9820
 	 */
 	le_formula_t timingMultiplier;
 	/**
-	 * offset 10072
+	 * offset 10020
 	 */
 	le_formula_t timingAdditive;
 	/**
-	 * offset 10272
+	 * offset 10220
 	 */
 	float cltFuelCorrBins[CLT_CURVE_SIZE];
 	/**
-	 * offset 10336
+	 * offset 10284
 	 */
 	float cltFuelCorr[CLT_CURVE_SIZE];
 	/**
-	 * offset 10400
+	 * offset 10348
 	 */
 	float iatFuelCorrBins[IAT_CURVE_SIZE];
 	/**
-	 * offset 10464
+	 * offset 10412
 	 */
 	float iatFuelCorr[IAT_CURVE_SIZE];
 	/**
-	 * offset 10528
+	 * offset 10476
 	 */
 	float crankingFuelCoef[CRANKING_CURVE_SIZE];
 	/**
-	 * offset 10560
+	 * offset 10508
 	 */
 	float crankingFuelBins[CRANKING_CURVE_SIZE];
 	/**
-	 * offset 10592
+	 * offset 10540
 	 */
 	float crankingCycleCoef[CRANKING_CURVE_SIZE];
 	/**
-	 * offset 10624
+	 * offset 10572
 	 */
 	float crankingCycleBins[CRANKING_CURVE_SIZE];
 	/**
 	 * CLT-based idle position multiplier for simple manual idle controller
-	 * offset 10656
+	 * offset 10604
 	 */
 	float cltIdleCorrBins[CLT_CURVE_SIZE];
 	/**
 	 *  CLT-based idle position multiplier for simple manual idle controller
-	 * offset 10720
+	 * offset 10668
 	 */
 	float cltIdleCorr[CLT_CURVE_SIZE];
 	/**
 	 * Also known as MAF transfer function.
 	 * kg/hour value.
 	 * By the way 2.081989116 kg/h = 1 ft3/m
-	 * offset 10784
+	 * offset 10732
 	 */
 	float mafDecoding[MAF_DECODING_COUNT];
 	/**
-	 * offset 11808
+	 * offset 11756
 	 */
 	float mafDecodingBins[MAF_DECODING_COUNT];
 	/**
-	 * offset 12832
+	 * offset 12780
 	 */
 	angle_table_t ignitionIatCorrTable;
 	/**
-	 * offset 13856
+	 * offset 13804
 	 */
 	float ignitionIatCorrLoadBins[IGN_LOAD_COUNT];
 	/**
-	 * offset 13920
+	 * offset 13868
 	 */
 	float ignitionIatCorrRpmBins[IGN_RPM_COUNT];
 	/**
-	 * offset 13984
+	 * offset 13932
 	 */
 	angle_table_t injectionPhase;
 	/**
-	 * offset 15008
+	 * offset 14956
 	 */
 	float injPhaseLoadBins[FUEL_LOAD_COUNT];
 	/**
-	 * offset 15072
+	 * offset 15020
 	 */
 	float injPhaseRpmBins[FUEL_RPM_COUNT];
 	/**
-	 * offset 15136
+	 * offset 15084
 	 */
 	fuel_table_t fuelTable;
 	/**
-	 * offset 16160
+	 * offset 16108
 	 */
 	float fuelLoadBins[FUEL_LOAD_COUNT];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 16224
+	 * offset 16172
 	 */
 	float fuelRpmBins[FUEL_RPM_COUNT];
 	/**
-	 * offset 16288
+	 * offset 16236
 	 */
 	ignition_table_t ignitionTable;
 	/**
-	 * offset 17312
+	 * offset 17260
 	 */
 	float ignitionLoadBins[IGN_LOAD_COUNT];
 	/**
-	 * offset 17376
+	 * offset 17324
 	 */
 	float ignitionRpmBins[IGN_RPM_COUNT];
 	/**
-	 * offset 17440
+	 * offset 17388
 	 */
 	ve_table_t veTable;
 	/**
-	 * offset 18464
+	 * offset 18412
 	 */
 	float veLoadBins[FUEL_LOAD_COUNT];
 	/**
-	 * offset 18528
+	 * offset 18476
 	 */
 	float veRpmBins[FUEL_RPM_COUNT];
 	/**
-	 * offset 18592
+	 * offset 18540
 	 */
 	afr_table_t afrTable;
 	/**
-	 * offset 18848
+	 * offset 18796
 	 */
 	float afrLoadBins[FUEL_LOAD_COUNT];
 	/**
-	 * offset 18912
+	 * offset 18860
 	 */
 	float afrRpmBins[FUEL_RPM_COUNT];
 	/**
-	 * offset 18976
+	 * offset 18924
 	 */
 	tps_tps_table_t tpsTpsAccelTable;
 	/**
-	 * offset 19232
+	 * offset 19180
 	 */
 	float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19264
+	 * offset 19212
 	 */
 	float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE];
 	/**
-	 * offset 19296
+	 * offset 19244
 	 */
 	fsio_table_8x8_f32t fsioTable1;
 	/**
-	 * offset 19552
+	 * offset 19500
 	 */
 	float fsioTable1LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19584
+	 * offset 19532
 	 */
 	float fsioTable1RpmBins[FSIO_TABLE_8];
 	/**
-	 * offset 19616
+	 * offset 19564
 	 */
 	fsio_table_8x8_u8t fsioTable2;
 	/**
-	 * offset 19680
+	 * offset 19628
 	 */
 	float fsioTable2LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19712
+	 * offset 19660
 	 */
 	float fsioTable2RpmBins[FSIO_TABLE_8];
 	/**
-	 * offset 19744
+	 * offset 19692
 	 */
 	fsio_table_8x8_u8t fsioTable3;
 	/**
-	 * offset 19808
+	 * offset 19756
 	 */
 	float fsioTable3LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19840
+	 * offset 19788
 	 */
 	float fsioTable3RpmBins[FSIO_TABLE_8];
 	/**
-	 * offset 19872
+	 * offset 19820
 	 */
 	fsio_table_8x8_u8t fsioTable4;
 	/**
-	 * offset 19936
+	 * offset 19884
 	 */
 	float fsioTable4LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19968
+	 * offset 19916
 	 */
 	float fsioTable4RpmBins[FSIO_TABLE_8];
-	/** total size 20000*/
+	/** total size 19948*/
 };

 typedef struct persistent_config_s persistent_config_s;

 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun May 10 10:09:06 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Tue May 19 08:38:26 EDT 2020
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@ -46,29 +46,31 @@
 #define afr_value1_offset_hex 238
 #define afr_value2_offset 576
 #define afr_value2_offset_hex 240
-#define afrLoadBins_offset 18848
-#define afrLoadBins_offset_hex 49a0
-#define afrRpmBins_offset 18912
-#define afrRpmBins_offset_hex 49e0
-#define afrTable_offset 18592
-#define afrTable_offset_hex 48a0
+#define afrLoadBins_offset 18796
+#define afrLoadBins_offset_hex 496c
+#define afrRpmBins_offset 18860
+#define afrRpmBins_offset_hex 49ac
+#define afrTable_offset 18540
+#define afrTable_offset_hex 486c
 #define afterCrankingIACtaperDuration_offset 2036
 #define afterCrankingIACtaperDuration_offset_hex 7f4
 #define AFTERSTART_DECAY_CURVE_SIZE 8
 #define AFTERSTART_ENRICH_CURVE_SIZE 8
 #define AFTERSTART_HOLD_CURVE_SIZE 8
-#define afterstartCoolantBins_offset 6120
-#define afterstartCoolantBins_offset_hex 17e8
-#define afterstartDecayTime_offset 6216
-#define afterstartDecayTime_offset_hex 1848
-#define afterstartEnrich_offset 6184
-#define afterstartEnrich_offset_hex 1828
-#define afterstartHoldTime_offset 6152
-#define afterstartHoldTime_offset_hex 1808
+#define afterstartCoolantBins_offset 6068
+#define afterstartCoolantBins_offset_hex 17b4
+#define afterstartDecayTime_offset 6164
+#define afterstartDecayTime_offset_hex 1814
+#define afterstartEnrich_offset 6132
+#define afterstartEnrich_offset_hex 17f4
+#define afterstartHoldTime_offset 6100
+#define afterstartHoldTime_offset_hex 17d4
 #define alFIn_offset 4024
 #define alFIn_offset_hex fb8
 #define alignEngineSnifferAtTDC_offset 744
 #define alignEngineSnifferAtTDC_offset_hex 2e8
+#define alignmentFill_at_4514_offset 4514
+#define alignmentFill_at_4514_offset_hex 11a2
 #define alternator_antiwindupFreq_offset 1764
 #define alternator_antiwindupFreq_offset_hex 6e4
 #define alternator_derivativeFilterLoss_offset 1760
@ -308,14 +310,14 @@
 #define boostPid_pFactor_offset_hex 3e0
 #define boostPwmFrequency_offset 1016
 #define boostPwmFrequency_offset_hex 3f8
-#define boostRpmBins_offset 6320
-#define boostRpmBins_offset_hex 18b0
-#define boostTableClosedLoop_offset 6328
-#define boostTableClosedLoop_offset_hex 18b8
-#define boostTableOpenLoop_offset 6248
-#define boostTableOpenLoop_offset_hex 1868
-#define boostTpsBins_offset 6392
-#define boostTpsBins_offset_hex 18f8
+#define boostRpmBins_offset 6268
+#define boostRpmBins_offset_hex 187c
+#define boostTableClosedLoop_offset 6276
+#define boostTableClosedLoop_offset_hex 1884
+#define boostTableOpenLoop_offset 6196
+#define boostTableOpenLoop_offset_hex 1834
+#define boostTpsBins_offset 6340
+#define boostTpsBins_offset_hex 18c4
 #define boostType_offset 1012
 #define boostType_offset_hex 3f4
 #define brain_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"
@ -393,18 +395,18 @@
 #define clt_tempC_3_offset 260
 #define clt_tempC_3_offset_hex 104
 #define CLT_TIMING_CURVE_SIZE 8
-#define cltCrankingCorr_offset 6512
-#define cltCrankingCorr_offset_hex 1970
-#define cltCrankingCorrBins_offset 6480
-#define cltCrankingCorrBins_offset_hex 1950
-#define cltFuelCorr_offset 10336
-#define cltFuelCorr_offset_hex 2860
-#define cltFuelCorrBins_offset 10272
-#define cltFuelCorrBins_offset_hex 2820
-#define cltIdleCorr_offset 10720
-#define cltIdleCorr_offset_hex 29e0
-#define cltIdleCorrBins_offset 10656
-#define cltIdleCorrBins_offset_hex 29a0
+#define cltCrankingCorr_offset 6460
+#define cltCrankingCorr_offset_hex 193c
+#define cltCrankingCorrBins_offset 6428
+#define cltCrankingCorrBins_offset_hex 191c
+#define cltFuelCorr_offset 10284
+#define cltFuelCorr_offset_hex 282c
+#define cltFuelCorrBins_offset 10220
+#define cltFuelCorrBins_offset_hex 27ec
+#define cltIdleCorr_offset 10668
+#define cltIdleCorr_offset_hex 29ac
+#define cltIdleCorrBins_offset 10604
+#define cltIdleCorrBins_offset_hex 296c
 #define cltIdleRpm_offset 1960
 #define cltIdleRpm_offset_hex 7a8
 #define cltIdleRpmBins_offset 1896
@ -477,14 +479,14 @@
 #define crankingAdvanceBins_offset_hex c24
 #define crankingChargeAngle_offset 104
 #define crankingChargeAngle_offset_hex 68
-#define crankingCycleBins_offset 10624
-#define crankingCycleBins_offset_hex 2980
-#define crankingCycleCoef_offset 10592
-#define crankingCycleCoef_offset_hex 2960
-#define crankingFuelBins_offset 10560
-#define crankingFuelBins_offset_hex 2940
-#define crankingFuelCoef_offset 10528
-#define crankingFuelCoef_offset_hex 2920
+#define crankingCycleBins_offset 10572
+#define crankingCycleBins_offset_hex 294c
+#define crankingCycleCoef_offset 10540
+#define crankingCycleCoef_offset_hex 292c
+#define crankingFuelBins_offset 10508
+#define crankingFuelBins_offset_hex 290c
+#define crankingFuelCoef_offset 10476
+#define crankingFuelCoef_offset_hex 28ec
 #define crankingIACposition_offset 2228
 #define crankingIACposition_offset_hex 8b4
 #define crankingInjectionMode_offset 424
@ -778,38 +780,38 @@
 #define fsioDigitalInputs8_offset_hex 3bf
 #define fsioDigitalInputs9_offset 960
 #define fsioDigitalInputs9_offset_hex 3c0
-#define fsioFormulas10_offset 8472
-#define fsioFormulas10_offset_hex 2118
-#define fsioFormulas11_offset 8672
-#define fsioFormulas11_offset_hex 21e0
-#define fsioFormulas12_offset 8872
-#define fsioFormulas12_offset_hex 22a8
-#define fsioFormulas13_offset 9072
-#define fsioFormulas13_offset_hex 2370
-#define fsioFormulas14_offset 9272
-#define fsioFormulas14_offset_hex 2438
-#define fsioFormulas15_offset 9472
-#define fsioFormulas15_offset_hex 2500
-#define fsioFormulas16_offset 9672
-#define fsioFormulas16_offset_hex 25c8
-#define fsioFormulas1_offset 6672
-#define fsioFormulas1_offset_hex 1a10
-#define fsioFormulas2_offset 6872
-#define fsioFormulas2_offset_hex 1ad8
-#define fsioFormulas3_offset 7072
-#define fsioFormulas3_offset_hex 1ba0
-#define fsioFormulas4_offset 7272
-#define fsioFormulas4_offset_hex 1c68
-#define fsioFormulas5_offset 7472
-#define fsioFormulas5_offset_hex 1d30
-#define fsioFormulas6_offset 7672
-#define fsioFormulas6_offset_hex 1df8
-#define fsioFormulas7_offset 7872
-#define fsioFormulas7_offset_hex 1ec0
-#define fsioFormulas8_offset 8072
-#define fsioFormulas8_offset_hex 1f88
-#define fsioFormulas9_offset 8272
-#define fsioFormulas9_offset_hex 2050
+#define fsioFormulas10_offset 8420
+#define fsioFormulas10_offset_hex 20e4
+#define fsioFormulas11_offset 8620
+#define fsioFormulas11_offset_hex 21ac
+#define fsioFormulas12_offset 8820
+#define fsioFormulas12_offset_hex 2274
+#define fsioFormulas13_offset 9020
+#define fsioFormulas13_offset_hex 233c
+#define fsioFormulas14_offset 9220
+#define fsioFormulas14_offset_hex 2404
+#define fsioFormulas15_offset 9420
+#define fsioFormulas15_offset_hex 24cc
+#define fsioFormulas16_offset 9620
+#define fsioFormulas16_offset_hex 2594
+#define fsioFormulas1_offset 6620
+#define fsioFormulas1_offset_hex 19dc
+#define fsioFormulas2_offset 6820
+#define fsioFormulas2_offset_hex 1aa4
+#define fsioFormulas3_offset 7020
+#define fsioFormulas3_offset_hex 1b6c
+#define fsioFormulas4_offset 7220
+#define fsioFormulas4_offset_hex 1c34
+#define fsioFormulas5_offset 7420
+#define fsioFormulas5_offset_hex 1cfc
+#define fsioFormulas6_offset 7620
+#define fsioFormulas6_offset_hex 1dc4
+#define fsioFormulas7_offset 7820
+#define fsioFormulas7_offset_hex 1e8c
+#define fsioFormulas8_offset 8020
+#define fsioFormulas8_offset_hex 1f54
+#define fsioFormulas9_offset 8220
+#define fsioFormulas9_offset_hex 201c
 #define fsioFrequency10_offset 850
 #define fsioFrequency10_offset_hex 352
 #define fsioFrequency11_offset 852
@ -906,30 +908,30 @@
 #define fsioOutputPins8_offset_hex 313
 #define fsioOutputPins9_offset 788
 #define fsioOutputPins9_offset_hex 314
-#define fsioTable1_offset 19296
-#define fsioTable1_offset_hex 4b60
-#define fsioTable1LoadBins_offset 19552
-#define fsioTable1LoadBins_offset_hex 4c60
-#define fsioTable1RpmBins_offset 19584
-#define fsioTable1RpmBins_offset_hex 4c80
-#define fsioTable2_offset 19616
-#define fsioTable2_offset_hex 4ca0
-#define fsioTable2LoadBins_offset 19680
-#define fsioTable2LoadBins_offset_hex 4ce0
-#define fsioTable2RpmBins_offset 19712
-#define fsioTable2RpmBins_offset_hex 4d00
-#define fsioTable3_offset 19744
-#define fsioTable3_offset_hex 4d20
-#define fsioTable3LoadBins_offset 19808
-#define fsioTable3LoadBins_offset_hex 4d60
-#define fsioTable3RpmBins_offset 19840
-#define fsioTable3RpmBins_offset_hex 4d80
-#define fsioTable4_offset 19872
-#define fsioTable4_offset_hex 4da0
-#define fsioTable4LoadBins_offset 19936
-#define fsioTable4LoadBins_offset_hex 4de0
-#define fsioTable4RpmBins_offset 19968
-#define fsioTable4RpmBins_offset_hex 4e00
+#define fsioTable1_offset 19244
+#define fsioTable1_offset_hex 4b2c
+#define fsioTable1LoadBins_offset 19500
+#define fsioTable1LoadBins_offset_hex 4c2c
+#define fsioTable1RpmBins_offset 19532
+#define fsioTable1RpmBins_offset_hex 4c4c
+#define fsioTable2_offset 19564
+#define fsioTable2_offset_hex 4c6c
+#define fsioTable2LoadBins_offset 19628
+#define fsioTable2LoadBins_offset_hex 4cac
+#define fsioTable2RpmBins_offset 19660
+#define fsioTable2RpmBins_offset_hex 4ccc
+#define fsioTable3_offset 19692
+#define fsioTable3_offset_hex 4cec
+#define fsioTable3LoadBins_offset 19756
+#define fsioTable3LoadBins_offset_hex 4d2c
+#define fsioTable3RpmBins_offset 19788
+#define fsioTable3RpmBins_offset_hex 4d4c
+#define fsioTable4_offset 19820
+#define fsioTable4_offset_hex 4d6c
+#define fsioTable4LoadBins_offset 19884
+#define fsioTable4LoadBins_offset_hex 4dac
+#define fsioTable4RpmBins_offset 19916
+#define fsioTable4RpmBins_offset_hex 4dcc
 #define FUEL_LOAD_COUNT 16
 #define FUEL_RPM_COUNT 16
 #define fuelAlgorithm_offset 420
@ -968,18 +970,18 @@
 #define fuelLevelFullTankVoltage_offset_hex 2b0
 #define fuelLevelSensor_offset 514
 #define fuelLevelSensor_offset_hex 202
-#define fuelLoadBins_offset 16160
-#define fuelLoadBins_offset_hex 3f20
+#define fuelLoadBins_offset 16108
+#define fuelLoadBins_offset_hex 3eec
 #define fuelPumpPin_offset 658
 #define fuelPumpPin_offset_hex 292
 #define fuelPumpPinMode_offset 659
 #define fuelPumpPinMode_offset_hex 293
 #define fuelRailPressure_offset 1756
 #define fuelRailPressure_offset_hex 6dc
-#define fuelRpmBins_offset 16224
-#define fuelRpmBins_offset_hex 3f60
-#define fuelTable_offset 15136
-#define fuelTable_offset_hex 3b20
+#define fuelRpmBins_offset 16172
+#define fuelRpmBins_offset_hex 3f2c
+#define fuelTable_offset 15084
+#define fuelTable_offset_hex 3aec
 #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time"
 #define GAUGE_NAME_ACCEL_X "Acceleration: X"
 #define GAUGE_NAME_ACCEL_Y "Acceleration: Y"
@ -1248,10 +1250,10 @@
 #define iat_tempC_2_offset_hex 120
 #define iat_tempC_3_offset 292
 #define iat_tempC_3_offset_hex 124
-#define iatFuelCorr_offset 10464
-#define iatFuelCorr_offset_hex 28e0
-#define iatFuelCorrBins_offset 10400
-#define iatFuelCorrBins_offset_hex 28a0
+#define iatFuelCorr_offset 10412
+#define iatFuelCorr_offset_hex 28ac
+#define iatFuelCorrBins_offset 10348
+#define iatFuelCorrBins_offset_hex 286c
 #define IDLE_ADVANCE_CURVE_SIZE 8
 #define idle_offset 600
 #define idle_offset_hex 258
@ -1266,10 +1268,10 @@
 #define idle_stepperStepPin_offset 606
 #define idle_stepperStepPin_offset_hex 25e
 #define IDLE_VE_CURVE_SIZE 8
-#define idleAdvance_offset 6576
-#define idleAdvance_offset_hex 19b0
-#define idleAdvanceBins_offset 6544
-#define idleAdvanceBins_offset_hex 1990
+#define idleAdvance_offset 6524
+#define idleAdvance_offset_hex 197c
+#define idleAdvanceBins_offset 6492
+#define idleAdvanceBins_offset_hex 195c
 #define idleIncrementalPidCic_offset 744
 #define idleIncrementalPidCic_offset_hex 2e8
 #define idleMode_offset 1472
@ -1346,24 +1348,24 @@
 #define idleTimingPidDeadZone_offset_hex f96
 #define idleTimingPidWorkZone_offset 3988
 #define idleTimingPidWorkZone_offset_hex f94
-#define idleVe_offset 6640
-#define idleVe_offset_hex 19f0
-#define idleVeBins_offset 6608
-#define idleVeBins_offset_hex 19d0
+#define idleVe_offset 6588
+#define idleVe_offset_hex 19bc
+#define idleVeBins_offset 6556
+#define idleVeBins_offset_hex 199c
 #define IGN_LOAD_COUNT 16
 #define IGN_RPM_COUNT 16
 #define IGN_TPS_COUNT 16
 #define IGNITION_PIN_COUNT 12
 #define ignitionDwellForCrankingMs_offset 100
 #define ignitionDwellForCrankingMs_offset_hex 64
-#define ignitionIatCorrLoadBins_offset 13856
-#define ignitionIatCorrLoadBins_offset_hex 3620
-#define ignitionIatCorrRpmBins_offset 13920
-#define ignitionIatCorrRpmBins_offset_hex 3660
-#define ignitionIatCorrTable_offset 12832
-#define ignitionIatCorrTable_offset_hex 3220
-#define ignitionLoadBins_offset 17312
-#define ignitionLoadBins_offset_hex 43a0
+#define ignitionIatCorrLoadBins_offset 13804
+#define ignitionIatCorrLoadBins_offset_hex 35ec
+#define ignitionIatCorrRpmBins_offset 13868
+#define ignitionIatCorrRpmBins_offset_hex 362c
+#define ignitionIatCorrTable_offset 12780
+#define ignitionIatCorrTable_offset_hex 31ec
+#define ignitionLoadBins_offset 17260
+#define ignitionLoadBins_offset_hex 436c
 #define ignitionMode_offset 440
 #define ignitionMode_offset_hex 1b8
 #define ignitionOffset_offset 444
@ -1394,10 +1396,10 @@
 #define ignitionPins8_offset_hex 283
 #define ignitionPins9_offset 644
 #define ignitionPins9_offset_hex 284
-#define ignitionRpmBins_offset 17376
-#define ignitionRpmBins_offset_hex 43e0
-#define ignitionTable_offset 16288
-#define ignitionTable_offset_hex 3fa0
+#define ignitionRpmBins_offset 17324
+#define ignitionRpmBins_offset_hex 43ac
+#define ignitionTable_offset 16236
+#define ignitionTable_offset_hex 3f6c
 #define ignitionTpsBins_offset 3800
 #define ignitionTpsBins_offset_hex ed8
 #define ignitionTpsTable_offset 3288
@ -1411,8 +1413,8 @@
 #define INJECTION_PIN_COUNT 12
 #define injectionMode_offset 428
 #define injectionMode_offset_hex 1ac
-#define injectionPhase_offset 13984
-#define injectionPhase_offset_hex 36a0
+#define injectionPhase_offset 13932
+#define injectionPhase_offset_hex 366c
 #define injectionPinMode_offset 648
 #define injectionPinMode_offset_hex 288
 #define injectionPins10_offset 633
@ -1447,10 +1449,10 @@
 #define injector_flow_offset_hex 8
 #define injector_offset 8
 #define injector_offset_hex 8
-#define injPhaseLoadBins_offset 15008
-#define injPhaseLoadBins_offset_hex 3aa0
-#define injPhaseRpmBins_offset 15072
-#define injPhaseRpmBins_offset_hex 3ae0
+#define injPhaseLoadBins_offset 14956
+#define injPhaseLoadBins_offset_hex 3a6c
+#define injPhaseRpmBins_offset 15020
+#define injPhaseRpmBins_offset_hex 3aac
 #define invertPrimaryTriggerSignal_offset 1464
 #define invertPrimaryTriggerSignal_offset_hex 5b8
 #define invertSecondaryTriggerSignal_offset 1464
@ -1619,18 +1621,18 @@
 #define maf_sensor_type_e_enum "v0", "v1", "v2", "v3"
 #define mafAdcChannel_offset 543
 #define mafAdcChannel_offset_hex 21f
-#define mafDecoding_offset 10784
-#define mafDecoding_offset_hex 2a20
-#define mafDecodingBins_offset 11808
-#define mafDecodingBins_offset_hex 2e20
+#define mafDecoding_offset 10732
+#define mafDecoding_offset_hex 29ec
+#define mafDecodingBins_offset 11756
+#define mafDecodingBins_offset_hex 2dec
 #define mafSensorType_offset 948
 #define mafSensorType_offset_hex 3b4
 #define mainRelayPin_offset 706
 #define mainRelayPin_offset_hex 2c2
 #define mainRelayPinMode_offset 752
 #define mainRelayPinMode_offset_hex 2f0
-#define mainUnusedEnd_offset 4496
-#define mainUnusedEnd_offset_hex 1190
+#define mainUnusedEnd_offset 4516
+#define mainUnusedEnd_offset_hex 11a4
 #define malfunctionIndicatorPin_offset 660
 #define malfunctionIndicatorPin_offset_hex 294
 #define malfunctionIndicatorPinMode_offset 661
@ -1721,6 +1723,24 @@
 #define mc33972spiDevice_offset_hex fa8
 #define mc33_hvolt_offset 760
 #define mc33_hvolt_offset_hex 2f8
+#define mc33_i_boost_offset 4496
+#define mc33_i_boost_offset_hex 1190
+#define mc33_i_hold_offset 4500
+#define mc33_i_hold_offset_hex 1194
+#define mc33_i_peak_offset 4498
+#define mc33_i_peak_offset_hex 1192
+#define mc33_t_bypass_offset 4508
+#define mc33_t_bypass_offset_hex 119c
+#define mc33_t_hold_off_offset 4510
+#define mc33_t_hold_off_offset_hex 119e
+#define mc33_t_hold_tot_offset 4512
+#define mc33_t_hold_tot_offset_hex 11a0
+#define mc33_t_max_boost_offset 4502
+#define mc33_t_max_boost_offset_hex 1196
+#define mc33_t_peak_off_offset 4504
+#define mc33_t_peak_off_offset_hex 1198
+#define mc33_t_peak_tot_offset 4506
+#define mc33_t_peak_tot_offset_hex 119a
 #define measureMapOnlyInOneCylinder_offset 744
 #define measureMapOnlyInOneCylinder_offset_hex 2e8
 #define MOCK_AFR_COMMAND "mock_afr_voltage"
@ -1785,12 +1805,12 @@
 #define pauseEtbControl_offset 744
 #define pauseEtbControl_offset_hex 2e8
 #define PEDAL_TO_TPS_SIZE 8
-#define pedalToTpsPedalBins_offset 6464
-#define pedalToTpsPedalBins_offset_hex 1940
-#define pedalToTpsRpmBins_offset 6472
-#define pedalToTpsRpmBins_offset_hex 1948
-#define pedalToTpsTable_offset 6400
-#define pedalToTpsTable_offset_hex 1900
+#define pedalToTpsPedalBins_offset 6412
+#define pedalToTpsPedalBins_offset_hex 190c
+#define pedalToTpsRpmBins_offset 6420
+#define pedalToTpsRpmBins_offset_hex 1914
+#define pedalToTpsTable_offset 6348
+#define pedalToTpsTable_offset_hex 18cc
 #define pidExtraForLowRpm_offset 3156
 #define pidExtraForLowRpm_offset_hex c54
 #define pin_mode_e_enum "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"
@ -2069,12 +2089,12 @@
 #define timing_offset_cylinder8_offset_hex a08
 #define timing_offset_cylinder9_offset 2572
 #define timing_offset_cylinder9_offset_hex a0c
-#define timingAdditive_offset 10072
-#define timingAdditive_offset_hex 2758
+#define timingAdditive_offset 10020
+#define timingAdditive_offset_hex 2724
 #define timingMode_offset 448
 #define timingMode_offset_hex 1c0
-#define timingMultiplier_offset 9872
-#define timingMultiplier_offset_hex 2690
+#define timingMultiplier_offset 9820
+#define timingMultiplier_offset_hex 265c
 #define tle6240_cs_offset 581
 #define tle6240_cs_offset_hex 245
 #define tle6240_csPinMode_offset 582
@ -2097,8 +2117,8 @@
 #define TOOTH_PACKET_COUNT 1000
 #define TOOTH_PACKET_SIZE 2
 #define TOP_DEAD_CENTER_MESSAGE "r"
-#define TOTAL_CONFIG_SIZE 20000
-#define TOTAL_CONFIG_SIZE_hex 4e20
+#define TOTAL_CONFIG_SIZE 19948
+#define TOTAL_CONFIG_SIZE_hex 4dec
 #define tps1_1AdcChannel_offset 512
 #define tps1_1AdcChannel_offset_hex 200
 #define tps1_2AdcChannel_offset 681
@ -2141,12 +2161,12 @@
 #define tpsMax_offset_hex 52
 #define tpsMin_offset 80
 #define tpsMin_offset_hex 50
-#define tpsTpsAccelFromRpmBins_offset 19232
-#define tpsTpsAccelFromRpmBins_offset_hex 4b20
-#define tpsTpsAccelTable_offset 18976
-#define tpsTpsAccelTable_offset_hex 4a20
-#define tpsTpsAccelToRpmBins_offset 19264
-#define tpsTpsAccelToRpmBins_offset_hex 4b40
+#define tpsTpsAccelFromRpmBins_offset 19180
+#define tpsTpsAccelFromRpmBins_offset_hex 4aec
+#define tpsTpsAccelTable_offset 18924
+#define tpsTpsAccelTable_offset_hex 49ec
+#define tpsTpsAccelToRpmBins_offset 19212
+#define tpsTpsAccelToRpmBins_offset_hex 4b0c
 #define trigger_customSkippedToothCount_offset 536
 #define trigger_customSkippedToothCount_offset_hex 218
 #define trigger_customTotalToothCount_offset 532
@ -2291,8 +2311,8 @@
 #define unused1476b20_offset_hex 5c4
 #define unused2432_offset 2432
 #define unused2432_offset_hex 980
-#define unused6312_offset 6312
-#define unused6312_offset_hex 18a8
+#define unused6312_offset 6260
+#define unused6312_offset_hex 1874
 #define unused711_offset 711
 #define unused711_offset_hex 2c7
 #define unused806_offset 806
@ -2473,18 +2493,18 @@
 #define vehicleSpeedCoef_offset_hex 1dc
 #define vehicleSpeedSensorInputPin_offset 968
 #define vehicleSpeedSensorInputPin_offset_hex 3c8
-#define veLoadBins_offset 18464
-#define veLoadBins_offset_hex 4820
+#define veLoadBins_offset 18412
+#define veLoadBins_offset_hex 47ec
 #define verboseCanBaseAddress_offset 756
 #define verboseCanBaseAddress_offset_hex 2f4
 #define verboseTLE8888_offset 744
 #define verboseTLE8888_offset_hex 2e8
 #define verboseTriggerSynchDetails_offset 1476
 #define verboseTriggerSynchDetails_offset_hex 5c4
-#define veRpmBins_offset 18528
-#define veRpmBins_offset_hex 4860
-#define veTable_offset 17440
-#define veTable_offset_hex 4420
+#define veRpmBins_offset 18476
+#define veRpmBins_offset_hex 482c
+#define veTable_offset 17388
+#define veTable_offset_hex 43ec
 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02
 #define vRefAdcChannel_offset 1470
 #define vRefAdcChannel_offset_hex 5be
@ -2495,8 +2515,8 @@
 #define vvtMode_offset_hex 918
 #define vvtOffset_offset 2052
 #define vvtOffset_offset_hex 804
-#define warning_message_offset 6000
-#define warning_message_offset_hex 1770
+#define warning_message_offset 5948
+#define warning_message_offset_hex 173c
 #define warningLedPin_offset 2041
 #define warningLedPin_offset_hex 7f9
 #define warningPeriod_offset 1498
--- 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.bat integration\rusefi_config.txt Sun May 10 10:08:58 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue May 19 08:38:18 EDT 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -3165,8 +3165,49 @@ struct engine_configuration_s {
 	/**
 	 * offset 4496
 	 */
-	int mainUnusedEnd[376];
-	/** total size 6000*/
+	uint16_t mc33_i_boost;
+	/**
+	 * offset 4498
+	 */
+	uint16_t mc33_i_peak;
+	/**
+	 * offset 4500
+	 */
+	uint16_t mc33_i_hold;
+	/**
+	 * offset 4502
+	 */
+	uint16_t mc33_t_max_boost;
+	/**
+	 * offset 4504
+	 */
+	uint16_t mc33_t_peak_off;
+	/**
+	 * offset 4506
+	 */
+	uint16_t mc33_t_peak_tot;
+	/**
+	 * offset 4508
+	 */
+	uint16_t mc33_t_bypass;
+	/**
+	 * offset 4510
+	 */
+	uint16_t mc33_t_hold_off;
+	/**
+	 * offset 4512
+	 */
+	uint16_t mc33_t_hold_tot;
+	/**
+	 * need 4 byte alignment
+	 * offset 4514
+	 */
+	uint8_t alignmentFill_at_4514[2];
+	/**
+	 * offset 4516
+	 */
+	int mainUnusedEnd[358];
+	/** total size 5948*/
 };

 typedef struct engine_configuration_s engine_configuration_s;
@ -3178,295 +3219,295 @@ struct persistent_config_s {
 	 */
 	engine_configuration_s engineConfiguration;
 	/**
-	 * offset 6000
+	 * offset 5948
 	 */
 	error_message_t warning_message;
 	/**
-	 * offset 6120
+	 * offset 6068
 	 */
 	float afterstartCoolantBins[AFTERSTART_HOLD_CURVE_SIZE];
 	/**
-	 * offset 6152
+	 * offset 6100
 	 */
 	float afterstartHoldTime[AFTERSTART_HOLD_CURVE_SIZE];
 	/**
-	 * offset 6184
+	 * offset 6132
 	 */
 	float afterstartEnrich[AFTERSTART_ENRICH_CURVE_SIZE];
 	/**
-	 * offset 6216
+	 * offset 6164
 	 */
 	float afterstartDecayTime[AFTERSTART_DECAY_CURVE_SIZE];
 	/**
-	 * offset 6248
+	 * offset 6196
 	 */
 	boost_table_t boostTableOpenLoop;
 	/**
-	 * offset 6312
+	 * offset 6260
 	 */
 	uint8_t unused6312[8];
 	/**
-	 * offset 6320
+	 * offset 6268
 	 */
 	uint8_t boostRpmBins[BOOST_RPM_COUNT];
 	/**
-	 * offset 6328
+	 * offset 6276
 	 */
 	boost_table_t boostTableClosedLoop;
 	/**
-	 * offset 6392
+	 * offset 6340
 	 */
 	uint8_t boostTpsBins[BOOST_LOAD_COUNT];
 	/**
-	 * offset 6400
+	 * offset 6348
 	 */
 	pedal_to_tps_t pedalToTpsTable;
 	/**
-	 * offset 6464
+	 * offset 6412
 	 */
 	uint8_t pedalToTpsPedalBins[PEDAL_TO_TPS_SIZE];
 	/**
-	 * offset 6472
+	 * offset 6420
 	 */
 	uint8_t pedalToTpsRpmBins[PEDAL_TO_TPS_SIZE];
 	/**
 	 * CLT-based cranking position multiplier for simple manual idle controller
-	 * offset 6480
+	 * offset 6428
 	 */
 	float cltCrankingCorrBins[CLT_CRANKING_CURVE_SIZE];
 	/**
 	 * CLT-based cranking position multiplier for simple manual idle controller
-	 * offset 6512
+	 * offset 6460
 	 */
 	float cltCrankingCorr[CLT_CRANKING_CURVE_SIZE];
 	/**
 	 * Optional timing advance table for Idle (see useSeparateAdvanceForIdle)
-	 * offset 6544
+	 * offset 6492
 	 */
 	float idleAdvanceBins[IDLE_ADVANCE_CURVE_SIZE];
 	/**
 	 * Optional timing advance table for Idle (see useSeparateAdvanceForIdle)
-	 * offset 6576
+	 * offset 6524
 	 */
 	float idleAdvance[IDLE_ADVANCE_CURVE_SIZE];
 	/**
 	 * Optional VE table for Idle (see useSeparateVEForIdle)
-	 * offset 6608
+	 * offset 6556
 	 */
 	float idleVeBins[IDLE_VE_CURVE_SIZE];
 	/**
 	 *  Optional VE table for Idle (see useSeparateVEForIdle)
-	 * offset 6640
+	 * offset 6588
 	 */
 	float idleVe[IDLE_VE_CURVE_SIZE];
 	/**
-	 * offset 6672
+	 * offset 6620
 	 */
 	le_formula_t fsioFormulas[FSIO_COMMAND_COUNT];
 	/**
-	 * offset 9872
+	 * offset 9820
 	 */
 	le_formula_t timingMultiplier;
 	/**
-	 * offset 10072
+	 * offset 10020
 	 */
 	le_formula_t timingAdditive;
 	/**
-	 * offset 10272
+	 * offset 10220
 	 */
 	float cltFuelCorrBins[CLT_CURVE_SIZE];
 	/**
-	 * offset 10336
+	 * offset 10284
 	 */
 	float cltFuelCorr[CLT_CURVE_SIZE];
 	/**
-	 * offset 10400
+	 * offset 10348
 	 */
 	float iatFuelCorrBins[IAT_CURVE_SIZE];
 	/**
-	 * offset 10464
+	 * offset 10412
 	 */
 	float iatFuelCorr[IAT_CURVE_SIZE];
 	/**
-	 * offset 10528
+	 * offset 10476
 	 */
 	float crankingFuelCoef[CRANKING_CURVE_SIZE];
 	/**
-	 * offset 10560
+	 * offset 10508
 	 */
 	float crankingFuelBins[CRANKING_CURVE_SIZE];
 	/**
-	 * offset 10592
+	 * offset 10540
 	 */
 	float crankingCycleCoef[CRANKING_CURVE_SIZE];
 	/**
-	 * offset 10624
+	 * offset 10572
 	 */
 	float crankingCycleBins[CRANKING_CURVE_SIZE];
 	/**
 	 * CLT-based idle position multiplier for simple manual idle controller
-	 * offset 10656
+	 * offset 10604
 	 */
 	float cltIdleCorrBins[CLT_CURVE_SIZE];
 	/**
 	 *  CLT-based idle position multiplier for simple manual idle controller
-	 * offset 10720
+	 * offset 10668
 	 */
 	float cltIdleCorr[CLT_CURVE_SIZE];
 	/**
 	 * Also known as MAF transfer function.
 	 * kg/hour value.
 	 * By the way 2.081989116 kg/h = 1 ft3/m
-	 * offset 10784
+	 * offset 10732
 	 */
 	float mafDecoding[MAF_DECODING_COUNT];
 	/**
-	 * offset 11808
+	 * offset 11756
 	 */
 	float mafDecodingBins[MAF_DECODING_COUNT];
 	/**
-	 * offset 12832
+	 * offset 12780
 	 */
 	angle_table_t ignitionIatCorrTable;
 	/**
-	 * offset 13856
+	 * offset 13804
 	 */
 	float ignitionIatCorrLoadBins[IGN_LOAD_COUNT];
 	/**
-	 * offset 13920
+	 * offset 13868
 	 */
 	float ignitionIatCorrRpmBins[IGN_RPM_COUNT];
 	/**
-	 * offset 13984
+	 * offset 13932
 	 */
 	angle_table_t injectionPhase;
 	/**
-	 * offset 15008
+	 * offset 14956
 	 */
 	float injPhaseLoadBins[FUEL_LOAD_COUNT];
 	/**
-	 * offset 15072
+	 * offset 15020
 	 */
 	float injPhaseRpmBins[FUEL_RPM_COUNT];
 	/**
-	 * offset 15136
+	 * offset 15084
 	 */
 	fuel_table_t fuelTable;
 	/**
-	 * offset 16160
+	 * offset 16108
 	 */
 	float fuelLoadBins[FUEL_LOAD_COUNT];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 16224
+	 * offset 16172
 	 */
 	float fuelRpmBins[FUEL_RPM_COUNT];
 	/**
-	 * offset 16288
+	 * offset 16236
 	 */
 	ignition_table_t ignitionTable;
 	/**
-	 * offset 17312
+	 * offset 17260
 	 */
 	float ignitionLoadBins[IGN_LOAD_COUNT];
 	/**
-	 * offset 17376
+	 * offset 17324
 	 */
 	float ignitionRpmBins[IGN_RPM_COUNT];
 	/**
-	 * offset 17440
+	 * offset 17388
 	 */
 	ve_table_t veTable;
 	/**
-	 * offset 18464
+	 * offset 18412
 	 */
 	float veLoadBins[FUEL_LOAD_COUNT];
 	/**
-	 * offset 18528
+	 * offset 18476
 	 */
 	float veRpmBins[FUEL_RPM_COUNT];
 	/**
-	 * offset 18592
+	 * offset 18540
 	 */
 	afr_table_t afrTable;
 	/**
-	 * offset 18848
+	 * offset 18796
 	 */
 	float afrLoadBins[FUEL_LOAD_COUNT];
 	/**
-	 * offset 18912
+	 * offset 18860
 	 */
 	float afrRpmBins[FUEL_RPM_COUNT];
 	/**
-	 * offset 18976
+	 * offset 18924
 	 */
 	tps_tps_table_t tpsTpsAccelTable;
 	/**
-	 * offset 19232
+	 * offset 19180
 	 */
 	float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19264
+	 * offset 19212
 	 */
 	float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE];
 	/**
-	 * offset 19296
+	 * offset 19244
 	 */
 	fsio_table_8x8_f32t fsioTable1;
 	/**
-	 * offset 19552
+	 * offset 19500
 	 */
 	float fsioTable1LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19584
+	 * offset 19532
 	 */
 	float fsioTable1RpmBins[FSIO_TABLE_8];
 	/**
-	 * offset 19616
+	 * offset 19564
 	 */
 	fsio_table_8x8_u8t fsioTable2;
 	/**
-	 * offset 19680
+	 * offset 19628
 	 */
 	float fsioTable2LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19712
+	 * offset 19660
 	 */
 	float fsioTable2RpmBins[FSIO_TABLE_8];
 	/**
-	 * offset 19744
+	 * offset 19692
 	 */
 	fsio_table_8x8_u8t fsioTable3;
 	/**
-	 * offset 19808
+	 * offset 19756
 	 */
 	float fsioTable3LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19840
+	 * offset 19788
 	 */
 	float fsioTable3RpmBins[FSIO_TABLE_8];
 	/**
-	 * offset 19872
+	 * offset 19820
 	 */
 	fsio_table_8x8_u8t fsioTable4;
 	/**
-	 * offset 19936
+	 * offset 19884
 	 */
 	float fsioTable4LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 19968
+	 * offset 19916
 	 */
 	float fsioTable4RpmBins[FSIO_TABLE_8];
-	/** total size 20000*/
+	/** total size 19948*/
 };

 typedef struct persistent_config_s persistent_config_s;

 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 10:08:58 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue May 19 08:38:18 EDT 2020
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@ -46,29 +46,31 @@
 #define afr_value1_offset_hex 238
 #define afr_value2_offset 576
 #define afr_value2_offset_hex 240
-#define afrLoadBins_offset 18848
-#define afrLoadBins_offset_hex 49a0
-#define afrRpmBins_offset 18912
-#define afrRpmBins_offset_hex 49e0
-#define afrTable_offset 18592
-#define afrTable_offset_hex 48a0
+#define afrLoadBins_offset 18796
+#define afrLoadBins_offset_hex 496c
+#define afrRpmBins_offset 18860
+#define afrRpmBins_offset_hex 49ac
+#define afrTable_offset 18540
+#define afrTable_offset_hex 486c
 #define afterCrankingIACtaperDuration_offset 2036
 #define afterCrankingIACtaperDuration_offset_hex 7f4
 #define AFTERSTART_DECAY_CURVE_SIZE 8
 #define AFTERSTART_ENRICH_CURVE_SIZE 8
 #define AFTERSTART_HOLD_CURVE_SIZE 8
-#define afterstartCoolantBins_offset 6120
-#define afterstartCoolantBins_offset_hex 17e8
-#define afterstartDecayTime_offset 6216
-#define afterstartDecayTime_offset_hex 1848
-#define afterstartEnrich_offset 6184
-#define afterstartEnrich_offset_hex 1828
-#define afterstartHoldTime_offset 6152
-#define afterstartHoldTime_offset_hex 1808
+#define afterstartCoolantBins_offset 6068
+#define afterstartCoolantBins_offset_hex 17b4
+#define afterstartDecayTime_offset 6164
+#define afterstartDecayTime_offset_hex 1814
+#define afterstartEnrich_offset 6132
+#define afterstartEnrich_offset_hex 17f4
+#define afterstartHoldTime_offset 6100
+#define afterstartHoldTime_offset_hex 17d4
 #define alFIn_offset 4024
 #define alFIn_offset_hex fb8
 #define alignEngineSnifferAtTDC_offset 744
 #define alignEngineSnifferAtTDC_offset_hex 2e8
+#define alignmentFill_at_4514_offset 4514
+#define alignmentFill_at_4514_offset_hex 11a2
 #define alternator_antiwindupFreq_offset 1764
 #define alternator_antiwindupFreq_offset_hex 6e4
 #define alternator_derivativeFilterLoss_offset 1760
@ -308,14 +310,14 @@
 #define boostPid_pFactor_offset_hex 3e0
 #define boostPwmFrequency_offset 1016
 #define boostPwmFrequency_offset_hex 3f8
-#define boostRpmBins_offset 6320
-#define boostRpmBins_offset_hex 18b0
-#define boostTableClosedLoop_offset 6328
-#define boostTableClosedLoop_offset_hex 18b8
-#define boostTableOpenLoop_offset 6248
-#define boostTableOpenLoop_offset_hex 1868
-#define boostTpsBins_offset 6392
-#define boostTpsBins_offset_hex 18f8
+#define boostRpmBins_offset 6268
+#define boostRpmBins_offset_hex 187c
+#define boostTableClosedLoop_offset 6276
+#define boostTableClosedLoop_offset_hex 1884
+#define boostTableOpenLoop_offset 6196
+#define boostTableOpenLoop_offset_hex 1834
+#define boostTpsBins_offset 6340
+#define boostTpsBins_offset_hex 18c4
 #define boostType_offset 1012
 #define boostType_offset_hex 3f4
 #define brain_input_pin_e_enum "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@ -393,18 +395,18 @@
 #define clt_tempC_3_offset 260
 #define clt_tempC_3_offset_hex 104
 #define CLT_TIMING_CURVE_SIZE 8
-#define cltCrankingCorr_offset 6512
-#define cltCrankingCorr_offset_hex 1970
-#define cltCrankingCorrBins_offset 6480
-#define cltCrankingCorrBins_offset_hex 1950
-#define cltFuelCorr_offset 10336
-#define cltFuelCorr_offset_hex 2860
-#define cltFuelCorrBins_offset 10272
-#define cltFuelCorrBins_offset_hex 2820
-#define cltIdleCorr_offset 10720
-#define cltIdleCorr_offset_hex 29e0
-#define cltIdleCorrBins_offset 10656
-#define cltIdleCorrBins_offset_hex 29a0
+#define cltCrankingCorr_offset 6460
+#define cltCrankingCorr_offset_hex 193c
+#define cltCrankingCorrBins_offset 6428
+#define cltCrankingCorrBins_offset_hex 191c
+#define cltFuelCorr_offset 10284
+#define cltFuelCorr_offset_hex 282c
+#define cltFuelCorrBins_offset 10220
+#define cltFuelCorrBins_offset_hex 27ec
+#define cltIdleCorr_offset 10668
+#define cltIdleCorr_offset_hex 29ac
+#define cltIdleCorrBins_offset 10604
+#define cltIdleCorrBins_offset_hex 296c
 #define cltIdleRpm_offset 1960
 #define cltIdleRpm_offset_hex 7a8
 #define cltIdleRpmBins_offset 1896
@ -477,14 +479,14 @@
 #define crankingAdvanceBins_offset_hex c24
 #define crankingChargeAngle_offset 104
 #define crankingChargeAngle_offset_hex 68
-#define crankingCycleBins_offset 10624
-#define crankingCycleBins_offset_hex 2980
-#define crankingCycleCoef_offset 10592
-#define crankingCycleCoef_offset_hex 2960
-#define crankingFuelBins_offset 10560
-#define crankingFuelBins_offset_hex 2940
-#define crankingFuelCoef_offset 10528
-#define crankingFuelCoef_offset_hex 2920
+#define crankingCycleBins_offset 10572
+#define crankingCycleBins_offset_hex 294c
+#define crankingCycleCoef_offset 10540
+#define crankingCycleCoef_offset_hex 292c
+#define crankingFuelBins_offset 10508
+#define crankingFuelBins_offset_hex 290c
+#define crankingFuelCoef_offset 10476
+#define crankingFuelCoef_offset_hex 28ec
 #define crankingIACposition_offset 2228
 #define crankingIACposition_offset_hex 8b4
 #define crankingInjectionMode_offset 424
@ -778,38 +780,38 @@
 #define fsioDigitalInputs8_offset_hex 3bf
 #define fsioDigitalInputs9_offset 960
 #define fsioDigitalInputs9_offset_hex 3c0
-#define fsioFormulas10_offset 8472
-#define fsioFormulas10_offset_hex 2118
-#define fsioFormulas11_offset 8672
-#define fsioFormulas11_offset_hex 21e0
-#define fsioFormulas12_offset 8872
-#define fsioFormulas12_offset_hex 22a8
-#define fsioFormulas13_offset 9072
-#define fsioFormulas13_offset_hex 2370
-#define fsioFormulas14_offset 9272
-#define fsioFormulas14_offset_hex 2438
-#define fsioFormulas15_offset 9472
-#define fsioFormulas15_offset_hex 2500
-#define fsioFormulas16_offset 9672
-#define fsioFormulas16_offset_hex 25c8
-#define fsioFormulas1_offset 6672
-#define fsioFormulas1_offset_hex 1a10
-#define fsioFormulas2_offset 6872
-#define fsioFormulas2_offset_hex 1ad8
-#define fsioFormulas3_offset 7072
-#define fsioFormulas3_offset_hex 1ba0
-#define fsioFormulas4_offset 7272
-#define fsioFormulas4_offset_hex 1c68
-#define fsioFormulas5_offset 7472
-#define fsioFormulas5_offset_hex 1d30
-#define fsioFormulas6_offset 7672
-#define fsioFormulas6_offset_hex 1df8
-#define fsioFormulas7_offset 7872
-#define fsioFormulas7_offset_hex 1ec0
-#define fsioFormulas8_offset 8072
-#define fsioFormulas8_offset_hex 1f88
-#define fsioFormulas9_offset 8272
-#define fsioFormulas9_offset_hex 2050
+#define fsioFormulas10_offset 8420
+#define fsioFormulas10_offset_hex 20e4
+#define fsioFormulas11_offset 8620
+#define fsioFormulas11_offset_hex 21ac
+#define fsioFormulas12_offset 8820
+#define fsioFormulas12_offset_hex 2274
+#define fsioFormulas13_offset 9020
+#define fsioFormulas13_offset_hex 233c
+#define fsioFormulas14_offset 9220
+#define fsioFormulas14_offset_hex 2404
+#define fsioFormulas15_offset 9420
+#define fsioFormulas15_offset_hex 24cc
+#define fsioFormulas16_offset 9620
+#define fsioFormulas16_offset_hex 2594
+#define fsioFormulas1_offset 6620
+#define fsioFormulas1_offset_hex 19dc
+#define fsioFormulas2_offset 6820
+#define fsioFormulas2_offset_hex 1aa4
+#define fsioFormulas3_offset 7020
+#define fsioFormulas3_offset_hex 1b6c
+#define fsioFormulas4_offset 7220
+#define fsioFormulas4_offset_hex 1c34
+#define fsioFormulas5_offset 7420
+#define fsioFormulas5_offset_hex 1cfc
+#define fsioFormulas6_offset 7620
+#define fsioFormulas6_offset_hex 1dc4
+#define fsioFormulas7_offset 7820
+#define fsioFormulas7_offset_hex 1e8c
+#define fsioFormulas8_offset 8020
+#define fsioFormulas8_offset_hex 1f54
+#define fsioFormulas9_offset 8220
+#define fsioFormulas9_offset_hex 201c
 #define fsioFrequency10_offset 850
 #define fsioFrequency10_offset_hex 352
 #define fsioFrequency11_offset 852
@ -906,30 +908,30 @@
 #define fsioOutputPins8_offset_hex 313
 #define fsioOutputPins9_offset 788
 #define fsioOutputPins9_offset_hex 314
-#define fsioTable1_offset 19296
-#define fsioTable1_offset_hex 4b60
-#define fsioTable1LoadBins_offset 19552
-#define fsioTable1LoadBins_offset_hex 4c60
-#define fsioTable1RpmBins_offset 19584
-#define fsioTable1RpmBins_offset_hex 4c80
-#define fsioTable2_offset 19616
-#define fsioTable2_offset_hex 4ca0
-#define fsioTable2LoadBins_offset 19680
-#define fsioTable2LoadBins_offset_hex 4ce0
-#define fsioTable2RpmBins_offset 19712
-#define fsioTable2RpmBins_offset_hex 4d00
-#define fsioTable3_offset 19744
-#define fsioTable3_offset_hex 4d20
-#define fsioTable3LoadBins_offset 19808
-#define fsioTable3LoadBins_offset_hex 4d60
-#define fsioTable3RpmBins_offset 19840
-#define fsioTable3RpmBins_offset_hex 4d80
-#define fsioTable4_offset 19872
-#define fsioTable4_offset_hex 4da0
-#define fsioTable4LoadBins_offset 19936
-#define fsioTable4LoadBins_offset_hex 4de0
-#define fsioTable4RpmBins_offset 19968
-#define fsioTable4RpmBins_offset_hex 4e00
+#define fsioTable1_offset 19244
+#define fsioTable1_offset_hex 4b2c
+#define fsioTable1LoadBins_offset 19500
+#define fsioTable1LoadBins_offset_hex 4c2c
+#define fsioTable1RpmBins_offset 19532
+#define fsioTable1RpmBins_offset_hex 4c4c
+#define fsioTable2_offset 19564
+#define fsioTable2_offset_hex 4c6c
+#define fsioTable2LoadBins_offset 19628
+#define fsioTable2LoadBins_offset_hex 4cac
+#define fsioTable2RpmBins_offset 19660
+#define fsioTable2RpmBins_offset_hex 4ccc
+#define fsioTable3_offset 19692
+#define fsioTable3_offset_hex 4cec
+#define fsioTable3LoadBins_offset 19756
+#define fsioTable3LoadBins_offset_hex 4d2c
+#define fsioTable3RpmBins_offset 19788
+#define fsioTable3RpmBins_offset_hex 4d4c
+#define fsioTable4_offset 19820
+#define fsioTable4_offset_hex 4d6c
+#define fsioTable4LoadBins_offset 19884
+#define fsioTable4LoadBins_offset_hex 4dac
+#define fsioTable4RpmBins_offset 19916
+#define fsioTable4RpmBins_offset_hex 4dcc
 #define FUEL_LOAD_COUNT 16
 #define FUEL_RPM_COUNT 16
 #define fuelAlgorithm_offset 420
@ -968,18 +970,18 @@
 #define fuelLevelFullTankVoltage_offset_hex 2b0
 #define fuelLevelSensor_offset 514
 #define fuelLevelSensor_offset_hex 202
-#define fuelLoadBins_offset 16160
-#define fuelLoadBins_offset_hex 3f20
+#define fuelLoadBins_offset 16108
+#define fuelLoadBins_offset_hex 3eec
 #define fuelPumpPin_offset 658
 #define fuelPumpPin_offset_hex 292
 #define fuelPumpPinMode_offset 659
 #define fuelPumpPinMode_offset_hex 293
 #define fuelRailPressure_offset 1756
 #define fuelRailPressure_offset_hex 6dc
-#define fuelRpmBins_offset 16224
-#define fuelRpmBins_offset_hex 3f60
-#define fuelTable_offset 15136
-#define fuelTable_offset_hex 3b20
+#define fuelRpmBins_offset 16172
+#define fuelRpmBins_offset_hex 3f2c
+#define fuelTable_offset 15084
+#define fuelTable_offset_hex 3aec
 #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time"
 #define GAUGE_NAME_ACCEL_X "Acceleration: X"
 #define GAUGE_NAME_ACCEL_Y "Acceleration: Y"
@ -1248,10 +1250,10 @@
 #define iat_tempC_2_offset_hex 120
 #define iat_tempC_3_offset 292
 #define iat_tempC_3_offset_hex 124
-#define iatFuelCorr_offset 10464
-#define iatFuelCorr_offset_hex 28e0
-#define iatFuelCorrBins_offset 10400
-#define iatFuelCorrBins_offset_hex 28a0
+#define iatFuelCorr_offset 10412
+#define iatFuelCorr_offset_hex 28ac
+#define iatFuelCorrBins_offset 10348
+#define iatFuelCorrBins_offset_hex 286c
 #define IDLE_ADVANCE_CURVE_SIZE 8
 #define idle_offset 600
 #define idle_offset_hex 258
@ -1266,10 +1268,10 @@
 #define idle_stepperStepPin_offset 606
 #define idle_stepperStepPin_offset_hex 25e
 #define IDLE_VE_CURVE_SIZE 8
-#define idleAdvance_offset 6576
-#define idleAdvance_offset_hex 19b0
-#define idleAdvanceBins_offset 6544
-#define idleAdvanceBins_offset_hex 1990
+#define idleAdvance_offset 6524
+#define idleAdvance_offset_hex 197c
+#define idleAdvanceBins_offset 6492
+#define idleAdvanceBins_offset_hex 195c
 #define idleIncrementalPidCic_offset 744
 #define idleIncrementalPidCic_offset_hex 2e8
 #define idleMode_offset 1472
@ -1346,24 +1348,24 @@
 #define idleTimingPidDeadZone_offset_hex f96
 #define idleTimingPidWorkZone_offset 3988
 #define idleTimingPidWorkZone_offset_hex f94
-#define idleVe_offset 6640
-#define idleVe_offset_hex 19f0
-#define idleVeBins_offset 6608
-#define idleVeBins_offset_hex 19d0
+#define idleVe_offset 6588
+#define idleVe_offset_hex 19bc
+#define idleVeBins_offset 6556
+#define idleVeBins_offset_hex 199c
 #define IGN_LOAD_COUNT 16
 #define IGN_RPM_COUNT 16
 #define IGN_TPS_COUNT 16
 #define IGNITION_PIN_COUNT 12
 #define ignitionDwellForCrankingMs_offset 100
 #define ignitionDwellForCrankingMs_offset_hex 64
-#define ignitionIatCorrLoadBins_offset 13856
-#define ignitionIatCorrLoadBins_offset_hex 3620
-#define ignitionIatCorrRpmBins_offset 13920
-#define ignitionIatCorrRpmBins_offset_hex 3660
-#define ignitionIatCorrTable_offset 12832
-#define ignitionIatCorrTable_offset_hex 3220
-#define ignitionLoadBins_offset 17312
-#define ignitionLoadBins_offset_hex 43a0
+#define ignitionIatCorrLoadBins_offset 13804
+#define ignitionIatCorrLoadBins_offset_hex 35ec
+#define ignitionIatCorrRpmBins_offset 13868
+#define ignitionIatCorrRpmBins_offset_hex 362c
+#define ignitionIatCorrTable_offset 12780
+#define ignitionIatCorrTable_offset_hex 31ec
+#define ignitionLoadBins_offset 17260
+#define ignitionLoadBins_offset_hex 436c
 #define ignitionMode_offset 440
 #define ignitionMode_offset_hex 1b8
 #define ignitionOffset_offset 444
@ -1394,10 +1396,10 @@
 #define ignitionPins8_offset_hex 283
 #define ignitionPins9_offset 644
 #define ignitionPins9_offset_hex 284
-#define ignitionRpmBins_offset 17376
-#define ignitionRpmBins_offset_hex 43e0
-#define ignitionTable_offset 16288
-#define ignitionTable_offset_hex 3fa0
+#define ignitionRpmBins_offset 17324
+#define ignitionRpmBins_offset_hex 43ac
+#define ignitionTable_offset 16236
+#define ignitionTable_offset_hex 3f6c
 #define ignitionTpsBins_offset 3800
 #define ignitionTpsBins_offset_hex ed8
 #define ignitionTpsTable_offset 3288
@ -1411,8 +1413,8 @@
 #define INJECTION_PIN_COUNT 12
 #define injectionMode_offset 428
 #define injectionMode_offset_hex 1ac
-#define injectionPhase_offset 13984
-#define injectionPhase_offset_hex 36a0
+#define injectionPhase_offset 13932
+#define injectionPhase_offset_hex 366c
 #define injectionPinMode_offset 648
 #define injectionPinMode_offset_hex 288
 #define injectionPins10_offset 633
@ -1447,10 +1449,10 @@
 #define injector_flow_offset_hex 8
 #define injector_offset 8
 #define injector_offset_hex 8
-#define injPhaseLoadBins_offset 15008
-#define injPhaseLoadBins_offset_hex 3aa0
-#define injPhaseRpmBins_offset 15072
-#define injPhaseRpmBins_offset_hex 3ae0
+#define injPhaseLoadBins_offset 14956
+#define injPhaseLoadBins_offset_hex 3a6c
+#define injPhaseRpmBins_offset 15020
+#define injPhaseRpmBins_offset_hex 3aac
 #define invertPrimaryTriggerSignal_offset 1464
 #define invertPrimaryTriggerSignal_offset_hex 5b8
 #define invertSecondaryTriggerSignal_offset 1464
@ -1619,18 +1621,18 @@
 #define maf_sensor_type_e_enum "v0", "v1", "v2", "v3"
 #define mafAdcChannel_offset 543
 #define mafAdcChannel_offset_hex 21f
-#define mafDecoding_offset 10784
-#define mafDecoding_offset_hex 2a20
-#define mafDecodingBins_offset 11808
-#define mafDecodingBins_offset_hex 2e20
+#define mafDecoding_offset 10732
+#define mafDecoding_offset_hex 29ec
+#define mafDecodingBins_offset 11756
+#define mafDecodingBins_offset_hex 2dec
 #define mafSensorType_offset 948
 #define mafSensorType_offset_hex 3b4
 #define mainRelayPin_offset 706
 #define mainRelayPin_offset_hex 2c2
 #define mainRelayPinMode_offset 752
 #define mainRelayPinMode_offset_hex 2f0
-#define mainUnusedEnd_offset 4496
-#define mainUnusedEnd_offset_hex 1190
+#define mainUnusedEnd_offset 4516
+#define mainUnusedEnd_offset_hex 11a4
 #define malfunctionIndicatorPin_offset 660
 #define malfunctionIndicatorPin_offset_hex 294
 #define malfunctionIndicatorPinMode_offset 661
@ -1721,6 +1723,24 @@
 #define mc33972spiDevice_offset_hex fa8
 #define mc33_hvolt_offset 760
 #define mc33_hvolt_offset_hex 2f8
+#define mc33_i_boost_offset 4496
+#define mc33_i_boost_offset_hex 1190
+#define mc33_i_hold_offset 4500
+#define mc33_i_hold_offset_hex 1194
+#define mc33_i_peak_offset 4498
+#define mc33_i_peak_offset_hex 1192
+#define mc33_t_bypass_offset 4508
+#define mc33_t_bypass_offset_hex 119c
+#define mc33_t_hold_off_offset 4510
+#define mc33_t_hold_off_offset_hex 119e
+#define mc33_t_hold_tot_offset 4512
+#define mc33_t_hold_tot_offset_hex 11a0
+#define mc33_t_max_boost_offset 4502
+#define mc33_t_max_boost_offset_hex 1196
+#define mc33_t_peak_off_offset 4504
+#define mc33_t_peak_off_offset_hex 1198
+#define mc33_t_peak_tot_offset 4506
+#define mc33_t_peak_tot_offset_hex 119a
 #define measureMapOnlyInOneCylinder_offset 744
 #define measureMapOnlyInOneCylinder_offset_hex 2e8
 #define MOCK_AFR_COMMAND "mock_afr_voltage"
@ -1785,12 +1805,12 @@
 #define pauseEtbControl_offset 744
 #define pauseEtbControl_offset_hex 2e8
 #define PEDAL_TO_TPS_SIZE 8
-#define pedalToTpsPedalBins_offset 6464
-#define pedalToTpsPedalBins_offset_hex 1940
-#define pedalToTpsRpmBins_offset 6472
-#define pedalToTpsRpmBins_offset_hex 1948
-#define pedalToTpsTable_offset 6400
-#define pedalToTpsTable_offset_hex 1900
+#define pedalToTpsPedalBins_offset 6412
+#define pedalToTpsPedalBins_offset_hex 190c
+#define pedalToTpsRpmBins_offset 6420
+#define pedalToTpsRpmBins_offset_hex 1914
+#define pedalToTpsTable_offset 6348
+#define pedalToTpsTable_offset_hex 18cc
 #define pidExtraForLowRpm_offset 3156
 #define pidExtraForLowRpm_offset_hex c54
 #define pin_mode_e_enum "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"
@ -2069,12 +2089,12 @@
 #define timing_offset_cylinder8_offset_hex a08
 #define timing_offset_cylinder9_offset 2572
 #define timing_offset_cylinder9_offset_hex a0c
-#define timingAdditive_offset 10072
-#define timingAdditive_offset_hex 2758
+#define timingAdditive_offset 10020
+#define timingAdditive_offset_hex 2724
 #define timingMode_offset 448
 #define timingMode_offset_hex 1c0
-#define timingMultiplier_offset 9872
-#define timingMultiplier_offset_hex 2690
+#define timingMultiplier_offset 9820
+#define timingMultiplier_offset_hex 265c
 #define tle6240_cs_offset 581
 #define tle6240_cs_offset_hex 245
 #define tle6240_csPinMode_offset 582
@ -2097,8 +2117,8 @@
 #define TOOTH_PACKET_COUNT 1000
 #define TOOTH_PACKET_SIZE 2
 #define TOP_DEAD_CENTER_MESSAGE "r"
-#define TOTAL_CONFIG_SIZE 20000
-#define TOTAL_CONFIG_SIZE_hex 4e20
+#define TOTAL_CONFIG_SIZE 19948
+#define TOTAL_CONFIG_SIZE_hex 4dec
 #define tps1_1AdcChannel_offset 512
 #define tps1_1AdcChannel_offset_hex 200
 #define tps1_2AdcChannel_offset 681
@ -2141,12 +2161,12 @@
 #define tpsMax_offset_hex 52
 #define tpsMin_offset 80
 #define tpsMin_offset_hex 50
-#define tpsTpsAccelFromRpmBins_offset 19232
-#define tpsTpsAccelFromRpmBins_offset_hex 4b20
-#define tpsTpsAccelTable_offset 18976
-#define tpsTpsAccelTable_offset_hex 4a20
-#define tpsTpsAccelToRpmBins_offset 19264
-#define tpsTpsAccelToRpmBins_offset_hex 4b40
+#define tpsTpsAccelFromRpmBins_offset 19180
+#define tpsTpsAccelFromRpmBins_offset_hex 4aec
+#define tpsTpsAccelTable_offset 18924
+#define tpsTpsAccelTable_offset_hex 49ec
+#define tpsTpsAccelToRpmBins_offset 19212
+#define tpsTpsAccelToRpmBins_offset_hex 4b0c
 #define trigger_customSkippedToothCount_offset 536
 #define trigger_customSkippedToothCount_offset_hex 218
 #define trigger_customTotalToothCount_offset 532
@ -2291,8 +2311,8 @@
 #define unused1476b20_offset_hex 5c4
 #define unused2432_offset 2432
 #define unused2432_offset_hex 980
-#define unused6312_offset 6312
-#define unused6312_offset_hex 18a8
+#define unused6312_offset 6260
+#define unused6312_offset_hex 1874
 #define unused711_offset 711
 #define unused711_offset_hex 2c7
 #define unused806_offset 806
@ -2473,18 +2493,18 @@
 #define vehicleSpeedCoef_offset_hex 1dc
 #define vehicleSpeedSensorInputPin_offset 968
 #define vehicleSpeedSensorInputPin_offset_hex 3c8
-#define veLoadBins_offset 18464
-#define veLoadBins_offset_hex 4820
+#define veLoadBins_offset 18412
+#define veLoadBins_offset_hex 47ec
 #define verboseCanBaseAddress_offset 756
 #define verboseCanBaseAddress_offset_hex 2f4
 #define verboseTLE8888_offset 744
 #define verboseTLE8888_offset_hex 2e8
 #define verboseTriggerSynchDetails_offset 1476
 #define verboseTriggerSynchDetails_offset_hex 5c4
-#define veRpmBins_offset 18528
-#define veRpmBins_offset_hex 4860
-#define veTable_offset 17440
-#define veTable_offset_hex 4420
+#define veRpmBins_offset 18476
+#define veRpmBins_offset_hex 482c
+#define veTable_offset 17388
+#define veTable_offset_hex 43ec
 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02
 #define vRefAdcChannel_offset 1470
 #define vRefAdcChannel_offset_hex 5be
@ -2495,8 +2515,8 @@
 #define vvtMode_offset_hex 918
 #define vvtOffset_offset 2052
 #define vvtOffset_offset_hex 804
-#define warning_message_offset 6000
-#define warning_message_offset_hex 1770
+#define warning_message_offset 5948
+#define warning_message_offset_hex 173c
 #define warningLedPin_offset 2041
 #define warningLedPin_offset_hex 7f9
 #define warningPeriod_offset 1498
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@ -89,9 +89,9 @@ 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.bat integration\rusefi_config.txt Mon May 18 14:33:35 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue May 19 08:38:18 EDT 2020

-pageSize            = 20000
+pageSize            = 19948
 page = 1
 	engineType					 = bits, S32, 0, [0:7], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
 	engineSnifferRpmThreshold		= scalar, S32,	4,	"RPM", 1, 0, 0,30000, 0
@ -1094,90 +1094,100 @@ 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
-;no TS info - skipping mainUnusedEnd offset 4496
-	warning_message				 = string, ASCII, 6000, 120
-	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
-	afterstartHoldTime				= array, F32,	6152,	[8],	"Seconds", 1, 0, 0, 100, 1
-	afterstartEnrich				= array, F32,	6184,	[8],	"%", 1, 0, 0, 600, 1
-	afterstartDecayTime				= array, F32,	6216,	[8],	"Seconds", 1, 0, 0, 100, 1
-	boostTableOpenLoop			 = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
-;no TS info - skipping unused6312 offset 6312
-	boostRpmBins					= array, U08,	6320,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	boostTableClosedLoop		 = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
-	boostTpsBins					= array, U08,	6392,	[8],	"%", 2, 0.0, 0, 100.0, 2
-	pedalToTpsTable				 = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
-	pedalToTpsPedalBins				= array, U08,	6464,	[8],	"%", 1, 0, 0.0, 120.0, 0
-	pedalToTpsRpmBins				= array, U08,	6472,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	cltCrankingCorrBins				= array, F32,	6480,	[8],	"C", 1, 0, -100.0, 250.0, 2
-	cltCrankingCorr					= array, F32,	6512,	[8],	"%", 1, 0, 0.0, 500.0, 2
-	idleAdvanceBins					= array, F32,	6544,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleAdvance						= array, F32,	6576,	[8],	"deg", 1, 0, -20, 90, 2
-	idleVeBins						= array, F32,	6608,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleVe							= array, F32,	6640,	[8],	,"%", 1, 0, 0, 999.0, 2
-	fsioFormulas1				 = string, ASCII, 6672, 200
-	fsioFormulas2				 = string, ASCII, 6872, 200
-	fsioFormulas3				 = string, ASCII, 7072, 200
-	fsioFormulas4				 = string, ASCII, 7272, 200
-	fsioFormulas5				 = string, ASCII, 7472, 200
-	fsioFormulas6				 = string, ASCII, 7672, 200
-	fsioFormulas7				 = string, ASCII, 7872, 200
-	fsioFormulas8				 = string, ASCII, 8072, 200
-	fsioFormulas9				 = string, ASCII, 8272, 200
-	fsioFormulas10				 = string, ASCII, 8472, 200
-	fsioFormulas11				 = string, ASCII, 8672, 200
-	fsioFormulas12				 = string, ASCII, 8872, 200
-	fsioFormulas13				 = string, ASCII, 9072, 200
-	fsioFormulas14				 = string, ASCII, 9272, 200
-	fsioFormulas15				 = string, ASCII, 9472, 200
-	fsioFormulas16				 = string, ASCII, 9672, 200
-	timingMultiplier			 = string, ASCII, 9872, 200
-	timingAdditive				 = string, ASCII, 10072, 200
-	cltFuelCorrBins					= array, F32,	10272,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltFuelCorr						= array, F32,	10336,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	iatFuelCorrBins					= array, F32,	10400,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	iatFuelCorr						= array, F32,	10464,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingFuelCoef				= array, F32,	10528,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
-	crankingFuelBins				= array, F32,	10560,	[8],	"C", 1, 0, -80.0, 170.0, 2
-	crankingCycleCoef				= array, F32,	10592,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingCycleBins				= array, F32,	10624,	[8],	"counter", 1, 0, -80.0, 170.0, 0
-	cltIdleCorrBins					= array, F32,	10656,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltIdleCorr						= array, F32,	10720,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
-	mafDecoding						= array, F32,	10784,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
-	mafDecodingBins					= array, F32,	11808,	[256],	 "V", 1, 0, -5.0, 150.0, 2
-	ignitionIatCorrTable		 = array, F32, 12832, [16x16],"deg", 1, 0, -720, 720, 2
-	ignitionIatCorrLoadBins			= array, F32,	13856,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
-	ignitionIatCorrRpmBins			= array, F32,	13920,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	injectionPhase				 = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2
-	injPhaseLoadBins				= array, F32,	15008,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	injPhaseRpmBins					= array, F32,	15072,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	fuelTable					 = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2
-	fuelLoadBins					= array, F32,	16160,	[16],	"V", 1, 0, 0.0, 500.0, 2
-	fuelRpmBins						= array, F32,	16224,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
-	ignitionTable				 = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2
-	ignitionLoadBins				= array, F32,	17312,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	ignitionRpmBins					= array, F32,	17376,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	veTable						 = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2
-	veLoadBins						= array, F32,	18464,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
-	veRpmBins						= array, F32,	18528,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	afrTable					 = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
-	afrLoadBins						= array, F32,	18848,	[16],	"", 1, 0.0, 0, 500.0, 2
-	afrRpmBins						= array, F32,	18912,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	tpsTpsAccelTable			 = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelFromRpmBins			= array, F32,	19232,	[8],	"from", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelToRpmBins			= array, F32,	19264,	[8],	"to", 1, 0, 0.0, 25500.0, 2
-	fsioTable1					 = array, F32, 19296, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	fsioTable1LoadBins				= array, F32,	19552,	[8],	"L", 1, 0, 0.0, 30000.0, 2
-	fsioTable1RpmBins				= array, F32,	19584,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable2					 = array, U08, 19616, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable2LoadBins				= array, F32,	19680,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable2RpmBins				= array, F32,	19712,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable3					 = array, U08, 19744, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable3LoadBins				= array, F32,	19808,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable3RpmBins				= array, F32,	19840,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable4					 = array, U08, 19872, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable4LoadBins				= array, F32,	19936,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable4RpmBins				= array, F32,	19968,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-; total TS size = 20000
+;no TS info - skipping mc33_i_boost offset 4496
+;no TS info - skipping mc33_i_peak offset 4498
+;no TS info - skipping mc33_i_hold offset 4500
+;no TS info - skipping mc33_t_max_boost offset 4502
+;no TS info - skipping mc33_t_peak_off offset 4504
+;no TS info - skipping mc33_t_peak_tot offset 4506
+;no TS info - skipping mc33_t_bypass offset 4508
+;no TS info - skipping mc33_t_hold_off offset 4510
+;no TS info - skipping mc33_t_hold_tot offset 4512
+;no TS info - skipping alignmentFill_at_4514 offset 4514
+;no TS info - skipping mainUnusedEnd offset 4516
+	warning_message				 = string, ASCII, 5948, 120
+	afterstartCoolantBins			= array, F32,	6068,	[8],	"C", 1, 0, -100.0, 250.0, 0
+	afterstartHoldTime				= array, F32,	6100,	[8],	"Seconds", 1, 0, 0, 100, 1
+	afterstartEnrich				= array, F32,	6132,	[8],	"%", 1, 0, 0, 600, 1
+	afterstartDecayTime				= array, F32,	6164,	[8],	"Seconds", 1, 0, 0, 100, 1
+	boostTableOpenLoop			 = array, U08, 6196, [8x8],"", 2, 0 , 0, 3000, 0
+;no TS info - skipping unused6312 offset 6260
+	boostRpmBins					= array, U08,	6268,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	boostTableClosedLoop		 = array, U08, 6276, [8x8],"", 2, 0 , 0, 3000, 0
+	boostTpsBins					= array, U08,	6340,	[8],	"%", 2, 0.0, 0, 100.0, 2
+	pedalToTpsTable				 = array, U08, 6348, [8x8],"%", 1, 0, 0, 100, 0
+	pedalToTpsPedalBins				= array, U08,	6412,	[8],	"%", 1, 0, 0.0, 120.0, 0
+	pedalToTpsRpmBins				= array, U08,	6420,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	cltCrankingCorrBins				= array, F32,	6428,	[8],	"C", 1, 0, -100.0, 250.0, 2
+	cltCrankingCorr					= array, F32,	6460,	[8],	"%", 1, 0, 0.0, 500.0, 2
+	idleAdvanceBins					= array, F32,	6492,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleAdvance						= array, F32,	6524,	[8],	"deg", 1, 0, -20, 90, 2
+	idleVeBins						= array, F32,	6556,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleVe							= array, F32,	6588,	[8],	,"%", 1, 0, 0, 999.0, 2
+	fsioFormulas1				 = string, ASCII, 6620, 200
+	fsioFormulas2				 = string, ASCII, 6820, 200
+	fsioFormulas3				 = string, ASCII, 7020, 200
+	fsioFormulas4				 = string, ASCII, 7220, 200
+	fsioFormulas5				 = string, ASCII, 7420, 200
+	fsioFormulas6				 = string, ASCII, 7620, 200
+	fsioFormulas7				 = string, ASCII, 7820, 200
+	fsioFormulas8				 = string, ASCII, 8020, 200
+	fsioFormulas9				 = string, ASCII, 8220, 200
+	fsioFormulas10				 = string, ASCII, 8420, 200
+	fsioFormulas11				 = string, ASCII, 8620, 200
+	fsioFormulas12				 = string, ASCII, 8820, 200
+	fsioFormulas13				 = string, ASCII, 9020, 200
+	fsioFormulas14				 = string, ASCII, 9220, 200
+	fsioFormulas15				 = string, ASCII, 9420, 200
+	fsioFormulas16				 = string, ASCII, 9620, 200
+	timingMultiplier			 = string, ASCII, 9820, 200
+	timingAdditive				 = string, ASCII, 10020, 200
+	cltFuelCorrBins					= array, F32,	10220,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltFuelCorr						= array, F32,	10284,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	iatFuelCorrBins					= array, F32,	10348,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	iatFuelCorr						= array, F32,	10412,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingFuelCoef				= array, F32,	10476,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
+	crankingFuelBins				= array, F32,	10508,	[8],	"C", 1, 0, -80.0, 170.0, 2
+	crankingCycleCoef				= array, F32,	10540,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingCycleBins				= array, F32,	10572,	[8],	"counter", 1, 0, -80.0, 170.0, 0
+	cltIdleCorrBins					= array, F32,	10604,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltIdleCorr						= array, F32,	10668,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
+	mafDecoding						= array, F32,	10732,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
+	mafDecodingBins					= array, F32,	11756,	[256],	 "V", 1, 0, -5.0, 150.0, 2
+	ignitionIatCorrTable		 = array, F32, 12780, [16x16],"deg", 1, 0, -720, 720, 2
+	ignitionIatCorrLoadBins			= array, F32,	13804,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
+	ignitionIatCorrRpmBins			= array, F32,	13868,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	injectionPhase				 = array, F32, 13932, [16x16],"deg", 1, 0, -720, 720, 2
+	injPhaseLoadBins				= array, F32,	14956,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	injPhaseRpmBins					= array, F32,	15020,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	fuelTable					 = array, F32, 15084, [16x16],"ms", 1, 0, 0.0, 500.0, 2
+	fuelLoadBins					= array, F32,	16108,	[16],	"V", 1, 0, 0.0, 500.0, 2
+	fuelRpmBins						= array, F32,	16172,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
+	ignitionTable				 = array, F32, 16236, [16x16],"deg", 1, 0, -20, 90, 2
+	ignitionLoadBins				= array, F32,	17260,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	ignitionRpmBins					= array, F32,	17324,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	veTable						 = array, F32, 17388, [16x16],"%", 1, 0, 0, 999.0, 2
+	veLoadBins						= array, F32,	18412,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
+	veRpmBins						= array, F32,	18476,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	afrTable					 = array, U08, 18540, [16x16],"deg", 0.1, 0, 0, 25.0, 1
+	afrLoadBins						= array, F32,	18796,	[16],	"", 1, 0.0, 0, 500.0, 2
+	afrRpmBins						= array, F32,	18860,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	tpsTpsAccelTable			 = array, F32, 18924, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelFromRpmBins			= array, F32,	19180,	[8],	"from", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelToRpmBins			= array, F32,	19212,	[8],	"to", 1, 0, 0.0, 25500.0, 2
+	fsioTable1					 = array, F32, 19244, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	fsioTable1LoadBins				= array, F32,	19500,	[8],	"L", 1, 0, 0.0, 30000.0, 2
+	fsioTable1RpmBins				= array, F32,	19532,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable2					 = array, U08, 19564, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable2LoadBins				= array, F32,	19628,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable2RpmBins				= array, F32,	19660,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable3					 = array, U08, 19692, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable3LoadBins				= array, F32,	19756,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable3RpmBins				= array, F32,	19788,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable4					 = array, U08, 19820, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable4LoadBins				= array, F32,	19884,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable4RpmBins				= array, F32,	19916,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+; total TS size = 19948
 [SettingContextHelp]
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
--- a/firmware/tunerstudio/rusefi_frankenso.ini
+++ b/firmware/tunerstudio/rusefi_frankenso.ini
@ -89,9 +89,9 @@ 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.bat integration\rusefi_config.txt Mon May 18 14:34:15 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue May 19 08:38:21 EDT 2020

-pageSize            = 20000
+pageSize            = 19948
 page = 1
 	engineType					 = bits, S32, 0, [0:7], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
 	engineSnifferRpmThreshold		= scalar, S32,	4,	"RPM", 1, 0, 0,30000, 0
@ -1094,90 +1094,100 @@ 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
-;no TS info - skipping mainUnusedEnd offset 4496
-	warning_message				 = string, ASCII, 6000, 120
-	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
-	afterstartHoldTime				= array, F32,	6152,	[8],	"Seconds", 1, 0, 0, 100, 1
-	afterstartEnrich				= array, F32,	6184,	[8],	"%", 1, 0, 0, 600, 1
-	afterstartDecayTime				= array, F32,	6216,	[8],	"Seconds", 1, 0, 0, 100, 1
-	boostTableOpenLoop			 = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
-;no TS info - skipping unused6312 offset 6312
-	boostRpmBins					= array, U08,	6320,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	boostTableClosedLoop		 = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
-	boostTpsBins					= array, U08,	6392,	[8],	"%", 2, 0.0, 0, 100.0, 2
-	pedalToTpsTable				 = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
-	pedalToTpsPedalBins				= array, U08,	6464,	[8],	"%", 1, 0, 0.0, 120.0, 0
-	pedalToTpsRpmBins				= array, U08,	6472,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	cltCrankingCorrBins				= array, F32,	6480,	[8],	"C", 1, 0, -100.0, 250.0, 2
-	cltCrankingCorr					= array, F32,	6512,	[8],	"%", 1, 0, 0.0, 500.0, 2
-	idleAdvanceBins					= array, F32,	6544,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleAdvance						= array, F32,	6576,	[8],	"deg", 1, 0, -20, 90, 2
-	idleVeBins						= array, F32,	6608,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleVe							= array, F32,	6640,	[8],	,"%", 1, 0, 0, 999.0, 2
-	fsioFormulas1				 = string, ASCII, 6672, 200
-	fsioFormulas2				 = string, ASCII, 6872, 200
-	fsioFormulas3				 = string, ASCII, 7072, 200
-	fsioFormulas4				 = string, ASCII, 7272, 200
-	fsioFormulas5				 = string, ASCII, 7472, 200
-	fsioFormulas6				 = string, ASCII, 7672, 200
-	fsioFormulas7				 = string, ASCII, 7872, 200
-	fsioFormulas8				 = string, ASCII, 8072, 200
-	fsioFormulas9				 = string, ASCII, 8272, 200
-	fsioFormulas10				 = string, ASCII, 8472, 200
-	fsioFormulas11				 = string, ASCII, 8672, 200
-	fsioFormulas12				 = string, ASCII, 8872, 200
-	fsioFormulas13				 = string, ASCII, 9072, 200
-	fsioFormulas14				 = string, ASCII, 9272, 200
-	fsioFormulas15				 = string, ASCII, 9472, 200
-	fsioFormulas16				 = string, ASCII, 9672, 200
-	timingMultiplier			 = string, ASCII, 9872, 200
-	timingAdditive				 = string, ASCII, 10072, 200
-	cltFuelCorrBins					= array, F32,	10272,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltFuelCorr						= array, F32,	10336,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	iatFuelCorrBins					= array, F32,	10400,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	iatFuelCorr						= array, F32,	10464,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingFuelCoef				= array, F32,	10528,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
-	crankingFuelBins				= array, F32,	10560,	[8],	"C", 1, 0, -80.0, 170.0, 2
-	crankingCycleCoef				= array, F32,	10592,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingCycleBins				= array, F32,	10624,	[8],	"counter", 1, 0, -80.0, 170.0, 0
-	cltIdleCorrBins					= array, F32,	10656,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltIdleCorr						= array, F32,	10720,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
-	mafDecoding						= array, F32,	10784,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
-	mafDecodingBins					= array, F32,	11808,	[256],	 "V", 1, 0, -5.0, 150.0, 2
-	ignitionIatCorrTable		 = array, F32, 12832, [16x16],"deg", 1, 0, -720, 720, 2
-	ignitionIatCorrLoadBins			= array, F32,	13856,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
-	ignitionIatCorrRpmBins			= array, F32,	13920,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	injectionPhase				 = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2
-	injPhaseLoadBins				= array, F32,	15008,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	injPhaseRpmBins					= array, F32,	15072,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	fuelTable					 = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2
-	fuelLoadBins					= array, F32,	16160,	[16],	"V", 1, 0, 0.0, 500.0, 2
-	fuelRpmBins						= array, F32,	16224,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
-	ignitionTable				 = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2
-	ignitionLoadBins				= array, F32,	17312,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	ignitionRpmBins					= array, F32,	17376,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	veTable						 = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2
-	veLoadBins						= array, F32,	18464,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
-	veRpmBins						= array, F32,	18528,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	afrTable					 = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
-	afrLoadBins						= array, F32,	18848,	[16],	"", 1, 0.0, 0, 500.0, 2
-	afrRpmBins						= array, F32,	18912,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	tpsTpsAccelTable			 = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelFromRpmBins			= array, F32,	19232,	[8],	"from", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelToRpmBins			= array, F32,	19264,	[8],	"to", 1, 0, 0.0, 25500.0, 2
-	fsioTable1					 = array, F32, 19296, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	fsioTable1LoadBins				= array, F32,	19552,	[8],	"L", 1, 0, 0.0, 30000.0, 2
-	fsioTable1RpmBins				= array, F32,	19584,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable2					 = array, U08, 19616, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable2LoadBins				= array, F32,	19680,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable2RpmBins				= array, F32,	19712,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable3					 = array, U08, 19744, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable3LoadBins				= array, F32,	19808,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable3RpmBins				= array, F32,	19840,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable4					 = array, U08, 19872, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable4LoadBins				= array, F32,	19936,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable4RpmBins				= array, F32,	19968,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-; total TS size = 20000
+;no TS info - skipping mc33_i_boost offset 4496
+;no TS info - skipping mc33_i_peak offset 4498
+;no TS info - skipping mc33_i_hold offset 4500
+;no TS info - skipping mc33_t_max_boost offset 4502
+;no TS info - skipping mc33_t_peak_off offset 4504
+;no TS info - skipping mc33_t_peak_tot offset 4506
+;no TS info - skipping mc33_t_bypass offset 4508
+;no TS info - skipping mc33_t_hold_off offset 4510
+;no TS info - skipping mc33_t_hold_tot offset 4512
+;no TS info - skipping alignmentFill_at_4514 offset 4514
+;no TS info - skipping mainUnusedEnd offset 4516
+	warning_message				 = string, ASCII, 5948, 120
+	afterstartCoolantBins			= array, F32,	6068,	[8],	"C", 1, 0, -100.0, 250.0, 0
+	afterstartHoldTime				= array, F32,	6100,	[8],	"Seconds", 1, 0, 0, 100, 1
+	afterstartEnrich				= array, F32,	6132,	[8],	"%", 1, 0, 0, 600, 1
+	afterstartDecayTime				= array, F32,	6164,	[8],	"Seconds", 1, 0, 0, 100, 1
+	boostTableOpenLoop			 = array, U08, 6196, [8x8],"", 2, 0 , 0, 3000, 0
+;no TS info - skipping unused6312 offset 6260
+	boostRpmBins					= array, U08,	6268,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	boostTableClosedLoop		 = array, U08, 6276, [8x8],"", 2, 0 , 0, 3000, 0
+	boostTpsBins					= array, U08,	6340,	[8],	"%", 2, 0.0, 0, 100.0, 2
+	pedalToTpsTable				 = array, U08, 6348, [8x8],"%", 1, 0, 0, 100, 0
+	pedalToTpsPedalBins				= array, U08,	6412,	[8],	"%", 1, 0, 0.0, 120.0, 0
+	pedalToTpsRpmBins				= array, U08,	6420,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	cltCrankingCorrBins				= array, F32,	6428,	[8],	"C", 1, 0, -100.0, 250.0, 2
+	cltCrankingCorr					= array, F32,	6460,	[8],	"%", 1, 0, 0.0, 500.0, 2
+	idleAdvanceBins					= array, F32,	6492,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleAdvance						= array, F32,	6524,	[8],	"deg", 1, 0, -20, 90, 2
+	idleVeBins						= array, F32,	6556,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleVe							= array, F32,	6588,	[8],	,"%", 1, 0, 0, 999.0, 2
+	fsioFormulas1				 = string, ASCII, 6620, 200
+	fsioFormulas2				 = string, ASCII, 6820, 200
+	fsioFormulas3				 = string, ASCII, 7020, 200
+	fsioFormulas4				 = string, ASCII, 7220, 200
+	fsioFormulas5				 = string, ASCII, 7420, 200
+	fsioFormulas6				 = string, ASCII, 7620, 200
+	fsioFormulas7				 = string, ASCII, 7820, 200
+	fsioFormulas8				 = string, ASCII, 8020, 200
+	fsioFormulas9				 = string, ASCII, 8220, 200
+	fsioFormulas10				 = string, ASCII, 8420, 200
+	fsioFormulas11				 = string, ASCII, 8620, 200
+	fsioFormulas12				 = string, ASCII, 8820, 200
+	fsioFormulas13				 = string, ASCII, 9020, 200
+	fsioFormulas14				 = string, ASCII, 9220, 200
+	fsioFormulas15				 = string, ASCII, 9420, 200
+	fsioFormulas16				 = string, ASCII, 9620, 200
+	timingMultiplier			 = string, ASCII, 9820, 200
+	timingAdditive				 = string, ASCII, 10020, 200
+	cltFuelCorrBins					= array, F32,	10220,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltFuelCorr						= array, F32,	10284,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	iatFuelCorrBins					= array, F32,	10348,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	iatFuelCorr						= array, F32,	10412,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingFuelCoef				= array, F32,	10476,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
+	crankingFuelBins				= array, F32,	10508,	[8],	"C", 1, 0, -80.0, 170.0, 2
+	crankingCycleCoef				= array, F32,	10540,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingCycleBins				= array, F32,	10572,	[8],	"counter", 1, 0, -80.0, 170.0, 0
+	cltIdleCorrBins					= array, F32,	10604,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltIdleCorr						= array, F32,	10668,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
+	mafDecoding						= array, F32,	10732,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
+	mafDecodingBins					= array, F32,	11756,	[256],	 "V", 1, 0, -5.0, 150.0, 2
+	ignitionIatCorrTable		 = array, F32, 12780, [16x16],"deg", 1, 0, -720, 720, 2
+	ignitionIatCorrLoadBins			= array, F32,	13804,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
+	ignitionIatCorrRpmBins			= array, F32,	13868,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	injectionPhase				 = array, F32, 13932, [16x16],"deg", 1, 0, -720, 720, 2
+	injPhaseLoadBins				= array, F32,	14956,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	injPhaseRpmBins					= array, F32,	15020,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	fuelTable					 = array, F32, 15084, [16x16],"ms", 1, 0, 0.0, 500.0, 2
+	fuelLoadBins					= array, F32,	16108,	[16],	"V", 1, 0, 0.0, 500.0, 2
+	fuelRpmBins						= array, F32,	16172,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
+	ignitionTable				 = array, F32, 16236, [16x16],"deg", 1, 0, -20, 90, 2
+	ignitionLoadBins				= array, F32,	17260,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	ignitionRpmBins					= array, F32,	17324,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	veTable						 = array, F32, 17388, [16x16],"%", 1, 0, 0, 999.0, 2
+	veLoadBins						= array, F32,	18412,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
+	veRpmBins						= array, F32,	18476,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	afrTable					 = array, U08, 18540, [16x16],"deg", 0.1, 0, 0, 25.0, 1
+	afrLoadBins						= array, F32,	18796,	[16],	"", 1, 0.0, 0, 500.0, 2
+	afrRpmBins						= array, F32,	18860,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	tpsTpsAccelTable			 = array, F32, 18924, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelFromRpmBins			= array, F32,	19180,	[8],	"from", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelToRpmBins			= array, F32,	19212,	[8],	"to", 1, 0, 0.0, 25500.0, 2
+	fsioTable1					 = array, F32, 19244, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	fsioTable1LoadBins				= array, F32,	19500,	[8],	"L", 1, 0, 0.0, 30000.0, 2
+	fsioTable1RpmBins				= array, F32,	19532,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable2					 = array, U08, 19564, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable2LoadBins				= array, F32,	19628,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable2RpmBins				= array, F32,	19660,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable3					 = array, U08, 19692, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable3LoadBins				= array, F32,	19756,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable3RpmBins				= array, F32,	19788,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable4					 = array, U08, 19820, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable4LoadBins				= array, F32,	19884,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable4RpmBins				= array, F32,	19916,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+; total TS size = 19948
 [SettingContextHelp]
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
--- a/firmware/tunerstudio/rusefi_kinetis.ini
+++ b/firmware/tunerstudio/rusefi_kinetis.ini
@ -89,9 +89,9 @@ 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 kineris_gen_config.bat integration/rusefi_config.txt Mon May 18 01:22:44 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Tue May 19 08:38:26 EDT 2020

-pageSize            = 20000
+pageSize            = 19948
 page = 1
 	engineType					 = bits, S32, 0, [0:7], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
 	engineSnifferRpmThreshold		= scalar, S32,	4,	"RPM", 1, 0, 0,30000, 0
@ -1094,90 +1094,100 @@ 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
-;no TS info - skipping mainUnusedEnd offset 4496
-	warning_message				 = string, ASCII, 6000, 120
-	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
-	afterstartHoldTime				= array, F32,	6152,	[8],	"Seconds", 1, 0, 0, 100, 1
-	afterstartEnrich				= array, F32,	6184,	[8],	"%", 1, 0, 0, 600, 1
-	afterstartDecayTime				= array, F32,	6216,	[8],	"Seconds", 1, 0, 0, 100, 1
-	boostTableOpenLoop			 = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
-;no TS info - skipping unused6312 offset 6312
-	boostRpmBins					= array, U08,	6320,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	boostTableClosedLoop		 = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
-	boostTpsBins					= array, U08,	6392,	[8],	"%", 2, 0.0, 0, 100.0, 2
-	pedalToTpsTable				 = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
-	pedalToTpsPedalBins				= array, U08,	6464,	[8],	"%", 1, 0, 0.0, 120.0, 0
-	pedalToTpsRpmBins				= array, U08,	6472,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	cltCrankingCorrBins				= array, F32,	6480,	[8],	"C", 1, 0, -100.0, 250.0, 2
-	cltCrankingCorr					= array, F32,	6512,	[8],	"%", 1, 0, 0.0, 500.0, 2
-	idleAdvanceBins					= array, F32,	6544,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleAdvance						= array, F32,	6576,	[8],	"deg", 1, 0, -20, 90, 2
-	idleVeBins						= array, F32,	6608,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleVe							= array, F32,	6640,	[8],	,"%", 1, 0, 0, 999.0, 2
-	fsioFormulas1				 = string, ASCII, 6672, 200
-	fsioFormulas2				 = string, ASCII, 6872, 200
-	fsioFormulas3				 = string, ASCII, 7072, 200
-	fsioFormulas4				 = string, ASCII, 7272, 200
-	fsioFormulas5				 = string, ASCII, 7472, 200
-	fsioFormulas6				 = string, ASCII, 7672, 200
-	fsioFormulas7				 = string, ASCII, 7872, 200
-	fsioFormulas8				 = string, ASCII, 8072, 200
-	fsioFormulas9				 = string, ASCII, 8272, 200
-	fsioFormulas10				 = string, ASCII, 8472, 200
-	fsioFormulas11				 = string, ASCII, 8672, 200
-	fsioFormulas12				 = string, ASCII, 8872, 200
-	fsioFormulas13				 = string, ASCII, 9072, 200
-	fsioFormulas14				 = string, ASCII, 9272, 200
-	fsioFormulas15				 = string, ASCII, 9472, 200
-	fsioFormulas16				 = string, ASCII, 9672, 200
-	timingMultiplier			 = string, ASCII, 9872, 200
-	timingAdditive				 = string, ASCII, 10072, 200
-	cltFuelCorrBins					= array, F32,	10272,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltFuelCorr						= array, F32,	10336,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	iatFuelCorrBins					= array, F32,	10400,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	iatFuelCorr						= array, F32,	10464,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingFuelCoef				= array, F32,	10528,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
-	crankingFuelBins				= array, F32,	10560,	[8],	"C", 1, 0, -80.0, 170.0, 2
-	crankingCycleCoef				= array, F32,	10592,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingCycleBins				= array, F32,	10624,	[8],	"counter", 1, 0, -80.0, 170.0, 0
-	cltIdleCorrBins					= array, F32,	10656,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltIdleCorr						= array, F32,	10720,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
-	mafDecoding						= array, F32,	10784,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
-	mafDecodingBins					= array, F32,	11808,	[256],	 "V", 1, 0, -5.0, 150.0, 2
-	ignitionIatCorrTable		 = array, F32, 12832, [16x16],"deg", 1, 0, -720, 720, 2
-	ignitionIatCorrLoadBins			= array, F32,	13856,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
-	ignitionIatCorrRpmBins			= array, F32,	13920,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	injectionPhase				 = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2
-	injPhaseLoadBins				= array, F32,	15008,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	injPhaseRpmBins					= array, F32,	15072,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	fuelTable					 = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2
-	fuelLoadBins					= array, F32,	16160,	[16],	"V", 1, 0, 0.0, 500.0, 2
-	fuelRpmBins						= array, F32,	16224,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
-	ignitionTable				 = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2
-	ignitionLoadBins				= array, F32,	17312,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	ignitionRpmBins					= array, F32,	17376,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	veTable						 = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2
-	veLoadBins						= array, F32,	18464,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
-	veRpmBins						= array, F32,	18528,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	afrTable					 = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
-	afrLoadBins						= array, F32,	18848,	[16],	"", 1, 0.0, 0, 500.0, 2
-	afrRpmBins						= array, F32,	18912,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	tpsTpsAccelTable			 = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelFromRpmBins			= array, F32,	19232,	[8],	"from", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelToRpmBins			= array, F32,	19264,	[8],	"to", 1, 0, 0.0, 25500.0, 2
-	fsioTable1					 = array, F32, 19296, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	fsioTable1LoadBins				= array, F32,	19552,	[8],	"L", 1, 0, 0.0, 30000.0, 2
-	fsioTable1RpmBins				= array, F32,	19584,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable2					 = array, U08, 19616, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable2LoadBins				= array, F32,	19680,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable2RpmBins				= array, F32,	19712,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable3					 = array, U08, 19744, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable3LoadBins				= array, F32,	19808,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable3RpmBins				= array, F32,	19840,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable4					 = array, U08, 19872, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable4LoadBins				= array, F32,	19936,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable4RpmBins				= array, F32,	19968,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-; total TS size = 20000
+;no TS info - skipping mc33_i_boost offset 4496
+;no TS info - skipping mc33_i_peak offset 4498
+;no TS info - skipping mc33_i_hold offset 4500
+;no TS info - skipping mc33_t_max_boost offset 4502
+;no TS info - skipping mc33_t_peak_off offset 4504
+;no TS info - skipping mc33_t_peak_tot offset 4506
+;no TS info - skipping mc33_t_bypass offset 4508
+;no TS info - skipping mc33_t_hold_off offset 4510
+;no TS info - skipping mc33_t_hold_tot offset 4512
+;no TS info - skipping alignmentFill_at_4514 offset 4514
+;no TS info - skipping mainUnusedEnd offset 4516
+	warning_message				 = string, ASCII, 5948, 120
+	afterstartCoolantBins			= array, F32,	6068,	[8],	"C", 1, 0, -100.0, 250.0, 0
+	afterstartHoldTime				= array, F32,	6100,	[8],	"Seconds", 1, 0, 0, 100, 1
+	afterstartEnrich				= array, F32,	6132,	[8],	"%", 1, 0, 0, 600, 1
+	afterstartDecayTime				= array, F32,	6164,	[8],	"Seconds", 1, 0, 0, 100, 1
+	boostTableOpenLoop			 = array, U08, 6196, [8x8],"", 2, 0 , 0, 3000, 0
+;no TS info - skipping unused6312 offset 6260
+	boostRpmBins					= array, U08,	6268,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	boostTableClosedLoop		 = array, U08, 6276, [8x8],"", 2, 0 , 0, 3000, 0
+	boostTpsBins					= array, U08,	6340,	[8],	"%", 2, 0.0, 0, 100.0, 2
+	pedalToTpsTable				 = array, U08, 6348, [8x8],"%", 1, 0, 0, 100, 0
+	pedalToTpsPedalBins				= array, U08,	6412,	[8],	"%", 1, 0, 0.0, 120.0, 0
+	pedalToTpsRpmBins				= array, U08,	6420,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	cltCrankingCorrBins				= array, F32,	6428,	[8],	"C", 1, 0, -100.0, 250.0, 2
+	cltCrankingCorr					= array, F32,	6460,	[8],	"%", 1, 0, 0.0, 500.0, 2
+	idleAdvanceBins					= array, F32,	6492,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleAdvance						= array, F32,	6524,	[8],	"deg", 1, 0, -20, 90, 2
+	idleVeBins						= array, F32,	6556,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleVe							= array, F32,	6588,	[8],	,"%", 1, 0, 0, 999.0, 2
+	fsioFormulas1				 = string, ASCII, 6620, 200
+	fsioFormulas2				 = string, ASCII, 6820, 200
+	fsioFormulas3				 = string, ASCII, 7020, 200
+	fsioFormulas4				 = string, ASCII, 7220, 200
+	fsioFormulas5				 = string, ASCII, 7420, 200
+	fsioFormulas6				 = string, ASCII, 7620, 200
+	fsioFormulas7				 = string, ASCII, 7820, 200
+	fsioFormulas8				 = string, ASCII, 8020, 200
+	fsioFormulas9				 = string, ASCII, 8220, 200
+	fsioFormulas10				 = string, ASCII, 8420, 200
+	fsioFormulas11				 = string, ASCII, 8620, 200
+	fsioFormulas12				 = string, ASCII, 8820, 200
+	fsioFormulas13				 = string, ASCII, 9020, 200
+	fsioFormulas14				 = string, ASCII, 9220, 200
+	fsioFormulas15				 = string, ASCII, 9420, 200
+	fsioFormulas16				 = string, ASCII, 9620, 200
+	timingMultiplier			 = string, ASCII, 9820, 200
+	timingAdditive				 = string, ASCII, 10020, 200
+	cltFuelCorrBins					= array, F32,	10220,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltFuelCorr						= array, F32,	10284,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	iatFuelCorrBins					= array, F32,	10348,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	iatFuelCorr						= array, F32,	10412,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingFuelCoef				= array, F32,	10476,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
+	crankingFuelBins				= array, F32,	10508,	[8],	"C", 1, 0, -80.0, 170.0, 2
+	crankingCycleCoef				= array, F32,	10540,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingCycleBins				= array, F32,	10572,	[8],	"counter", 1, 0, -80.0, 170.0, 0
+	cltIdleCorrBins					= array, F32,	10604,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltIdleCorr						= array, F32,	10668,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
+	mafDecoding						= array, F32,	10732,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
+	mafDecodingBins					= array, F32,	11756,	[256],	 "V", 1, 0, -5.0, 150.0, 2
+	ignitionIatCorrTable		 = array, F32, 12780, [16x16],"deg", 1, 0, -720, 720, 2
+	ignitionIatCorrLoadBins			= array, F32,	13804,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
+	ignitionIatCorrRpmBins			= array, F32,	13868,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	injectionPhase				 = array, F32, 13932, [16x16],"deg", 1, 0, -720, 720, 2
+	injPhaseLoadBins				= array, F32,	14956,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	injPhaseRpmBins					= array, F32,	15020,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	fuelTable					 = array, F32, 15084, [16x16],"ms", 1, 0, 0.0, 500.0, 2
+	fuelLoadBins					= array, F32,	16108,	[16],	"V", 1, 0, 0.0, 500.0, 2
+	fuelRpmBins						= array, F32,	16172,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
+	ignitionTable				 = array, F32, 16236, [16x16],"deg", 1, 0, -20, 90, 2
+	ignitionLoadBins				= array, F32,	17260,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	ignitionRpmBins					= array, F32,	17324,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	veTable						 = array, F32, 17388, [16x16],"%", 1, 0, 0, 999.0, 2
+	veLoadBins						= array, F32,	18412,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
+	veRpmBins						= array, F32,	18476,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	afrTable					 = array, U08, 18540, [16x16],"deg", 0.1, 0, 0, 25.0, 1
+	afrLoadBins						= array, F32,	18796,	[16],	"", 1, 0.0, 0, 500.0, 2
+	afrRpmBins						= array, F32,	18860,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	tpsTpsAccelTable			 = array, F32, 18924, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelFromRpmBins			= array, F32,	19180,	[8],	"from", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelToRpmBins			= array, F32,	19212,	[8],	"to", 1, 0, 0.0, 25500.0, 2
+	fsioTable1					 = array, F32, 19244, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	fsioTable1LoadBins				= array, F32,	19500,	[8],	"L", 1, 0, 0.0, 30000.0, 2
+	fsioTable1RpmBins				= array, F32,	19532,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable2					 = array, U08, 19564, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable2LoadBins				= array, F32,	19628,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable2RpmBins				= array, F32,	19660,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable3					 = array, U08, 19692, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable3LoadBins				= array, F32,	19756,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable3RpmBins				= array, F32,	19788,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable4					 = array, U08, 19820, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable4LoadBins				= array, F32,	19884,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable4RpmBins				= array, F32,	19916,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+; total TS size = 19948
 [SettingContextHelp]
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
@ -1649,21 +1659,21 @@ page = 1

 ; wall of debug mode :)
 ; https://rusefi.com/wiki/index.php?title=Manual:Debug_fields
-;                                            0                     1                     2            3                           4                      5                            6             7              8                9            10                   11       12           13          14             15            16              17                       18                 19            20              21               22                23         24           25                26           27         28        29      30       31                32     33     34       35       36                       37              38            39
-;											 Alternator            TPS Acceleration      Warmup-Pid   Idle                        Engine Load Acc        Trigger Counters                                          VVT              Cranking     Ignition Timing                                                                                     ETB PID                                                                                                                              CJ125             CAN                                                TLE8888                                           Boost                    Start           Launcher      ETB Autotune
-    debugFieldF1List = bits,   U08,   [0:7], "Controller Output",  "From TPS",           "",          "Controller Output",        "Idle output",         "Channel 1 Rise Counter",    "",           "",            "VVT Event Position","",          "Ign IAT Corr",      "",      "",         "",         "",            "",           "",             "ETB Controller Output", "",                "",           "df1",          "df1",           "22df1",          "",        "23:df1",     "CJ125: output",  "",          "",         "",       "",     "",     "",               "",    "",    "",      "",      "Boost Open Loop Duty",  "S unused"      "",           "Osc Amplitude"
-    debugFieldF2List = bits,   U08,   [0:7], "I-Term",             "To TPS",             "",          "I-Term",                   "Idle df2",            "Channel 2 Rise Counter",    "",           "",            "VVT Ratio",         "",          "Ign CLT Corr",      "",      "",         "",         "",            "",           "",             "ETB I-Term",            "",                "",           "df2",          "df2",           "22df2",          "",        "23:df2",     "CJ125: i-term",  "",          "",         "",       "",     "",     "",               "",    "",    "",      "",      "Boost Closed Loop Duty","S unused"      "",           "Duty Amplitude"
-    debugFieldF3List = bits,   U08,   [0:7], "Previous Error",     "Current TPS<>TPS",   "",          "",                         "Idle df3",            "ICU sum",                   "",           "",            "",                  "",          "Ign FSIO Adj",      "",      "",         "",         "",            "",           "",             "ETB err",               "",                "",           "df3",          "df3",           "22df3",          "",        "23:df3",     "CJ125: err",     "",          "",         "",       "",     "",     "",               "",    "",    "",      "",      "",                      "S unused"      "",           "Tu"
-    debugFieldF4List = bits,   U08,   [0:7], "I Gain",             "Extra Fuel",         "",          "",                         "Idle df4",            "VVT rise",                  "",           "",            "",                  "",          "Ign PID Adj",       "",      "",         "",         "",            "",           "",             "ETB I setting",         "",                "",           "df4",          "df4",           "22df4",          "",        "23:df4",     "CJ125: UA",      "",          "",         "",       "",     "",     "",               "",    "",    "",      "",      "",                      "S unused"      "",           "Ku"
-    debugFieldF5List = bits,   U08,   [0:7], "D Gain",             "df5",                "df5",       "df5",                      "Idle df5",            "VVT fall",                  "df5",        "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB D setting",         "df5",             "df5",        "df5",          "df5",           "22df5",          "",        "23:df5",     "CJ125: UR",      "",          "",         "",       "",     "",     "",               "",    "",    "",      "",      "",                      "S unused"      "",           "Kp"
-    debugFieldF6List = bits,   U08,   [0:7], "D Term",             "",                   "",          "",                         "Idle df6",            "Current Gap",               "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB df6",               "",                "",           "df6",          "df6",           "22df6",          "",        "23:df6",     "cj: f7",         "",          "",         "",       "",     "",     "",               "",    "",    "",      "",      "",                      "S unused"      "",           "Ki"
-    debugFieldF7List = bits,   U08,   [0:7], "Max-Value",          "",                   "",          "",                         "Idle df7",            "",                          "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB df7",               "",                "",           "df7",          "df7",           "22df7",          "",        "23:df7",     "cj: f7",         "",          "",         "",       "",     "",     "",               "",    "",    "",      "",      "",                      "S unused"      "",           "Kd"
+;                                            0                     1                     2            3                           4                      5                            6             7              8                    9            10                   11       12           13          14             15            16              17                       18                 19            20              21               22                23         24           25                26           27         28        29      30       31                32                      33     34       35       36                       37              38            39
+;											 Alternator            TPS Acceleration      Warmup-Pid   Idle                        Engine Load Acc        Trigger Counters                                          VVT                  Cranking     Ignition Timing                                                                                     ETB PID                                                                                                                              CJ125             CAN                                                TLE8888           Analog inputs 2         Boost                    Start           Launcher      ETB Autotune
+    debugFieldF1List = bits,   U08,   [0:7], "Controller Output",  "From TPS",           "",          "Controller Output",        "Idle output",         "Channel 1 Rise Counter",    "",           "",            "VVT Event Position","",          "Ign IAT Corr",      "",      "",         "",         "",            "",           "",             "ETB Controller Output", "",                "",           "df1",          "df1",           "22df1",          "",        "23:df1",     "CJ125: output",  "",          "",         "",       "",     "",     "",               "TPS1 Pri/Sec Diff",    "",    "",      "",      "Boost Open Loop Duty",  "S unused"      "",           "Osc Amplitude"
+    debugFieldF2List = bits,   U08,   [0:7], "I-Term",             "To TPS",             "",          "I-Term",                   "Idle df2",            "Channel 2 Rise Counter",    "",           "",            "VVT Ratio",         "",          "Ign CLT Corr",      "",      "",         "",         "",            "",           "",             "ETB I-Term",            "",                "",           "df2",          "df2",           "22df2",          "",        "23:df2",     "CJ125: i-term",  "",          "",         "",       "",     "",     "",               "TPS2 Pri/Sec Diff",    "",    "",      "",      "Boost Closed Loop Duty","S unused"      "",           "Duty Amplitude"
+    debugFieldF3List = bits,   U08,   [0:7], "Previous Error",     "Current TPS<>TPS",   "",          "",                         "Idle df3",            "ICU sum",                   "",           "",            "",                  "",          "Ign FSIO Adj",      "",      "",         "",         "",            "",           "",             "ETB err",               "",                "",           "df3",          "df3",           "22df3",          "",        "23:df3",     "CJ125: err",     "",          "",         "",       "",     "",     "",               "",                     "",    "",      "",      "",                      "S unused"      "",           "Tu"
+    debugFieldF4List = bits,   U08,   [0:7], "I Gain",             "Extra Fuel",         "",          "",                         "Idle df4",            "VVT rise",                  "",           "",            "",                  "",          "Ign PID Adj",       "",      "",         "",         "",            "",           "",             "ETB I setting",         "",                "",           "df4",          "df4",           "22df4",          "",        "23:df4",     "CJ125: UA",      "",          "",         "",       "",     "",     "",               "",                     "",    "",      "",      "",                      "S unused"      "",           "Ku"
+    debugFieldF5List = bits,   U08,   [0:7], "D Gain",             "df5",                "df5",       "df5",                      "Idle df5",            "VVT fall",                  "df5",        "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB D setting",         "df5",             "df5",        "df5",          "df5",           "22df5",          "",        "23:df5",     "CJ125: UR",      "",          "",         "",       "",     "",     "",               "",                     "",    "",      "",      "",                      "S unused"      "",           "Kp"
+    debugFieldF6List = bits,   U08,   [0:7], "D Term",             "",                   "",          "",                         "Idle df6",            "Current Gap",               "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB df6",               "",                "",           "df6",          "df6",           "22df6",          "",        "23:df6",     "cj: f7",         "",          "",         "",       "",     "",     "",               "",                     "",    "",      "",      "",                      "S unused"      "",           "Ki"
+    debugFieldF7List = bits,   U08,   [0:7], "Max-Value",          "",                   "",          "",                         "Idle df7",            "",                          "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB df7",               "",                "",           "df7",          "df7",           "22df7",          "",        "23:df7",     "cj: f7",         "",          "",         "",       "",     "",     "",               "",                     "",    "",      "",      "",                      "S unused"      "",           "Kd"

-    debugFieldI1List = bits,   U08,   [0:7], "P-Gain",             "",                   "",          "",                         "Idle di1",            "Channel 1 Fall Counter",    "",           "",            "VVT Sync Counter",  "",          "Multispark Count",  "",      "",         "",         "",            "",           "",             "ETB P-Gain",            "",                "",           "di1",          "di1",           "22di1",          "",        "23:di1",     "CJ125: state",   "read count","",         "",       "",     "",     "SPI Counter",    "",    "",    "",      "",      "",                      "Start Count"   "",           ""
-    debugFieldI2List = bits,   U08,   [0:7], "Offset",             "",                   "",          "",                         "Idle di2",            "Channel 2 Fall Counter",    "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB di2",               "",                "",           "di2",          "di2",           "22di2",          "",        "23:di2",     "",               "",          "",         "",       "",     "",     "Latest Transmit","",    "",    "",      "",      "",                      "S unused"      "",           ""
-    debugFieldI3List = bits,   U08,   [0:7], "",                   "",                   "",          "",                         "Idle di3",            "Cycle Index",               "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB di3",               "",                "",           "di3",          "di3",           "22di3",          "",        "23:di3",     "",               "",          "",         "",       "",     "",     "Latest Received","",    "",    "",      "",      "",                      "S unused"      "",           ""
-    debugFieldI4List = bits,   U08,   [0:7], "",                   "",                   "",          "",                         "Idle di4",            "Cycle Cnt 1",               "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB di4",               "",                "",           "di4",          "di4",           "22di4",          "",        "23:di4",      "",              "",          "",         "",       "",     "",     "Init Count",     "",    "",    "",      "",      "",                      "S unused"      "",           ""
-    debugFieldI5List = bits,   U08,   [0:7], "",                   "",                   "",          "",                         "Idle di5",            "Cycle Cnt 2",               "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "di5",        "di5",          "ETB di5",               "di5",             "di5",        "di5",          "di5",           "22di5",          "di5",     "di5",        "di5",            "di5",       "di5",      "di5",    "di5",  "di5",  "di5",            "di5", "di5", "di5",   "di5",   "di5",                   "S di5"         "",           ""
+    debugFieldI1List = bits,   U08,   [0:7], "P-Gain",             "",                   "",          "",                         "Idle di1",            "Channel 1 Fall Counter",    "",           "",            "VVT Sync Counter",  "",          "Multispark Count",  "",      "",         "",         "",            "",           "",             "ETB P-Gain",            "",                "",           "di1",          "di1",           "22di1",          "",        "23:di1",     "CJ125: state",   "read count","",         "",       "",     "",     "SPI Counter",    "",                     "",    "",      "",      "",                      "Start Count"   "",           ""
+    debugFieldI2List = bits,   U08,   [0:7], "Offset",             "",                   "",          "",                         "Idle di2",            "Channel 2 Fall Counter",    "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB di2",               "",                "",           "di2",          "di2",           "22di2",          "",        "23:di2",     "",               "",          "",         "",       "",     "",     "Latest Transmit","",                     "",    "",      "",      "",                      "S unused"      "",           ""
+    debugFieldI3List = bits,   U08,   [0:7], "",                   "",                   "",          "",                         "Idle di3",            "Cycle Index",               "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB di3",               "",                "",           "di3",          "di3",           "22di3",          "",        "23:di3",     "",               "",          "",         "",       "",     "",     "Latest Received","",                     "",    "",      "",      "",                      "S unused"      "",           ""
+    debugFieldI4List = bits,   U08,   [0:7], "",                   "",                   "",          "",                         "Idle di4",            "Cycle Cnt 1",               "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "",           "",             "ETB di4",               "",                "",           "di4",          "di4",           "22di4",          "",        "23:di4",      "",              "",          "",         "",       "",     "",     "Init Count",     "",                     "",    "",      "",      "",                      "S unused"      "",           ""
+    debugFieldI5List = bits,   U08,   [0:7], "",                   "",                   "",          "",                         "Idle di5",            "Cycle Cnt 2",               "",           "",            "",                  "",          "",                  "",      "",         "",         "",            "di5",        "di5",          "ETB di5",               "di5",             "di5",        "di5",          "di5",           "22di5",          "di5",     "di5",        "di5",            "di5",       "di5",      "di5",    "di5",  "di5",  "di5",            "",                     "di5", "di5",   "di5",   "di5",                   "S di5"         "",           ""

 [ConstantsExtensions]
     ; defaultValue is used to provide TunerStudio with a value to use in the case of
@ -1672,9 +1682,15 @@ page = 1
     ; defaultValue = constantName, value;
    defaultValue = wueAfrTargetOffset, -1.5 -1.4 -1.15 -0.95 -0.775 -0.65 -0.5625 -0.5 -0.4375 -0.375 -0.3125 -0.25 -0.1875 -0.125 -0.0625 0

+	; TPS 1 Primary
 	maintainConstantValue = tpsMax, { (calibrationMode == 1 ) ? calibrationValue : tpsMax }
 	maintainConstantValue = tpsMin, { (calibrationMode == 2 ) ? calibrationValue : tpsMin }

+	; TPS 1 Secondary
+	maintainConstantValue = tps1SecondaryMax, { (calibrationMode == 6 ) ? calibrationValue : tps1SecondaryMax }
+	maintainConstantValue = tps1SecondaryMin, { (calibrationMode == 7 ) ? calibrationValue : tps1SecondaryMin }
+
+	; ETB Auto Gain Calibration
 	maintainConstantValue = etb_pFactor, { (calibrationMode == 3 ) ? calibrationValue : etb_pFactor }
 	maintainConstantValue = etb_iFactor, { (calibrationMode == 4 ) ? calibrationValue : etb_iFactor }
 	maintainConstantValue = etb_dFactor, { (calibrationMode == 5 ) ? calibrationValue : etb_dFactor }
--- a/firmware/tunerstudio/rusefi_microrusefi.ini
+++ b/firmware/tunerstudio/rusefi_microrusefi.ini
@ -89,9 +89,9 @@ 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.bat integration\rusefi_config.txt Mon May 18 14:33:53 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue May 19 08:38:20 EDT 2020

-pageSize            = 20000
+pageSize            = 19948
 page = 1
 	engineType					 = bits, S32, 0, [0:7], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
 	engineSnifferRpmThreshold		= scalar, S32,	4,	"RPM", 1, 0, 0,30000, 0
@ -1094,90 +1094,100 @@ 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
-;no TS info - skipping mainUnusedEnd offset 4496
-	warning_message				 = string, ASCII, 6000, 120
-	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
-	afterstartHoldTime				= array, F32,	6152,	[8],	"Seconds", 1, 0, 0, 100, 1
-	afterstartEnrich				= array, F32,	6184,	[8],	"%", 1, 0, 0, 600, 1
-	afterstartDecayTime				= array, F32,	6216,	[8],	"Seconds", 1, 0, 0, 100, 1
-	boostTableOpenLoop			 = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
-;no TS info - skipping unused6312 offset 6312
-	boostRpmBins					= array, U08,	6320,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	boostTableClosedLoop		 = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
-	boostTpsBins					= array, U08,	6392,	[8],	"%", 2, 0.0, 0, 100.0, 2
-	pedalToTpsTable				 = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
-	pedalToTpsPedalBins				= array, U08,	6464,	[8],	"%", 1, 0, 0.0, 120.0, 0
-	pedalToTpsRpmBins				= array, U08,	6472,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	cltCrankingCorrBins				= array, F32,	6480,	[8],	"C", 1, 0, -100.0, 250.0, 2
-	cltCrankingCorr					= array, F32,	6512,	[8],	"%", 1, 0, 0.0, 500.0, 2
-	idleAdvanceBins					= array, F32,	6544,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleAdvance						= array, F32,	6576,	[8],	"deg", 1, 0, -20, 90, 2
-	idleVeBins						= array, F32,	6608,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleVe							= array, F32,	6640,	[8],	,"%", 1, 0, 0, 999.0, 2
-	fsioFormulas1				 = string, ASCII, 6672, 200
-	fsioFormulas2				 = string, ASCII, 6872, 200
-	fsioFormulas3				 = string, ASCII, 7072, 200
-	fsioFormulas4				 = string, ASCII, 7272, 200
-	fsioFormulas5				 = string, ASCII, 7472, 200
-	fsioFormulas6				 = string, ASCII, 7672, 200
-	fsioFormulas7				 = string, ASCII, 7872, 200
-	fsioFormulas8				 = string, ASCII, 8072, 200
-	fsioFormulas9				 = string, ASCII, 8272, 200
-	fsioFormulas10				 = string, ASCII, 8472, 200
-	fsioFormulas11				 = string, ASCII, 8672, 200
-	fsioFormulas12				 = string, ASCII, 8872, 200
-	fsioFormulas13				 = string, ASCII, 9072, 200
-	fsioFormulas14				 = string, ASCII, 9272, 200
-	fsioFormulas15				 = string, ASCII, 9472, 200
-	fsioFormulas16				 = string, ASCII, 9672, 200
-	timingMultiplier			 = string, ASCII, 9872, 200
-	timingAdditive				 = string, ASCII, 10072, 200
-	cltFuelCorrBins					= array, F32,	10272,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltFuelCorr						= array, F32,	10336,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	iatFuelCorrBins					= array, F32,	10400,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	iatFuelCorr						= array, F32,	10464,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingFuelCoef				= array, F32,	10528,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
-	crankingFuelBins				= array, F32,	10560,	[8],	"C", 1, 0, -80.0, 170.0, 2
-	crankingCycleCoef				= array, F32,	10592,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingCycleBins				= array, F32,	10624,	[8],	"counter", 1, 0, -80.0, 170.0, 0
-	cltIdleCorrBins					= array, F32,	10656,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltIdleCorr						= array, F32,	10720,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
-	mafDecoding						= array, F32,	10784,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
-	mafDecodingBins					= array, F32,	11808,	[256],	 "V", 1, 0, -5.0, 150.0, 2
-	ignitionIatCorrTable		 = array, F32, 12832, [16x16],"deg", 1, 0, -720, 720, 2
-	ignitionIatCorrLoadBins			= array, F32,	13856,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
-	ignitionIatCorrRpmBins			= array, F32,	13920,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	injectionPhase				 = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2
-	injPhaseLoadBins				= array, F32,	15008,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	injPhaseRpmBins					= array, F32,	15072,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	fuelTable					 = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2
-	fuelLoadBins					= array, F32,	16160,	[16],	"V", 1, 0, 0.0, 500.0, 2
-	fuelRpmBins						= array, F32,	16224,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
-	ignitionTable				 = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2
-	ignitionLoadBins				= array, F32,	17312,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	ignitionRpmBins					= array, F32,	17376,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	veTable						 = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2
-	veLoadBins						= array, F32,	18464,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
-	veRpmBins						= array, F32,	18528,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	afrTable					 = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
-	afrLoadBins						= array, F32,	18848,	[16],	"", 1, 0.0, 0, 500.0, 2
-	afrRpmBins						= array, F32,	18912,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	tpsTpsAccelTable			 = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelFromRpmBins			= array, F32,	19232,	[8],	"from", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelToRpmBins			= array, F32,	19264,	[8],	"to", 1, 0, 0.0, 25500.0, 2
-	fsioTable1					 = array, F32, 19296, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	fsioTable1LoadBins				= array, F32,	19552,	[8],	"L", 1, 0, 0.0, 30000.0, 2
-	fsioTable1RpmBins				= array, F32,	19584,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable2					 = array, U08, 19616, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable2LoadBins				= array, F32,	19680,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable2RpmBins				= array, F32,	19712,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable3					 = array, U08, 19744, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable3LoadBins				= array, F32,	19808,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable3RpmBins				= array, F32,	19840,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable4					 = array, U08, 19872, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable4LoadBins				= array, F32,	19936,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable4RpmBins				= array, F32,	19968,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-; total TS size = 20000
+;no TS info - skipping mc33_i_boost offset 4496
+;no TS info - skipping mc33_i_peak offset 4498
+;no TS info - skipping mc33_i_hold offset 4500
+;no TS info - skipping mc33_t_max_boost offset 4502
+;no TS info - skipping mc33_t_peak_off offset 4504
+;no TS info - skipping mc33_t_peak_tot offset 4506
+;no TS info - skipping mc33_t_bypass offset 4508
+;no TS info - skipping mc33_t_hold_off offset 4510
+;no TS info - skipping mc33_t_hold_tot offset 4512
+;no TS info - skipping alignmentFill_at_4514 offset 4514
+;no TS info - skipping mainUnusedEnd offset 4516
+	warning_message				 = string, ASCII, 5948, 120
+	afterstartCoolantBins			= array, F32,	6068,	[8],	"C", 1, 0, -100.0, 250.0, 0
+	afterstartHoldTime				= array, F32,	6100,	[8],	"Seconds", 1, 0, 0, 100, 1
+	afterstartEnrich				= array, F32,	6132,	[8],	"%", 1, 0, 0, 600, 1
+	afterstartDecayTime				= array, F32,	6164,	[8],	"Seconds", 1, 0, 0, 100, 1
+	boostTableOpenLoop			 = array, U08, 6196, [8x8],"", 2, 0 , 0, 3000, 0
+;no TS info - skipping unused6312 offset 6260
+	boostRpmBins					= array, U08,	6268,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	boostTableClosedLoop		 = array, U08, 6276, [8x8],"", 2, 0 , 0, 3000, 0
+	boostTpsBins					= array, U08,	6340,	[8],	"%", 2, 0.0, 0, 100.0, 2
+	pedalToTpsTable				 = array, U08, 6348, [8x8],"%", 1, 0, 0, 100, 0
+	pedalToTpsPedalBins				= array, U08,	6412,	[8],	"%", 1, 0, 0.0, 120.0, 0
+	pedalToTpsRpmBins				= array, U08,	6420,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	cltCrankingCorrBins				= array, F32,	6428,	[8],	"C", 1, 0, -100.0, 250.0, 2
+	cltCrankingCorr					= array, F32,	6460,	[8],	"%", 1, 0, 0.0, 500.0, 2
+	idleAdvanceBins					= array, F32,	6492,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleAdvance						= array, F32,	6524,	[8],	"deg", 1, 0, -20, 90, 2
+	idleVeBins						= array, F32,	6556,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleVe							= array, F32,	6588,	[8],	,"%", 1, 0, 0, 999.0, 2
+	fsioFormulas1				 = string, ASCII, 6620, 200
+	fsioFormulas2				 = string, ASCII, 6820, 200
+	fsioFormulas3				 = string, ASCII, 7020, 200
+	fsioFormulas4				 = string, ASCII, 7220, 200
+	fsioFormulas5				 = string, ASCII, 7420, 200
+	fsioFormulas6				 = string, ASCII, 7620, 200
+	fsioFormulas7				 = string, ASCII, 7820, 200
+	fsioFormulas8				 = string, ASCII, 8020, 200
+	fsioFormulas9				 = string, ASCII, 8220, 200
+	fsioFormulas10				 = string, ASCII, 8420, 200
+	fsioFormulas11				 = string, ASCII, 8620, 200
+	fsioFormulas12				 = string, ASCII, 8820, 200
+	fsioFormulas13				 = string, ASCII, 9020, 200
+	fsioFormulas14				 = string, ASCII, 9220, 200
+	fsioFormulas15				 = string, ASCII, 9420, 200
+	fsioFormulas16				 = string, ASCII, 9620, 200
+	timingMultiplier			 = string, ASCII, 9820, 200
+	timingAdditive				 = string, ASCII, 10020, 200
+	cltFuelCorrBins					= array, F32,	10220,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltFuelCorr						= array, F32,	10284,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	iatFuelCorrBins					= array, F32,	10348,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	iatFuelCorr						= array, F32,	10412,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingFuelCoef				= array, F32,	10476,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
+	crankingFuelBins				= array, F32,	10508,	[8],	"C", 1, 0, -80.0, 170.0, 2
+	crankingCycleCoef				= array, F32,	10540,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingCycleBins				= array, F32,	10572,	[8],	"counter", 1, 0, -80.0, 170.0, 0
+	cltIdleCorrBins					= array, F32,	10604,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltIdleCorr						= array, F32,	10668,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
+	mafDecoding						= array, F32,	10732,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
+	mafDecodingBins					= array, F32,	11756,	[256],	 "V", 1, 0, -5.0, 150.0, 2
+	ignitionIatCorrTable		 = array, F32, 12780, [16x16],"deg", 1, 0, -720, 720, 2
+	ignitionIatCorrLoadBins			= array, F32,	13804,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
+	ignitionIatCorrRpmBins			= array, F32,	13868,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	injectionPhase				 = array, F32, 13932, [16x16],"deg", 1, 0, -720, 720, 2
+	injPhaseLoadBins				= array, F32,	14956,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	injPhaseRpmBins					= array, F32,	15020,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	fuelTable					 = array, F32, 15084, [16x16],"ms", 1, 0, 0.0, 500.0, 2
+	fuelLoadBins					= array, F32,	16108,	[16],	"V", 1, 0, 0.0, 500.0, 2
+	fuelRpmBins						= array, F32,	16172,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
+	ignitionTable				 = array, F32, 16236, [16x16],"deg", 1, 0, -20, 90, 2
+	ignitionLoadBins				= array, F32,	17260,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	ignitionRpmBins					= array, F32,	17324,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	veTable						 = array, F32, 17388, [16x16],"%", 1, 0, 0, 999.0, 2
+	veLoadBins						= array, F32,	18412,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
+	veRpmBins						= array, F32,	18476,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	afrTable					 = array, U08, 18540, [16x16],"deg", 0.1, 0, 0, 25.0, 1
+	afrLoadBins						= array, F32,	18796,	[16],	"", 1, 0.0, 0, 500.0, 2
+	afrRpmBins						= array, F32,	18860,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	tpsTpsAccelTable			 = array, F32, 18924, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelFromRpmBins			= array, F32,	19180,	[8],	"from", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelToRpmBins			= array, F32,	19212,	[8],	"to", 1, 0, 0.0, 25500.0, 2
+	fsioTable1					 = array, F32, 19244, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	fsioTable1LoadBins				= array, F32,	19500,	[8],	"L", 1, 0, 0.0, 30000.0, 2
+	fsioTable1RpmBins				= array, F32,	19532,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable2					 = array, U08, 19564, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable2LoadBins				= array, F32,	19628,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable2RpmBins				= array, F32,	19660,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable3					 = array, U08, 19692, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable3LoadBins				= array, F32,	19756,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable3RpmBins				= array, F32,	19788,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable4					 = array, U08, 19820, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable4LoadBins				= array, F32,	19884,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable4RpmBins				= array, F32,	19916,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+; total TS size = 19948
 [SettingContextHelp]
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
--- a/firmware/tunerstudio/rusefi_prometheus.ini
+++ b/firmware/tunerstudio/rusefi_prometheus.ini
@ -89,9 +89,9 @@ 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.bat integration\rusefi_config.txt Mon May 18 14:34:34 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue May 19 08:38:22 EDT 2020

-pageSize            = 20000
+pageSize            = 19948
 page = 1
 	engineType					 = bits, S32, 0, [0:7], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
 	engineSnifferRpmThreshold		= scalar, S32,	4,	"RPM", 1, 0, 0,30000, 0
@ -1094,90 +1094,100 @@ 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
-;no TS info - skipping mainUnusedEnd offset 4496
-	warning_message				 = string, ASCII, 6000, 120
-	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
-	afterstartHoldTime				= array, F32,	6152,	[8],	"Seconds", 1, 0, 0, 100, 1
-	afterstartEnrich				= array, F32,	6184,	[8],	"%", 1, 0, 0, 600, 1
-	afterstartDecayTime				= array, F32,	6216,	[8],	"Seconds", 1, 0, 0, 100, 1
-	boostTableOpenLoop			 = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
-;no TS info - skipping unused6312 offset 6312
-	boostRpmBins					= array, U08,	6320,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	boostTableClosedLoop		 = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
-	boostTpsBins					= array, U08,	6392,	[8],	"%", 2, 0.0, 0, 100.0, 2
-	pedalToTpsTable				 = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
-	pedalToTpsPedalBins				= array, U08,	6464,	[8],	"%", 1, 0, 0.0, 120.0, 0
-	pedalToTpsRpmBins				= array, U08,	6472,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	cltCrankingCorrBins				= array, F32,	6480,	[8],	"C", 1, 0, -100.0, 250.0, 2
-	cltCrankingCorr					= array, F32,	6512,	[8],	"%", 1, 0, 0.0, 500.0, 2
-	idleAdvanceBins					= array, F32,	6544,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleAdvance						= array, F32,	6576,	[8],	"deg", 1, 0, -20, 90, 2
-	idleVeBins						= array, F32,	6608,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleVe							= array, F32,	6640,	[8],	,"%", 1, 0, 0, 999.0, 2
-	fsioFormulas1				 = string, ASCII, 6672, 200
-	fsioFormulas2				 = string, ASCII, 6872, 200
-	fsioFormulas3				 = string, ASCII, 7072, 200
-	fsioFormulas4				 = string, ASCII, 7272, 200
-	fsioFormulas5				 = string, ASCII, 7472, 200
-	fsioFormulas6				 = string, ASCII, 7672, 200
-	fsioFormulas7				 = string, ASCII, 7872, 200
-	fsioFormulas8				 = string, ASCII, 8072, 200
-	fsioFormulas9				 = string, ASCII, 8272, 200
-	fsioFormulas10				 = string, ASCII, 8472, 200
-	fsioFormulas11				 = string, ASCII, 8672, 200
-	fsioFormulas12				 = string, ASCII, 8872, 200
-	fsioFormulas13				 = string, ASCII, 9072, 200
-	fsioFormulas14				 = string, ASCII, 9272, 200
-	fsioFormulas15				 = string, ASCII, 9472, 200
-	fsioFormulas16				 = string, ASCII, 9672, 200
-	timingMultiplier			 = string, ASCII, 9872, 200
-	timingAdditive				 = string, ASCII, 10072, 200
-	cltFuelCorrBins					= array, F32,	10272,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltFuelCorr						= array, F32,	10336,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	iatFuelCorrBins					= array, F32,	10400,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	iatFuelCorr						= array, F32,	10464,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingFuelCoef				= array, F32,	10528,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
-	crankingFuelBins				= array, F32,	10560,	[8],	"C", 1, 0, -80.0, 170.0, 2
-	crankingCycleCoef				= array, F32,	10592,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingCycleBins				= array, F32,	10624,	[8],	"counter", 1, 0, -80.0, 170.0, 0
-	cltIdleCorrBins					= array, F32,	10656,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltIdleCorr						= array, F32,	10720,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
-	mafDecoding						= array, F32,	10784,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
-	mafDecodingBins					= array, F32,	11808,	[256],	 "V", 1, 0, -5.0, 150.0, 2
-	ignitionIatCorrTable		 = array, F32, 12832, [16x16],"deg", 1, 0, -720, 720, 2
-	ignitionIatCorrLoadBins			= array, F32,	13856,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
-	ignitionIatCorrRpmBins			= array, F32,	13920,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	injectionPhase				 = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2
-	injPhaseLoadBins				= array, F32,	15008,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	injPhaseRpmBins					= array, F32,	15072,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	fuelTable					 = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2
-	fuelLoadBins					= array, F32,	16160,	[16],	"V", 1, 0, 0.0, 500.0, 2
-	fuelRpmBins						= array, F32,	16224,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
-	ignitionTable				 = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2
-	ignitionLoadBins				= array, F32,	17312,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	ignitionRpmBins					= array, F32,	17376,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	veTable						 = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2
-	veLoadBins						= array, F32,	18464,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
-	veRpmBins						= array, F32,	18528,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	afrTable					 = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
-	afrLoadBins						= array, F32,	18848,	[16],	"", 1, 0.0, 0, 500.0, 2
-	afrRpmBins						= array, F32,	18912,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	tpsTpsAccelTable			 = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelFromRpmBins			= array, F32,	19232,	[8],	"from", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelToRpmBins			= array, F32,	19264,	[8],	"to", 1, 0, 0.0, 25500.0, 2
-	fsioTable1					 = array, F32, 19296, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	fsioTable1LoadBins				= array, F32,	19552,	[8],	"L", 1, 0, 0.0, 30000.0, 2
-	fsioTable1RpmBins				= array, F32,	19584,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable2					 = array, U08, 19616, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable2LoadBins				= array, F32,	19680,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable2RpmBins				= array, F32,	19712,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable3					 = array, U08, 19744, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable3LoadBins				= array, F32,	19808,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable3RpmBins				= array, F32,	19840,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable4					 = array, U08, 19872, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable4LoadBins				= array, F32,	19936,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable4RpmBins				= array, F32,	19968,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-; total TS size = 20000
+;no TS info - skipping mc33_i_boost offset 4496
+;no TS info - skipping mc33_i_peak offset 4498
+;no TS info - skipping mc33_i_hold offset 4500
+;no TS info - skipping mc33_t_max_boost offset 4502
+;no TS info - skipping mc33_t_peak_off offset 4504
+;no TS info - skipping mc33_t_peak_tot offset 4506
+;no TS info - skipping mc33_t_bypass offset 4508
+;no TS info - skipping mc33_t_hold_off offset 4510
+;no TS info - skipping mc33_t_hold_tot offset 4512
+;no TS info - skipping alignmentFill_at_4514 offset 4514
+;no TS info - skipping mainUnusedEnd offset 4516
+	warning_message				 = string, ASCII, 5948, 120
+	afterstartCoolantBins			= array, F32,	6068,	[8],	"C", 1, 0, -100.0, 250.0, 0
+	afterstartHoldTime				= array, F32,	6100,	[8],	"Seconds", 1, 0, 0, 100, 1
+	afterstartEnrich				= array, F32,	6132,	[8],	"%", 1, 0, 0, 600, 1
+	afterstartDecayTime				= array, F32,	6164,	[8],	"Seconds", 1, 0, 0, 100, 1
+	boostTableOpenLoop			 = array, U08, 6196, [8x8],"", 2, 0 , 0, 3000, 0
+;no TS info - skipping unused6312 offset 6260
+	boostRpmBins					= array, U08,	6268,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	boostTableClosedLoop		 = array, U08, 6276, [8x8],"", 2, 0 , 0, 3000, 0
+	boostTpsBins					= array, U08,	6340,	[8],	"%", 2, 0.0, 0, 100.0, 2
+	pedalToTpsTable				 = array, U08, 6348, [8x8],"%", 1, 0, 0, 100, 0
+	pedalToTpsPedalBins				= array, U08,	6412,	[8],	"%", 1, 0, 0.0, 120.0, 0
+	pedalToTpsRpmBins				= array, U08,	6420,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	cltCrankingCorrBins				= array, F32,	6428,	[8],	"C", 1, 0, -100.0, 250.0, 2
+	cltCrankingCorr					= array, F32,	6460,	[8],	"%", 1, 0, 0.0, 500.0, 2
+	idleAdvanceBins					= array, F32,	6492,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleAdvance						= array, F32,	6524,	[8],	"deg", 1, 0, -20, 90, 2
+	idleVeBins						= array, F32,	6556,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleVe							= array, F32,	6588,	[8],	,"%", 1, 0, 0, 999.0, 2
+	fsioFormulas1				 = string, ASCII, 6620, 200
+	fsioFormulas2				 = string, ASCII, 6820, 200
+	fsioFormulas3				 = string, ASCII, 7020, 200
+	fsioFormulas4				 = string, ASCII, 7220, 200
+	fsioFormulas5				 = string, ASCII, 7420, 200
+	fsioFormulas6				 = string, ASCII, 7620, 200
+	fsioFormulas7				 = string, ASCII, 7820, 200
+	fsioFormulas8				 = string, ASCII, 8020, 200
+	fsioFormulas9				 = string, ASCII, 8220, 200
+	fsioFormulas10				 = string, ASCII, 8420, 200
+	fsioFormulas11				 = string, ASCII, 8620, 200
+	fsioFormulas12				 = string, ASCII, 8820, 200
+	fsioFormulas13				 = string, ASCII, 9020, 200
+	fsioFormulas14				 = string, ASCII, 9220, 200
+	fsioFormulas15				 = string, ASCII, 9420, 200
+	fsioFormulas16				 = string, ASCII, 9620, 200
+	timingMultiplier			 = string, ASCII, 9820, 200
+	timingAdditive				 = string, ASCII, 10020, 200
+	cltFuelCorrBins					= array, F32,	10220,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltFuelCorr						= array, F32,	10284,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	iatFuelCorrBins					= array, F32,	10348,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	iatFuelCorr						= array, F32,	10412,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingFuelCoef				= array, F32,	10476,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
+	crankingFuelBins				= array, F32,	10508,	[8],	"C", 1, 0, -80.0, 170.0, 2
+	crankingCycleCoef				= array, F32,	10540,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingCycleBins				= array, F32,	10572,	[8],	"counter", 1, 0, -80.0, 170.0, 0
+	cltIdleCorrBins					= array, F32,	10604,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltIdleCorr						= array, F32,	10668,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
+	mafDecoding						= array, F32,	10732,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
+	mafDecodingBins					= array, F32,	11756,	[256],	 "V", 1, 0, -5.0, 150.0, 2
+	ignitionIatCorrTable		 = array, F32, 12780, [16x16],"deg", 1, 0, -720, 720, 2
+	ignitionIatCorrLoadBins			= array, F32,	13804,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
+	ignitionIatCorrRpmBins			= array, F32,	13868,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	injectionPhase				 = array, F32, 13932, [16x16],"deg", 1, 0, -720, 720, 2
+	injPhaseLoadBins				= array, F32,	14956,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	injPhaseRpmBins					= array, F32,	15020,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	fuelTable					 = array, F32, 15084, [16x16],"ms", 1, 0, 0.0, 500.0, 2
+	fuelLoadBins					= array, F32,	16108,	[16],	"V", 1, 0, 0.0, 500.0, 2
+	fuelRpmBins						= array, F32,	16172,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
+	ignitionTable				 = array, F32, 16236, [16x16],"deg", 1, 0, -20, 90, 2
+	ignitionLoadBins				= array, F32,	17260,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	ignitionRpmBins					= array, F32,	17324,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	veTable						 = array, F32, 17388, [16x16],"%", 1, 0, 0, 999.0, 2
+	veLoadBins						= array, F32,	18412,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
+	veRpmBins						= array, F32,	18476,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	afrTable					 = array, U08, 18540, [16x16],"deg", 0.1, 0, 0, 25.0, 1
+	afrLoadBins						= array, F32,	18796,	[16],	"", 1, 0.0, 0, 500.0, 2
+	afrRpmBins						= array, F32,	18860,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	tpsTpsAccelTable			 = array, F32, 18924, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelFromRpmBins			= array, F32,	19180,	[8],	"from", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelToRpmBins			= array, F32,	19212,	[8],	"to", 1, 0, 0.0, 25500.0, 2
+	fsioTable1					 = array, F32, 19244, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	fsioTable1LoadBins				= array, F32,	19500,	[8],	"L", 1, 0, 0.0, 30000.0, 2
+	fsioTable1RpmBins				= array, F32,	19532,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable2					 = array, U08, 19564, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable2LoadBins				= array, F32,	19628,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable2RpmBins				= array, F32,	19660,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable3					 = array, U08, 19692, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable3LoadBins				= array, F32,	19756,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable3RpmBins				= array, F32,	19788,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable4					 = array, U08, 19820, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable4LoadBins				= array, F32,	19884,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable4RpmBins				= array, F32,	19916,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+; total TS size = 19948
 [SettingContextHelp]
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
--- a/firmware/tunerstudio/rusefi_proteus.ini
+++ b/firmware/tunerstudio/rusefi_proteus.ini
@ -89,9 +89,9 @@ 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.bat integration\rusefi_config.txt Mon May 18 14:35:23 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue May 19 08:38:23 EDT 2020

-pageSize            = 20000
+pageSize            = 19948
 page = 1
 	engineType					 = bits, S32, 0, [0:7], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
 	engineSnifferRpmThreshold		= scalar, S32,	4,	"RPM", 1, 0, 0,30000, 0
@ -1094,90 +1094,100 @@ 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
-;no TS info - skipping mainUnusedEnd offset 4496
-	warning_message				 = string, ASCII, 6000, 120
-	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
-	afterstartHoldTime				= array, F32,	6152,	[8],	"Seconds", 1, 0, 0, 100, 1
-	afterstartEnrich				= array, F32,	6184,	[8],	"%", 1, 0, 0, 600, 1
-	afterstartDecayTime				= array, F32,	6216,	[8],	"Seconds", 1, 0, 0, 100, 1
-	boostTableOpenLoop			 = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
-;no TS info - skipping unused6312 offset 6312
-	boostRpmBins					= array, U08,	6320,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	boostTableClosedLoop		 = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
-	boostTpsBins					= array, U08,	6392,	[8],	"%", 2, 0.0, 0, 100.0, 2
-	pedalToTpsTable				 = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
-	pedalToTpsPedalBins				= array, U08,	6464,	[8],	"%", 1, 0, 0.0, 120.0, 0
-	pedalToTpsRpmBins				= array, U08,	6472,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
-	cltCrankingCorrBins				= array, F32,	6480,	[8],	"C", 1, 0, -100.0, 250.0, 2
-	cltCrankingCorr					= array, F32,	6512,	[8],	"%", 1, 0, 0.0, 500.0, 2
-	idleAdvanceBins					= array, F32,	6544,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleAdvance						= array, F32,	6576,	[8],	"deg", 1, 0, -20, 90, 2
-	idleVeBins						= array, F32,	6608,	[8],	"RPM", 1, 0, 0.0, 18000, 2
-	idleVe							= array, F32,	6640,	[8],	,"%", 1, 0, 0, 999.0, 2
-	fsioFormulas1				 = string, ASCII, 6672, 200
-	fsioFormulas2				 = string, ASCII, 6872, 200
-	fsioFormulas3				 = string, ASCII, 7072, 200
-	fsioFormulas4				 = string, ASCII, 7272, 200
-	fsioFormulas5				 = string, ASCII, 7472, 200
-	fsioFormulas6				 = string, ASCII, 7672, 200
-	fsioFormulas7				 = string, ASCII, 7872, 200
-	fsioFormulas8				 = string, ASCII, 8072, 200
-	fsioFormulas9				 = string, ASCII, 8272, 200
-	fsioFormulas10				 = string, ASCII, 8472, 200
-	fsioFormulas11				 = string, ASCII, 8672, 200
-	fsioFormulas12				 = string, ASCII, 8872, 200
-	fsioFormulas13				 = string, ASCII, 9072, 200
-	fsioFormulas14				 = string, ASCII, 9272, 200
-	fsioFormulas15				 = string, ASCII, 9472, 200
-	fsioFormulas16				 = string, ASCII, 9672, 200
-	timingMultiplier			 = string, ASCII, 9872, 200
-	timingAdditive				 = string, ASCII, 10072, 200
-	cltFuelCorrBins					= array, F32,	10272,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltFuelCorr						= array, F32,	10336,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	iatFuelCorrBins					= array, F32,	10400,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	iatFuelCorr						= array, F32,	10464,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingFuelCoef				= array, F32,	10528,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
-	crankingFuelBins				= array, F32,	10560,	[8],	"C", 1, 0, -80.0, 170.0, 2
-	crankingCycleCoef				= array, F32,	10592,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
-	crankingCycleBins				= array, F32,	10624,	[8],	"counter", 1, 0, -80.0, 170.0, 0
-	cltIdleCorrBins					= array, F32,	10656,	[16],	"C", 1, 0, -100.0, 250.0, 2
-	cltIdleCorr						= array, F32,	10720,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
-	mafDecoding						= array, F32,	10784,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
-	mafDecodingBins					= array, F32,	11808,	[256],	 "V", 1, 0, -5.0, 150.0, 2
-	ignitionIatCorrTable		 = array, F32, 12832, [16x16],"deg", 1, 0, -720, 720, 2
-	ignitionIatCorrLoadBins			= array, F32,	13856,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
-	ignitionIatCorrRpmBins			= array, F32,	13920,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	injectionPhase				 = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2
-	injPhaseLoadBins				= array, F32,	15008,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	injPhaseRpmBins					= array, F32,	15072,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	fuelTable					 = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2
-	fuelLoadBins					= array, F32,	16160,	[16],	"V", 1, 0, 0.0, 500.0, 2
-	fuelRpmBins						= array, F32,	16224,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
-	ignitionTable				 = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2
-	ignitionLoadBins				= array, F32,	17312,	[16],	"Load", 1, 0.0, 0, 500.0, 2
-	ignitionRpmBins					= array, F32,	17376,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	veTable						 = array, F32, 17440, [16x16],"%", 1, 0, 0, 999.0, 2
-	veLoadBins						= array, F32,	18464,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
-	veRpmBins						= array, F32,	18528,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	afrTable					 = array, U08, 18592, [16x16],"deg", 0.1, 0, 0, 25.0, 1
-	afrLoadBins						= array, F32,	18848,	[16],	"", 1, 0.0, 0, 500.0, 2
-	afrRpmBins						= array, F32,	18912,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	tpsTpsAccelTable			 = array, F32, 18976, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelFromRpmBins			= array, F32,	19232,	[8],	"from", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelToRpmBins			= array, F32,	19264,	[8],	"to", 1, 0, 0.0, 25500.0, 2
-	fsioTable1					 = array, F32, 19296, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	fsioTable1LoadBins				= array, F32,	19552,	[8],	"L", 1, 0, 0.0, 30000.0, 2
-	fsioTable1RpmBins				= array, F32,	19584,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable2					 = array, U08, 19616, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable2LoadBins				= array, F32,	19680,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable2RpmBins				= array, F32,	19712,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable3					 = array, U08, 19744, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable3LoadBins				= array, F32,	19808,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable3RpmBins				= array, F32,	19840,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable4					 = array, U08, 19872, [8x8],"value", 1, 0, 0.0, 255.0, 0
-	fsioTable4LoadBins				= array, F32,	19936,	[8],	"L", 1, 0, 0.0, 255, 0
-	fsioTable4RpmBins				= array, F32,	19968,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-; total TS size = 20000
+;no TS info - skipping mc33_i_boost offset 4496
+;no TS info - skipping mc33_i_peak offset 4498
+;no TS info - skipping mc33_i_hold offset 4500
+;no TS info - skipping mc33_t_max_boost offset 4502
+;no TS info - skipping mc33_t_peak_off offset 4504
+;no TS info - skipping mc33_t_peak_tot offset 4506
+;no TS info - skipping mc33_t_bypass offset 4508
+;no TS info - skipping mc33_t_hold_off offset 4510
+;no TS info - skipping mc33_t_hold_tot offset 4512
+;no TS info - skipping alignmentFill_at_4514 offset 4514
+;no TS info - skipping mainUnusedEnd offset 4516
+	warning_message				 = string, ASCII, 5948, 120
+	afterstartCoolantBins			= array, F32,	6068,	[8],	"C", 1, 0, -100.0, 250.0, 0
+	afterstartHoldTime				= array, F32,	6100,	[8],	"Seconds", 1, 0, 0, 100, 1
+	afterstartEnrich				= array, F32,	6132,	[8],	"%", 1, 0, 0, 600, 1
+	afterstartDecayTime				= array, F32,	6164,	[8],	"Seconds", 1, 0, 0, 100, 1
+	boostTableOpenLoop			 = array, U08, 6196, [8x8],"", 2, 0 , 0, 3000, 0
+;no TS info - skipping unused6312 offset 6260
+	boostRpmBins					= array, U08,	6268,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	boostTableClosedLoop		 = array, U08, 6276, [8x8],"", 2, 0 , 0, 3000, 0
+	boostTpsBins					= array, U08,	6340,	[8],	"%", 2, 0.0, 0, 100.0, 2
+	pedalToTpsTable				 = array, U08, 6348, [8x8],"%", 1, 0, 0, 100, 0
+	pedalToTpsPedalBins				= array, U08,	6412,	[8],	"%", 1, 0, 0.0, 120.0, 0
+	pedalToTpsRpmBins				= array, U08,	6420,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
+	cltCrankingCorrBins				= array, F32,	6428,	[8],	"C", 1, 0, -100.0, 250.0, 2
+	cltCrankingCorr					= array, F32,	6460,	[8],	"%", 1, 0, 0.0, 500.0, 2
+	idleAdvanceBins					= array, F32,	6492,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleAdvance						= array, F32,	6524,	[8],	"deg", 1, 0, -20, 90, 2
+	idleVeBins						= array, F32,	6556,	[8],	"RPM", 1, 0, 0.0, 18000, 2
+	idleVe							= array, F32,	6588,	[8],	,"%", 1, 0, 0, 999.0, 2
+	fsioFormulas1				 = string, ASCII, 6620, 200
+	fsioFormulas2				 = string, ASCII, 6820, 200
+	fsioFormulas3				 = string, ASCII, 7020, 200
+	fsioFormulas4				 = string, ASCII, 7220, 200
+	fsioFormulas5				 = string, ASCII, 7420, 200
+	fsioFormulas6				 = string, ASCII, 7620, 200
+	fsioFormulas7				 = string, ASCII, 7820, 200
+	fsioFormulas8				 = string, ASCII, 8020, 200
+	fsioFormulas9				 = string, ASCII, 8220, 200
+	fsioFormulas10				 = string, ASCII, 8420, 200
+	fsioFormulas11				 = string, ASCII, 8620, 200
+	fsioFormulas12				 = string, ASCII, 8820, 200
+	fsioFormulas13				 = string, ASCII, 9020, 200
+	fsioFormulas14				 = string, ASCII, 9220, 200
+	fsioFormulas15				 = string, ASCII, 9420, 200
+	fsioFormulas16				 = string, ASCII, 9620, 200
+	timingMultiplier			 = string, ASCII, 9820, 200
+	timingAdditive				 = string, ASCII, 10020, 200
+	cltFuelCorrBins					= array, F32,	10220,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltFuelCorr						= array, F32,	10284,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	iatFuelCorrBins					= array, F32,	10348,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	iatFuelCorr						= array, F32,	10412,	[16],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingFuelCoef				= array, F32,	10476,	[8],	"ratio", 1, 0, 0.1, 50.0, 2
+	crankingFuelBins				= array, F32,	10508,	[8],	"C", 1, 0, -80.0, 170.0, 2
+	crankingCycleCoef				= array, F32,	10540,	[8],	"ratio", 1, 0, 0.0, 5.0, 2
+	crankingCycleBins				= array, F32,	10572,	[8],	"counter", 1, 0, -80.0, 170.0, 0
+	cltIdleCorrBins					= array, F32,	10604,	[16],	"C", 1, 0, -100.0, 250.0, 2
+	cltIdleCorr						= array, F32,	10668,	[16],	"ratio", 1, 0, 0.0, 10.0, 2
+	mafDecoding						= array, F32,	10732,	[256],	"kg/hour", 1, 0, -500.0, 4000.0, 2
+	mafDecodingBins					= array, F32,	11756,	[256],	 "V", 1, 0, -5.0, 150.0, 2
+	ignitionIatCorrTable		 = array, F32, 12780, [16x16],"deg", 1, 0, -720, 720, 2
+	ignitionIatCorrLoadBins			= array, F32,	13804,	[16],	"Temperature", 1, 0.0, 0, 500.0, 2
+	ignitionIatCorrRpmBins			= array, F32,	13868,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	injectionPhase				 = array, F32, 13932, [16x16],"deg", 1, 0, -720, 720, 2
+	injPhaseLoadBins				= array, F32,	14956,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	injPhaseRpmBins					= array, F32,	15020,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	fuelTable					 = array, F32, 15084, [16x16],"ms", 1, 0, 0.0, 500.0, 2
+	fuelLoadBins					= array, F32,	16108,	[16],	"V", 1, 0, 0.0, 500.0, 2
+	fuelRpmBins						= array, F32,	16172,	[16],	"RPM", 1, 0, 0.0, 25500.0, 2
+	ignitionTable				 = array, F32, 16236, [16x16],"deg", 1, 0, -20, 90, 2
+	ignitionLoadBins				= array, F32,	17260,	[16],	"Load", 1, 0.0, 0, 500.0, 2
+	ignitionRpmBins					= array, F32,	17324,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	veTable						 = array, F32, 17388, [16x16],"%", 1, 0, 0, 999.0, 2
+	veLoadBins						= array, F32,	18412,	[16],	"kPa", 1, 0.0, 0, 400.0, 2
+	veRpmBins						= array, F32,	18476,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	afrTable					 = array, U08, 18540, [16x16],"deg", 0.1, 0, 0, 25.0, 1
+	afrLoadBins						= array, F32,	18796,	[16],	"", 1, 0.0, 0, 500.0, 2
+	afrRpmBins						= array, F32,	18860,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	tpsTpsAccelTable			 = array, F32, 18924, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelFromRpmBins			= array, F32,	19180,	[8],	"from", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelToRpmBins			= array, F32,	19212,	[8],	"to", 1, 0, 0.0, 25500.0, 2
+	fsioTable1					 = array, F32, 19244, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	fsioTable1LoadBins				= array, F32,	19500,	[8],	"L", 1, 0, 0.0, 30000.0, 2
+	fsioTable1RpmBins				= array, F32,	19532,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable2					 = array, U08, 19564, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable2LoadBins				= array, F32,	19628,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable2RpmBins				= array, F32,	19660,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable3					 = array, U08, 19692, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable3LoadBins				= array, F32,	19756,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable3RpmBins				= array, F32,	19788,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable4					 = array, U08, 19820, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable4LoadBins				= array, F32,	19884,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable4RpmBins				= array, F32,	19916,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+; total TS size = 19948
 [SettingContextHelp]
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
--- a/java_console/models/src/com/rusefi/config/generated/Fields.java
+++ b/java_console/models/src/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.bat integration\rusefi_config.txt Mon May 18 01:21:34 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue May 19 08:38:18 EDT 2020

 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@ -35,22 +35,21 @@ public class Fields {
 	public static final int afr_value1_offset_hex = 238;
 	public static final int afr_value2_offset = 576;
 	public static final int afr_value2_offset_hex = 240;
-	public static final int afrLoadBins_offset = 18848;
-	public static final int afrRpmBins_offset = 18912;
-	public static final int afrTable_offset = 18592;
+	public static final int afrLoadBins_offset = 18796;
+	public static final int afrRpmBins_offset = 18860;
+	public static final int afrTable_offset = 18540;
 	public static final int afterCrankingIACtaperDuration_offset = 2036;
 	public static final int AFTERSTART_DECAY_CURVE_SIZE = 8;
 	public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8;
 	public static final int AFTERSTART_HOLD_CURVE_SIZE = 8;
-	public static final int afterstartCoolantBins_offset = 6120;
-	public static final int afterstartDecayTime_offset = 6216;
-	public static final int afterstartDecayTime_offset_hex = 1848;
-	public static final int afterstartEnrich_offset = 6184;
-	public static final int afterstartEnrich_offset_hex = 1828;
-	public static final int afterstartHoldTime_offset = 6152;
-	public static final int afterstartHoldTime_offset_hex = 1808;
+	public static final int afterstartCoolantBins_offset = 6068;
+	public static final int afterstartDecayTime_offset = 6164;
+	public static final int afterstartDecayTime_offset_hex = 1814;
+	public static final int afterstartEnrich_offset = 6132;
+	public static final int afterstartHoldTime_offset = 6100;
 	public static final int alFIn_offset = 4024;
 	public static final int alignEngineSnifferAtTDC_offset = 744;
+	public static final int alignmentFill_at_4514_offset = 4514;
 	public static final int alternator_antiwindupFreq_offset = 1764;
 	public static final int alternator_derivativeFilterLoss_offset = 1760;
 	public static final int alternatorControl_dFactor_offset = 1724;
@ -195,11 +194,12 @@ public class Fields {
 	public static final int boostPid_periodMs_offset = 1006;
 	public static final int boostPid_pFactor_offset = 992;
 	public static final int boostPwmFrequency_offset = 1016;
-	public static final int boostRpmBins_offset = 6320;
-	public static final int boostTableClosedLoop_offset = 6328;
-	public static final int boostTableOpenLoop_offset = 6248;
-	public static final int boostTableOpenLoop_offset_hex = 1868;
-	public static final int boostTpsBins_offset = 6392;
+	public static final int boostRpmBins_offset = 6268;
+	public static final int boostTableClosedLoop_offset = 6276;
+	public static final int boostTableClosedLoop_offset_hex = 1884;
+	public static final int boostTableOpenLoop_offset = 6196;
+	public static final int boostTableOpenLoop_offset_hex = 1834;
+	public static final int boostTpsBins_offset = 6340;
 	public static final int boostType_offset = 1012;
 	public static final int brakePedalPin_offset = 2608;
 	public static final int brakePedalPinMode_offset = 2611;
@ -246,16 +246,12 @@ public class Fields {
 	public static final int clt_tempC_3_offset = 260;
 	public static final int clt_tempC_3_offset_hex = 104;
 	public static final int CLT_TIMING_CURVE_SIZE = 8;
-	public static final int cltCrankingCorr_offset = 6512;
-	public static final int cltCrankingCorr_offset_hex = 1970;
-	public static final int cltCrankingCorrBins_offset = 6480;
-	public static final int cltCrankingCorrBins_offset_hex = 1950;
-	public static final int cltFuelCorr_offset = 10336;
-	public static final int cltFuelCorr_offset_hex = 2860;
-	public static final int cltFuelCorrBins_offset = 10272;
-	public static final int cltFuelCorrBins_offset_hex = 2820;
-	public static final int cltIdleCorr_offset = 10720;
-	public static final int cltIdleCorrBins_offset = 10656;
+	public static final int cltCrankingCorr_offset = 6460;
+	public static final int cltCrankingCorrBins_offset = 6428;
+	public static final int cltFuelCorr_offset = 10284;
+	public static final int cltFuelCorrBins_offset = 10220;
+	public static final int cltIdleCorr_offset = 10668;
+	public static final int cltIdleCorrBins_offset = 10604;
 	public static final int cltIdleRpm_offset = 1960;
 	public static final int cltIdleRpmBins_offset = 1896;
 	public static final int cltIdleRpmBins_offset_hex = 768;
@ -311,14 +307,10 @@ public class Fields {
 	public static final int crankingAdvanceBins_offset = 3108;
 	public static final int crankingChargeAngle_offset = 104;
 	public static final int crankingChargeAngle_offset_hex = 68;
-	public static final int crankingCycleBins_offset = 10624;
-	public static final int crankingCycleBins_offset_hex = 2980;
-	public static final int crankingCycleCoef_offset = 10592;
-	public static final int crankingCycleCoef_offset_hex = 2960;
-	public static final int crankingFuelBins_offset = 10560;
-	public static final int crankingFuelBins_offset_hex = 2940;
-	public static final int crankingFuelCoef_offset = 10528;
-	public static final int crankingFuelCoef_offset_hex = 2920;
+	public static final int crankingCycleBins_offset = 10572;
+	public static final int crankingCycleCoef_offset = 10540;
+	public static final int crankingFuelBins_offset = 10508;
+	public static final int crankingFuelCoef_offset = 10476;
 	public static final int crankingIACposition_offset = 2228;
 	public static final int crankingInjectionMode_offset = 424;
 	public static final int crankingTimingAngle_offset = 436;
@ -517,27 +509,25 @@ public class Fields {
 	public static final int fsioDigitalInputs7_offset = 958;
 	public static final int fsioDigitalInputs8_offset = 959;
 	public static final int fsioDigitalInputs9_offset = 960;
-	public static final int fsioFormulas10_offset = 8472;
-	public static final int fsioFormulas10_offset_hex = 2118;
-	public static final int fsioFormulas11_offset = 8672;
-	public static final int fsioFormulas12_offset = 8872;
-	public static final int fsioFormulas13_offset = 9072;
-	public static final int fsioFormulas13_offset_hex = 2370;
-	public static final int fsioFormulas14_offset = 9272;
-	public static final int fsioFormulas14_offset_hex = 2438;
-	public static final int fsioFormulas15_offset = 9472;
-	public static final int fsioFormulas15_offset_hex = 2500;
-	public static final int fsioFormulas16_offset = 9672;
-	public static final int fsioFormulas1_offset = 6672;
-	public static final int fsioFormulas2_offset = 6872;
-	public static final int fsioFormulas3_offset = 7072;
-	public static final int fsioFormulas4_offset = 7272;
-	public static final int fsioFormulas5_offset = 7472;
-	public static final int fsioFormulas6_offset = 7672;
-	public static final int fsioFormulas7_offset = 7872;
-	public static final int fsioFormulas8_offset = 8072;
-	public static final int fsioFormulas9_offset = 8272;
-	public static final int fsioFormulas9_offset_hex = 2050;
+	public static final int fsioFormulas10_offset = 8420;
+	public static final int fsioFormulas11_offset = 8620;
+	public static final int fsioFormulas12_offset = 8820;
+	public static final int fsioFormulas12_offset_hex = 2274;
+	public static final int fsioFormulas13_offset = 9020;
+	public static final int fsioFormulas14_offset = 9220;
+	public static final int fsioFormulas14_offset_hex = 2404;
+	public static final int fsioFormulas15_offset = 9420;
+	public static final int fsioFormulas16_offset = 9620;
+	public static final int fsioFormulas16_offset_hex = 2594;
+	public static final int fsioFormulas1_offset = 6620;
+	public static final int fsioFormulas2_offset = 6820;
+	public static final int fsioFormulas3_offset = 7020;
+	public static final int fsioFormulas4_offset = 7220;
+	public static final int fsioFormulas5_offset = 7420;
+	public static final int fsioFormulas6_offset = 7620;
+	public static final int fsioFormulas7_offset = 7820;
+	public static final int fsioFormulas8_offset = 8020;
+	public static final int fsioFormulas9_offset = 8220;
 	public static final int fsioFrequency10_offset = 850;
 	public static final int fsioFrequency10_offset_hex = 352;
 	public static final int fsioFrequency11_offset = 852;
@ -606,18 +596,18 @@ public class Fields {
 	public static final int fsioOutputPins8_offset_hex = 313;
 	public static final int fsioOutputPins9_offset = 788;
 	public static final int fsioOutputPins9_offset_hex = 314;
-	public static final int fsioTable1_offset = 19296;
-	public static final int fsioTable1LoadBins_offset = 19552;
-	public static final int fsioTable1RpmBins_offset = 19584;
-	public static final int fsioTable2_offset = 19616;
-	public static final int fsioTable2LoadBins_offset = 19680;
-	public static final int fsioTable2RpmBins_offset = 19712;
-	public static final int fsioTable3_offset = 19744;
-	public static final int fsioTable3LoadBins_offset = 19808;
-	public static final int fsioTable3RpmBins_offset = 19840;
-	public static final int fsioTable4_offset = 19872;
-	public static final int fsioTable4LoadBins_offset = 19936;
-	public static final int fsioTable4RpmBins_offset = 19968;
+	public static final int fsioTable1_offset = 19244;
+	public static final int fsioTable1LoadBins_offset = 19500;
+	public static final int fsioTable1RpmBins_offset = 19532;
+	public static final int fsioTable2_offset = 19564;
+	public static final int fsioTable2LoadBins_offset = 19628;
+	public static final int fsioTable2RpmBins_offset = 19660;
+	public static final int fsioTable3_offset = 19692;
+	public static final int fsioTable3LoadBins_offset = 19756;
+	public static final int fsioTable3RpmBins_offset = 19788;
+	public static final int fsioTable4_offset = 19820;
+	public static final int fsioTable4LoadBins_offset = 19884;
+	public static final int fsioTable4RpmBins_offset = 19916;
 	public static final int FUEL_LOAD_COUNT = 16;
 	public static final int FUEL_RPM_COUNT = 16;
 	public static final int fuelAlgorithm_offset = 420;
@ -639,14 +629,14 @@ public class Fields {
 	public static final int fuelLevelFullTankVoltage_offset = 688;
 	public static final int fuelLevelSensor_offset = 514;
 	public static final int fuelLevelSensor_offset_hex = 202;
-	public static final int fuelLoadBins_offset = 16160;
+	public static final int fuelLoadBins_offset = 16108;
 	public static final int fuelPumpPin_offset = 658;
 	public static final int fuelPumpPin_offset_hex = 292;
 	public static final int fuelPumpPinMode_offset = 659;
 	public static final int fuelPumpPinMode_offset_hex = 293;
 	public static final int fuelRailPressure_offset = 1756;
-	public static final int fuelRpmBins_offset = 16224;
-	public static final int fuelTable_offset = 15136;
+	public static final int fuelRpmBins_offset = 16172;
+	public static final int fuelTable_offset = 15084;
 	public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time";
 	public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X";
 	public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y";
@ -857,8 +847,8 @@ public class Fields {
 	public static final int iat_tempC_2_offset_hex = 120;
 	public static final int iat_tempC_3_offset = 292;
 	public static final int iat_tempC_3_offset_hex = 124;
-	public static final int iatFuelCorr_offset = 10464;
-	public static final int iatFuelCorrBins_offset = 10400;
+	public static final int iatFuelCorr_offset = 10412;
+	public static final int iatFuelCorrBins_offset = 10348;
 	public static final int IDLE_ADVANCE_CURVE_SIZE = 8;
 	public static final int idle_offset = 600;
 	public static final int idle_offset_hex = 258;
@ -869,9 +859,8 @@ public class Fields {
 	public static final int idle_stepperDirectionPin_offset = 605;
 	public static final int idle_stepperStepPin_offset = 606;
 	public static final int IDLE_VE_CURVE_SIZE = 8;
-	public static final int idleAdvance_offset = 6576;
-	public static final int idleAdvanceBins_offset = 6544;
-	public static final int idleAdvanceBins_offset_hex = 1990;
+	public static final int idleAdvance_offset = 6524;
+	public static final int idleAdvanceBins_offset = 6492;
 	public static final int idleIncrementalPidCic_offset = 744;
 	public static final int idleMode_offset = 1472;
 	public static final int idlePidActivationTime_offset = 2588;
@ -915,21 +904,18 @@ public class Fields {
 	public static final int idleTimingPid_pFactor_offset = 3968;
 	public static final int idleTimingPidDeadZone_offset = 3990;
 	public static final int idleTimingPidWorkZone_offset = 3988;
-	public static final int idleVe_offset = 6640;
-	public static final int idleVeBins_offset = 6608;
+	public static final int idleVe_offset = 6588;
+	public static final int idleVeBins_offset = 6556;
 	public static final int IGN_LOAD_COUNT = 16;
 	public static final int IGN_RPM_COUNT = 16;
 	public static final int IGN_TPS_COUNT = 16;
 	public static final int IGNITION_PIN_COUNT = 12;
 	public static final int ignitionDwellForCrankingMs_offset = 100;
 	public static final int ignitionDwellForCrankingMs_offset_hex = 64;
-	public static final int ignitionIatCorrLoadBins_offset = 13856;
-	public static final int ignitionIatCorrLoadBins_offset_hex = 3620;
-	public static final int ignitionIatCorrRpmBins_offset = 13920;
-	public static final int ignitionIatCorrRpmBins_offset_hex = 3660;
-	public static final int ignitionIatCorrTable_offset = 12832;
-	public static final int ignitionIatCorrTable_offset_hex = 3220;
-	public static final int ignitionLoadBins_offset = 17312;
+	public static final int ignitionIatCorrLoadBins_offset = 13804;
+	public static final int ignitionIatCorrRpmBins_offset = 13868;
+	public static final int ignitionIatCorrTable_offset = 12780;
+	public static final int ignitionLoadBins_offset = 17260;
 	public static final int ignitionMode_offset = 440;
 	public static final int ignitionOffset_offset = 444;
 	public static final int ignitionPinMode_offset = 649;
@ -954,8 +940,8 @@ public class Fields {
 	public static final int ignitionPins8_offset_hex = 283;
 	public static final int ignitionPins9_offset = 644;
 	public static final int ignitionPins9_offset_hex = 284;
-	public static final int ignitionRpmBins_offset = 17376;
-	public static final int ignitionTable_offset = 16288;
+	public static final int ignitionRpmBins_offset = 17324;
+	public static final int ignitionTable_offset = 16236;
 	public static final int ignitionTpsBins_offset = 3800;
 	public static final int ignitionTpsTable_offset = 3288;
 	public static final int ignMathCalculateAtIndex_offset = 1488;
@ -965,7 +951,7 @@ public class Fields {
 	public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up";
 	public static final int INJECTION_PIN_COUNT = 12;
 	public static final int injectionMode_offset = 428;
-	public static final int injectionPhase_offset = 13984;
+	public static final int injectionPhase_offset = 13932;
 	public static final int injectionPinMode_offset = 648;
 	public static final int injectionPinMode_offset_hex = 288;
 	public static final int injectionPins10_offset = 633;
@ -996,8 +982,8 @@ public class Fields {
 	public static final int injector_flow_offset_hex = 8;
 	public static final int injector_offset = 8;
 	public static final int injector_offset_hex = 8;
-	public static final int injPhaseLoadBins_offset = 15008;
-	public static final int injPhaseRpmBins_offset = 15072;
+	public static final int injPhaseLoadBins_offset = 14956;
+	public static final int injPhaseRpmBins_offset = 15020;
 	public static final int invertPrimaryTriggerSignal_offset = 1464;
 	public static final int invertSecondaryTriggerSignal_offset = 1464;
 	public static final int is_enabled_spi_1_offset = 744;
@ -1097,13 +1083,12 @@ public class Fields {
 	public static final int logicAnalyzerPins4_offset = 751;
 	public static final int MAF_DECODING_COUNT = 256;
 	public static final int mafAdcChannel_offset = 543;
-	public static final int mafDecoding_offset = 10784;
-	public static final int mafDecodingBins_offset = 11808;
+	public static final int mafDecoding_offset = 10732;
+	public static final int mafDecodingBins_offset = 11756;
 	public static final int mafSensorType_offset = 948;
 	public static final int mainRelayPin_offset = 706;
 	public static final int mainRelayPinMode_offset = 752;
-	public static final int mainUnusedEnd_offset = 4496;
-	public static final int mainUnusedEnd_offset_hex = 1190;
+	public static final int mainUnusedEnd_offset = 4516;
 	public static final int malfunctionIndicatorPin_offset = 660;
 	public static final int malfunctionIndicatorPin_offset_hex = 294;
 	public static final int malfunctionIndicatorPinMode_offset = 661;
@ -1163,6 +1148,20 @@ public class Fields {
 	public static final int mc33972_csPinMode_offset = 679;
 	public static final int mc33972spiDevice_offset = 4008;
 	public static final int mc33_hvolt_offset = 760;
+	public static final int mc33_i_boost_offset = 4496;
+	public static final int mc33_i_boost_offset_hex = 1190;
+	public static final int mc33_i_hold_offset = 4500;
+	public static final int mc33_i_hold_offset_hex = 1194;
+	public static final int mc33_i_peak_offset = 4498;
+	public static final int mc33_i_peak_offset_hex = 1192;
+	public static final int mc33_t_bypass_offset = 4508;
+	public static final int mc33_t_hold_off_offset = 4510;
+	public static final int mc33_t_hold_tot_offset = 4512;
+	public static final int mc33_t_max_boost_offset = 4502;
+	public static final int mc33_t_max_boost_offset_hex = 1196;
+	public static final int mc33_t_peak_off_offset = 4504;
+	public static final int mc33_t_peak_off_offset_hex = 1198;
+	public static final int mc33_t_peak_tot_offset = 4506;
 	public static final int measureMapOnlyInOneCylinder_offset = 744;
 	public static final String MOCK_AFR_COMMAND = "mock_afr_voltage";
 	public static final String MOCK_CLT_COMMAND = "mock_clt_voltage";
@ -1205,12 +1204,10 @@ public class Fields {
 	public static final int PACK_MULT_VOLTAGE = 1000;
 	public static final int pauseEtbControl_offset = 744;
 	public static final int PEDAL_TO_TPS_SIZE = 8;
-	public static final int pedalToTpsPedalBins_offset = 6464;
-	public static final int pedalToTpsPedalBins_offset_hex = 1940;
-	public static final int pedalToTpsRpmBins_offset = 6472;
-	public static final int pedalToTpsRpmBins_offset_hex = 1948;
-	public static final int pedalToTpsTable_offset = 6400;
-	public static final int pedalToTpsTable_offset_hex = 1900;
+	public static final int pedalToTpsPedalBins_offset = 6412;
+	public static final int pedalToTpsRpmBins_offset = 6420;
+	public static final int pedalToTpsRpmBins_offset_hex = 1914;
+	public static final int pedalToTpsTable_offset = 6348;
 	public static final int pidExtraForLowRpm_offset = 3156;
 	public static final int postCrankingDurationSec_offset = 2440;
 	public static final int postCrankingDurationSec_offset_hex = 988;
@ -1387,11 +1384,10 @@ public class Fields {
 	public static final int timing_offset_cylinder7_offset = 2564;
 	public static final int timing_offset_cylinder8_offset = 2568;
 	public static final int timing_offset_cylinder9_offset = 2572;
-	public static final int timingAdditive_offset = 10072;
-	public static final int timingAdditive_offset_hex = 2758;
+	public static final int timingAdditive_offset = 10020;
+	public static final int timingAdditive_offset_hex = 2724;
 	public static final int timingMode_offset = 448;
-	public static final int timingMultiplier_offset = 9872;
-	public static final int timingMultiplier_offset_hex = 2690;
+	public static final int timingMultiplier_offset = 9820;
 	public static final int tle6240_cs_offset = 581;
 	public static final int tle6240_cs_offset_hex = 245;
 	public static final int tle6240_csPinMode_offset = 582;
@ -1408,7 +1404,7 @@ public class Fields {
 	public static final int TOOTH_PACKET_COUNT = 1000;
 	public static final int TOOTH_PACKET_SIZE = 2;
 	public static final String TOP_DEAD_CENTER_MESSAGE = "r";
-	public static final int TOTAL_CONFIG_SIZE = 20000;
+	public static final int TOTAL_CONFIG_SIZE = 19948;
 	public static final int tps1_1AdcChannel_offset = 512;
 	public static final int tps1_1AdcChannel_offset_hex = 200;
 	public static final int tps1_2AdcChannel_offset = 681;
@ -1442,9 +1438,9 @@ public class Fields {
 	public static final int tpsMax_offset_hex = 52;
 	public static final int tpsMin_offset = 80;
 	public static final int tpsMin_offset_hex = 50;
-	public static final int tpsTpsAccelFromRpmBins_offset = 19232;
-	public static final int tpsTpsAccelTable_offset = 18976;
-	public static final int tpsTpsAccelToRpmBins_offset = 19264;
+	public static final int tpsTpsAccelFromRpmBins_offset = 19180;
+	public static final int tpsTpsAccelTable_offset = 18924;
+	public static final int tpsTpsAccelToRpmBins_offset = 19212;
 	public static final int trigger_customSkippedToothCount_offset = 536;
 	public static final int trigger_customSkippedToothCount_offset_hex = 218;
 	public static final int trigger_customTotalToothCount_offset = 532;
@ -1546,7 +1542,8 @@ public class Fields {
 	public static final int unused1476b20_offset = 1476;
 	public static final int unused2432_offset = 2432;
 	public static final int unused2432_offset_hex = 980;
-	public static final int unused6312_offset = 6312;
+	public static final int unused6312_offset = 6260;
+	public static final int unused6312_offset_hex = 1874;
 	public static final int unused711_offset = 711;
 	public static final int unused806_offset = 806;
 	public static final int unused806_offset_hex = 326;
@ -1643,23 +1640,19 @@ public class Fields {
 	public static final int vehicleName_offset_hex = 488;
 	public static final int vehicleSpeedCoef_offset = 476;
 	public static final int vehicleSpeedSensorInputPin_offset = 968;
-	public static final int veLoadBins_offset = 18464;
-	public static final int veLoadBins_offset_hex = 4820;
+	public static final int veLoadBins_offset = 18412;
 	public static final int verboseCanBaseAddress_offset = 756;
 	public static final int verboseTLE8888_offset = 744;
 	public static final int verboseTriggerSynchDetails_offset = 1476;
-	public static final int veRpmBins_offset = 18528;
-	public static final int veRpmBins_offset_hex = 4860;
-	public static final int veTable_offset = 17440;
-	public static final int veTable_offset_hex = 4420;
+	public static final int veRpmBins_offset = 18476;
+	public static final int veTable_offset = 17388;
 	public static final int vRefAdcChannel_offset = 1470;
 	public static final int vvtCamSensorUseRise_offset = 744;
 	public static final int vvtMode_offset = 2328;
 	public static final int vvtMode_offset_hex = 918;
 	public static final int vvtOffset_offset = 2052;
 	public static final int vvtOffset_offset_hex = 804;
-	public static final int warning_message_offset = 6000;
-	public static final int warning_message_offset_hex = 1770;
+	public static final int warning_message_offset = 5948;
 	public static final int warningLedPin_offset = 2041;
 	public static final int warningPeriod_offset = 1498;
 	public static final int wboHeaterPin_offset = 673;
@ -2619,39 +2612,48 @@ public class Fields {
 	public static final Field GPPWM4_LOADAXIS = Field.create("GPPWM4_LOADAXIS", 4414, FieldType.INT8, gppwm_channel_e);
 	public static final Field GPPWM4_PAD = Field.create("GPPWM4_PAD", 4415, FieldType.INT8);
 	public static final Field GPPWM4_TABLE = Field.create("GPPWM4_TABLE", 4432, FieldType.INT);
-	public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6000, FieldType.INT);
-	public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6248, FieldType.INT);
-	public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6328, FieldType.INT);
-	public static final Field PEDALTOTPSTABLE = Field.create("PEDALTOTPSTABLE", 6400, FieldType.INT);
-	public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT);
-	public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT);
-	public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.INT);
-	public static final Field FSIOFORMULAS4 = Field.create("FSIOFORMULAS4", 7272, FieldType.INT);
-	public static final Field FSIOFORMULAS5 = Field.create("FSIOFORMULAS5", 7472, FieldType.INT);
-	public static final Field FSIOFORMULAS6 = Field.create("FSIOFORMULAS6", 7672, FieldType.INT);
-	public static final Field FSIOFORMULAS7 = Field.create("FSIOFORMULAS7", 7872, FieldType.INT);
-	public static final Field FSIOFORMULAS8 = Field.create("FSIOFORMULAS8", 8072, FieldType.INT);
-	public static final Field FSIOFORMULAS9 = Field.create("FSIOFORMULAS9", 8272, FieldType.INT);
-	public static final Field FSIOFORMULAS10 = Field.create("FSIOFORMULAS10", 8472, FieldType.INT);
-	public static final Field FSIOFORMULAS11 = Field.create("FSIOFORMULAS11", 8672, FieldType.INT);
-	public static final Field FSIOFORMULAS12 = Field.create("FSIOFORMULAS12", 8872, FieldType.INT);
-	public static final Field FSIOFORMULAS13 = Field.create("FSIOFORMULAS13", 9072, FieldType.INT);
-	public static final Field FSIOFORMULAS14 = Field.create("FSIOFORMULAS14", 9272, FieldType.INT);
-	public static final Field FSIOFORMULAS15 = Field.create("FSIOFORMULAS15", 9472, FieldType.INT);
-	public static final Field FSIOFORMULAS16 = Field.create("FSIOFORMULAS16", 9672, FieldType.INT);
-	public static final Field TIMINGMULTIPLIER = Field.create("TIMINGMULTIPLIER", 9872, FieldType.INT);
-	public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 10072, FieldType.INT);
-	public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 12832, FieldType.INT);
-	public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 13984, FieldType.INT);
-	public static final Field FUELTABLE = Field.create("FUELTABLE", 15136, FieldType.INT);
-	public static final Field IGNITIONTABLE = Field.create("IGNITIONTABLE", 16288, FieldType.INT);
-	public static final Field VETABLE = Field.create("VETABLE", 17440, FieldType.INT);
-	public static final Field AFRTABLE = Field.create("AFRTABLE", 18592, FieldType.INT);
-	public static final Field TPSTPSACCELTABLE = Field.create("TPSTPSACCELTABLE", 18976, FieldType.INT);
-	public static final Field FSIOTABLE1 = Field.create("FSIOTABLE1", 19296, FieldType.INT);
-	public static final Field FSIOTABLE2 = Field.create("FSIOTABLE2", 19616, FieldType.INT);
-	public static final Field FSIOTABLE3 = Field.create("FSIOTABLE3", 19744, FieldType.INT);
-	public static final Field FSIOTABLE4 = Field.create("FSIOTABLE4", 19872, FieldType.INT);
+	public static final Field MC33_I_BOOST = Field.create("MC33_I_BOOST", 4496, FieldType.INT16);
+	public static final Field MC33_I_PEAK = Field.create("MC33_I_PEAK", 4498, FieldType.INT16);
+	public static final Field MC33_I_HOLD = Field.create("MC33_I_HOLD", 4500, FieldType.INT16);
+	public static final Field MC33_T_MAX_BOOST = Field.create("MC33_T_MAX_BOOST", 4502, FieldType.INT16);
+	public static final Field MC33_T_PEAK_OFF = Field.create("MC33_T_PEAK_OFF", 4504, FieldType.INT16);
+	public static final Field MC33_T_PEAK_TOT = Field.create("MC33_T_PEAK_TOT", 4506, FieldType.INT16);
+	public static final Field MC33_T_BYPASS = Field.create("MC33_T_BYPASS", 4508, FieldType.INT16);
+	public static final Field MC33_T_HOLD_OFF = Field.create("MC33_T_HOLD_OFF", 4510, FieldType.INT16);
+	public static final Field MC33_T_HOLD_TOT = Field.create("MC33_T_HOLD_TOT", 4512, FieldType.INT16);
+	public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 5948, FieldType.INT);
+	public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6196, FieldType.INT);
+	public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6276, FieldType.INT);
+	public static final Field PEDALTOTPSTABLE = Field.create("PEDALTOTPSTABLE", 6348, FieldType.INT);
+	public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6620, FieldType.INT);
+	public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6820, FieldType.INT);
+	public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7020, FieldType.INT);
+	public static final Field FSIOFORMULAS4 = Field.create("FSIOFORMULAS4", 7220, FieldType.INT);
+	public static final Field FSIOFORMULAS5 = Field.create("FSIOFORMULAS5", 7420, FieldType.INT);
+	public static final Field FSIOFORMULAS6 = Field.create("FSIOFORMULAS6", 7620, FieldType.INT);
+	public static final Field FSIOFORMULAS7 = Field.create("FSIOFORMULAS7", 7820, FieldType.INT);
+	public static final Field FSIOFORMULAS8 = Field.create("FSIOFORMULAS8", 8020, FieldType.INT);
+	public static final Field FSIOFORMULAS9 = Field.create("FSIOFORMULAS9", 8220, FieldType.INT);
+	public static final Field FSIOFORMULAS10 = Field.create("FSIOFORMULAS10", 8420, FieldType.INT);
+	public static final Field FSIOFORMULAS11 = Field.create("FSIOFORMULAS11", 8620, FieldType.INT);
+	public static final Field FSIOFORMULAS12 = Field.create("FSIOFORMULAS12", 8820, FieldType.INT);
+	public static final Field FSIOFORMULAS13 = Field.create("FSIOFORMULAS13", 9020, FieldType.INT);
+	public static final Field FSIOFORMULAS14 = Field.create("FSIOFORMULAS14", 9220, FieldType.INT);
+	public static final Field FSIOFORMULAS15 = Field.create("FSIOFORMULAS15", 9420, FieldType.INT);
+	public static final Field FSIOFORMULAS16 = Field.create("FSIOFORMULAS16", 9620, FieldType.INT);
+	public static final Field TIMINGMULTIPLIER = Field.create("TIMINGMULTIPLIER", 9820, FieldType.INT);
+	public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 10020, FieldType.INT);
+	public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 12780, FieldType.INT);
+	public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 13932, FieldType.INT);
+	public static final Field FUELTABLE = Field.create("FUELTABLE", 15084, FieldType.INT);
+	public static final Field IGNITIONTABLE = Field.create("IGNITIONTABLE", 16236, FieldType.INT);
+	public static final Field VETABLE = Field.create("VETABLE", 17388, FieldType.INT);
+	public static final Field AFRTABLE = Field.create("AFRTABLE", 18540, FieldType.INT);
+	public static final Field TPSTPSACCELTABLE = Field.create("TPSTPSACCELTABLE", 18924, FieldType.INT);
+	public static final Field FSIOTABLE1 = Field.create("FSIOTABLE1", 19244, FieldType.INT);
+	public static final Field FSIOTABLE2 = Field.create("FSIOTABLE2", 19564, FieldType.INT);
+	public static final Field FSIOTABLE3 = Field.create("FSIOTABLE3", 19692, FieldType.INT);
+	public static final Field FSIOTABLE4 = Field.create("FSIOTABLE4", 19820, FieldType.INT);
 	public static final Field[] VALUES = {
 	ENGINETYPE,
 	ENGINESNIFFERRPMTHRESHOLD,
@ -3587,6 +3589,15 @@ public class Fields {
 	GPPWM4_LOADAXIS,
 	GPPWM4_PAD,
 	GPPWM4_TABLE,
+	MC33_I_BOOST,
+	MC33_I_PEAK,
+	MC33_I_HOLD,
+	MC33_T_MAX_BOOST,
+	MC33_T_PEAK_OFF,
+	MC33_T_PEAK_TOT,
+	MC33_T_BYPASS,
+	MC33_T_HOLD_OFF,
+	MC33_T_HOLD_TOT,
 	WARNING_MESSAGE,
 	BOOSTTABLEOPENLOOP,
 	BOOSTTABLECLOSEDLOOP,
--- 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 Fri Jul 12 14:02:51 EDT 2019 -->
+<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat Tue May 19 08:38:19 EDT 2020 -->

    <rom>
        <romid>
@ -10,20 +10,20 @@
            <ecuid>RUSEFI</ecuid>
            <make>rusEfi</make>
            <model>rusEfi</model>
-            <filesize>20000</filesize>
+            <filesize>19948</filesize>
        </romid>

        <table type="3D" name="Ignition Advance"
        category="Ignition"
-        storageaddress="3fa0"
+        storageaddress="3f6c"
               sizex="16" sizey="16" storagetype="float" endian="big">
            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                     coarseincrement="1"/>
-            <table type="X Axis" storageaddress="43e0" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="43ac" storagetype="float" endian="big"
                   logparam="rpm">
                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
-            <table type="Y Axis" storageaddress="43a0" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="436c" storagetype="float" endian="big"
                   logparam="engine_load">
                <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                         coarseincrement="1"/>
@ -32,15 +32,15 @@

        <table type="3D" name="Ignition Advance IAT correction" 
        category="Ignition"
-        storageaddress="3220"
+        storageaddress="31ec"
               sizex="16" sizey="16" storagetype="float" endian="big">
            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                     coarseincrement="1"/>
-            <table type="X Axis" storageaddress="3660" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="362c" storagetype="float" endian="big"
                   logparam="rpm">
                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
-            <table type="Y Axis" storageaddress="3620" storagetype="float"
+            <table type="Y Axis" storageaddress="35ec" storagetype="float"
                   endian="big" logparam="engine_load">
                <scaling units="temperature, C" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                         coarseincrement="1"/>
@ -49,15 +49,15 @@

        <table type="3D" name="Volumetric Efficiency"
        category="Fuel"
-        storageaddress="4420"
+        storageaddress="43ec"
               sizex="16" sizey="16" storagetype="float" endian="big">
            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                     coarseincrement="1"/>
-            <table type="X Axis" storageaddress="4860" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="482c" storagetype="float" endian="big"
                   logparam="rpm">
                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
-            <table type="Y Axis" storageaddress="4820" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="47ec" storagetype="float" endian="big"
                   logparam="engine_load">
                <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                         coarseincrement="1"/>
@ -66,16 +66,16 @@

        <table type="3D" name="Fuel Table" 
        category="Fuel"
-        storageaddress="3b20" sizex="16"
+        storageaddress="3aec" sizex="16"
               sizey="16" storagetype="float" endian="big">
            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                     coarseincrement="1"/>
-            <table type="X Axis" storageaddress="3f60" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="3f2c" storagetype="float" endian="big"
                   logparam="engine_load">
                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                         coarseincrement="1"/>
            </table>
-            <table type="Y Axis" storageaddress="3f20" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="3eec" storagetype="float" endian="big"
                   logparam="rpm">
                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
@ -83,16 +83,16 @@

        <table type="3D" name="FSIO Table #1" 
        category="FSIO"
-        storageaddress="4b60" sizex="8"
+        storageaddress="4b2c" sizex="8"
               sizey="8" storagetype="float" endian="big">
            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                     coarseincrement="1"/>
-            <table type="X Axis" storageaddress="4c80" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="4c4c" storagetype="float" endian="big"
                   logparam="">
                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                         coarseincrement="1"/>
            </table>
-            <table type="Y Axis" storageaddress="4c60" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="4c2c" storagetype="float" endian="big"
                   logparam="rpm">
                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
@ -100,16 +100,16 @@

        <table type="3D" name="FSIO Table #2" 
        category="FSIO"
-        storageaddress="4ca0" sizex="8"
+        storageaddress="4c6c" sizex="8"
               sizey="8" storagetype="uint8" endian="big">
            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                     coarseincrement="1"/>
-            <table type="X Axis" storageaddress="4d00" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="4ccc" storagetype="float" endian="big"
                   logparam="engine_load">
                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                         coarseincrement="1"/>
            </table>
-            <table type="Y Axis" storageaddress="4ce0" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="4cac" storagetype="float" endian="big"
                   logparam="rpm">
                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
@ -117,16 +117,16 @@

        <table type="3D" name="FSIO Table #3" 
        category="FSIO"
-        storageaddress="4d20" sizex="8"
+        storageaddress="4cec" sizex="8"
               sizey="8" storagetype="uint8" endian="big">
            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                     coarseincrement="1"/>
-            <table type="X Axis" storageaddress="4d80" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="4d4c" storagetype="float" endian="big"
                   logparam="">
                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                         coarseincrement="1"/>
            </table>
-            <table type="Y Axis" storageaddress="4d60" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="4d2c" storagetype="float" endian="big"
                   logparam="rpm">
                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
@ -134,16 +134,16 @@

        <table type="3D" name="FSIO Table #4" 
        category="FSIO"
-        storageaddress="4da0" sizex="8"
+        storageaddress="4d6c" sizex="8"
               sizey="8" storagetype="uint8" endian="big">
            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                     coarseincrement="1"/>
-            <table type="X Axis" storageaddress="4e00" storagetype="float" endian="big"
+            <table type="X Axis" storageaddress="4dcc" storagetype="float" endian="big"
                   logparam="engine_load">
                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                         coarseincrement="1"/>
            </table>
-            <table type="Y Axis" storageaddress="4de0" storagetype="float" endian="big"
+            <table type="Y Axis" storageaddress="4dac" storagetype="float" endian="big"
                   logparam="engine_load">
                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
@ -151,15 +151,15 @@

        <table type="3D" name="Target AFR"
        category="Fuel"
-        storageaddress="48a0" sizex="16"
+        storageaddress="486c" sizex="16"
               sizey="16" storagetype="uint8" endian="big">
            <scaling units="Engine Load" expression="x/10" to_byte="x*10" format="0.00" fineincrement=".1"
                     coarseincrement="1"/>
-            <table type="X Axis" storageaddress="49e0" storagetype="float" endian="big">
+            <table type="X Axis" storageaddress="49ac" storagetype="float" endian="big">
                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                         coarseincrement="1"/>
            </table>
-            <table type="Y Axis" storageaddress="49a0" storagetype="float" endian="big">
+            <table type="Y Axis" storageaddress="496c" storagetype="float" endian="big">
                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
        </table>
@ -179,11 +179,11 @@

        <table type="2D" name="Coolant-based Warnup Enrichment"
        category="Fuel"
-        storageaddress="2860" sizex="16"
+        storageaddress="282c" sizex="16"
               storagetype="float" endian="big">
            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
                     fineincrement=".01" coarseincrement="0.1"/>
-            <table type="X Axis" storageaddress="2820" storagetype="float" endian="big">
+            <table type="X Axis" storageaddress="27ec" storagetype="float" endian="big">
                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
        </table>
@ -208,11 +208,11 @@
            </table>
        </table>

-        <table type="2D" name="Coolant temperature-based extra idle air" storageaddress="29e0"
+        <table type="2D" name="Coolant temperature-based extra idle air" storageaddress="29ac"
               sizex="16" storagetype="float" endian="big">
            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
                     fineincrement=".01" coarseincrement="0.1"/>
-            <table type="X Axis" storageaddress="29a0" storagetype="float" endian="big">
+            <table type="X Axis" storageaddress="296c" storagetype="float" endian="big">
                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
            </table>
        </table>