From a86ed4b618f2754cbaf0fed2438148ebd185a790 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Fri, 1 Jul 2016 23:01:22 -0400
Subject: [PATCH] auto-sync

---
 .../controllers/algo/engine_configuration.cpp |  6 +-
 ...ngine_configuration_generated_structures.h | 58 +++++++++++-----
 firmware/controllers/algo/nmea.c              |  6 +-
 firmware/controllers/algo/rusefi_generated.h  | 48 +++++++------
 firmware/controllers/algo/rusefi_types.h      |  5 +-
 firmware/controllers/core/fsio_core.cpp       |  4 +-
 firmware/controllers/core/fsio_impl.cpp       |  8 ++-
 firmware/controllers/core/table_helper.h      |  7 +-
 firmware/controllers/flash_main.h             |  2 +-
 firmware/controllers/math/speed_density.cpp   |  2 +-
 firmware/integration/rusefi.xml               |  4 +-
 firmware/integration/rusefi_config.txt        | 19 ++++--
 firmware/rusefi.cpp                           |  2 +-
 firmware/tunerstudio/rusefi.ini               | 49 ++++++++-----
 .../io/src/com/rusefi/TsPageSize.java         |  2 +-
 .../models/src/com/rusefi/config/Fields.java  | 68 +++++++++++--------
 java_console/rusefi.xml                       | 10 +--
 17 files changed, 193 insertions(+), 107 deletions(-)

diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index ac9503ae24..5f1ef2a25a 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -134,7 +134,7 @@ void setConstantDwell(floatms_t dwellMs DECLARE_ENGINE_PARAMETER_S) {
 void setAfrMap(afr_table_t table, float value) {
 	for (int l = 0; l < FUEL_LOAD_COUNT; l++) {
 		for (int rpmIndex = 0; rpmIndex < FUEL_RPM_COUNT; rpmIndex++) {
-			table[l][rpmIndex] = value;
+			table[l][rpmIndex] = (int)(value * AFR_STORAGE_MULT);
 		}
 	}
 }
@@ -394,6 +394,10 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 	setRpmTableBin(config->fsioTable1RpmBins, FSIO_TABLE_8);
 	setTableBin2(config->fsioTable2LoadBins, FSIO_TABLE_8, 20, 120, 10);
 	setRpmTableBin(config->fsioTable2RpmBins, FSIO_TABLE_8);
+	setTableBin2(config->fsioTable3LoadBins, FSIO_TABLE_8, 20, 120, 10);
+	setRpmTableBin(config->fsioTable3RpmBins, FSIO_TABLE_8);
+	setTableBin2(config->fsioTable4LoadBins, FSIO_TABLE_8, 20, 120, 10);
+	setRpmTableBin(config->fsioTable4RpmBins, FSIO_TABLE_8);
 
 	initEngineNoiseTable(PASS_ENGINE_PARAMETER_F);
 
diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h
index f57795b204..2892563ff5 100644
--- a/firmware/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/controllers/algo/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 01 14:38:02 EDT 2016
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 01 17:21:02 EDT 2016
 // begin
 #ifndef ENGINE_CONFIGURATION_GENERATED_H_
 #define ENGINE_CONFIGURATION_GENERATED_H_
@@ -1797,55 +1797,81 @@ typedef struct {
 	 */
 	afr_table_t afrTable;
 	/**
-	 * offset 15992
+	 * offset 15224
 	 */
 	float afrLoadBins[FUEL_LOAD_COUNT];
 	/**
-	 * offset 16056
+	 * offset 15288
 	 */
 	float afrRpmBins[FUEL_RPM_COUNT];
 	/**
-	 * offset 16120
+	 * offset 15352
 	 */
 	tps_tps_table_t tpsTpsAccelTable;
 	/**
-	 * offset 16376
+	 * offset 15608
 	 */
 	float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 16408
+	 * offset 15640
 	 */
 	float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE];
 	/**
-	 * offset 16440
+	 * offset 15672
 	 */
-	fsio_table_8x8_t fsioTable1;
+	fsio_table_8x8_f32t fsioTable1;
 	/**
-	 * offset 16696
+	 * offset 15928
 	 */
 	float fsioTable1LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 16728
+	 * offset 15960
 	 */
 	float fsioTable1RpmBins[FSIO_TABLE_8];
 	/**
-	 * offset 16760
+	 * offset 15992
 	 */
-	fsio_table_8x8_t fsioTable2;
+	fsio_table_8x8_u8t fsioTable2;
 	/**
-	 * offset 17016
+	 * offset 16056
 	 */
 	float fsioTable2LoadBins[FSIO_TABLE_8];
 	/**
 	 * RPM is float and not integer in order to use unified methods for interpolation
-	 * offset 17048
+	 * offset 16088
 	 */
 	float fsioTable2RpmBins[FSIO_TABLE_8];
-	/** total size 17080*/
+	/**
+	 * offset 16120
+	 */
+	fsio_table_8x8_u8t fsioTable3;
+	/**
+	 * offset 16184
+	 */
+	float fsioTable3LoadBins[FSIO_TABLE_8];
+	/**
+	 * RPM is float and not integer in order to use unified methods for interpolation
+	 * offset 16216
+	 */
+	float fsioTable3RpmBins[FSIO_TABLE_8];
+	/**
+	 * offset 16248
+	 */
+	fsio_table_8x8_u8t fsioTable4;
+	/**
+	 * offset 16312
+	 */
+	float fsioTable4LoadBins[FSIO_TABLE_8];
+	/**
+	 * RPM is float and not integer in order to use unified methods for interpolation
+	 * offset 16344
+	 */
+	float fsioTable4RpmBins[FSIO_TABLE_8];
+	/** total size 16376*/
 } persistent_config_s;
 
 #endif
 // end
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 01 14:38:02 EDT 2016
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 01 17:21:02 EDT 2016
diff --git a/firmware/controllers/algo/nmea.c b/firmware/controllers/algo/nmea.c
index 32b6419d96..4bb3c56949 100644
--- a/firmware/controllers/algo/nmea.c
+++ b/firmware/controllers/algo/nmea.c
@@ -52,9 +52,9 @@ float gps_deg_dec(float deg_point) {
 	int deg = (int) (ddeg / 100);
 	int min = (int) (deg_point - (deg * 100));
 
-	float absdlat = roundf(deg * 1000000.);
-	float absmlat = roundf(min * 1000000.);
-	float absslat = roundf(sec * 1000000.);
+	float absdlat = round(deg * 1000000.);
+	float absmlat = round(min * 1000000.);
+	float absslat = round(sec * 1000000.);
 
 	return round(absdlat + (absmlat / 60) + (absslat / 3600)) / 1000000;
 }
diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h
index b87927f16e..699e41a703 100644
--- a/firmware/controllers/algo/rusefi_generated.h
+++ b/firmware/controllers/algo/rusefi_generated.h
@@ -837,8 +837,15 @@
 #define auxPid1_offset_offset 2424
 #define auxPid1_offset_offset_hex 978
 #define crankingIdleAdjustment_offset 2428
-#define unused_offset 2432
-#define unused_offset_hex 980
+#define tChargeMinRpmMinTps_offset 2432
+#define tChargeMinRpmMinTps_offset_hex 980
+#define tChargeMinRpmMaxTps_offset 2436
+#define tChargeMinRpmMaxTps_offset_hex 984
+#define tChargeMaxRpmMinTps_offset 2440
+#define tChargeMaxRpmMinTps_offset_hex 988
+#define tChargeMaxRpmMaxTps_offset 2444
+#define unused_offset 2448
+#define unused_offset_hex 990
 #define le_formulas1_offset 3048
 #define le_formulas2_offset 3248
 #define le_formulas3_offset 3448
@@ -898,22 +905,21 @@
 #define veLoadBins_offset 14840
 #define veRpmBins_offset 14904
 #define afrTable_offset 14968
-#define afrLoadBins_offset 15992
-#define afrRpmBins_offset 16056
-#define tpsTpsAccelTable_offset 16120
-#define tpsTpsAccelFromRpmBins_offset 16376
-#define tpsTpsAccelToRpmBins_offset 16408
-#define tpsTpsAccelToRpmBins_offset_hex 4018
-#define fsioTable1_offset 16440
-#define fsioTable1_offset_hex 4038
-#define fsioTable1LoadBins_offset 16696
-#define fsioTable1LoadBins_offset_hex 4138
-#define fsioTable1RpmBins_offset 16728
-#define fsioTable1RpmBins_offset_hex 4158
-#define fsioTable2_offset 16760
-#define fsioTable2_offset_hex 4178
-#define fsioTable2LoadBins_offset 17016
-#define fsioTable2LoadBins_offset_hex 4278
-#define fsioTable2RpmBins_offset 17048
-#define fsioTable2RpmBins_offset_hex 4298
-#define TOTAL_CONFIG_SIZE 17080
+#define afrLoadBins_offset 15224
+#define afrRpmBins_offset 15288
+#define tpsTpsAccelTable_offset 15352
+#define tpsTpsAccelFromRpmBins_offset 15608
+#define tpsTpsAccelToRpmBins_offset 15640
+#define fsioTable1_offset 15672
+#define fsioTable1LoadBins_offset 15928
+#define fsioTable1RpmBins_offset 15960
+#define fsioTable2_offset 15992
+#define fsioTable2LoadBins_offset 16056
+#define fsioTable2RpmBins_offset 16088
+#define fsioTable3_offset 16120
+#define fsioTable3LoadBins_offset 16184
+#define fsioTable3RpmBins_offset 16216
+#define fsioTable4_offset 16248
+#define fsioTable4LoadBins_offset 16312
+#define fsioTable4RpmBins_offset 16344
+#define TOTAL_CONFIG_SIZE 16376
diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h
index b37358a95b..538f2ead3b 100644
--- a/firmware/controllers/algo/rusefi_types.h
+++ b/firmware/controllers/algo/rusefi_types.h
@@ -54,13 +54,15 @@ typedef char le_formula_t[LE_COMMAND_LENGTH];
 
 typedef brain_pin_e egt_cs_array_t[EGT_CHANNEL_COUNT];
 
+typedef uint8_t afr_table_t[FUEL_LOAD_COUNT][FUEL_RPM_COUNT];
 // todo: merge these two types together? but these tables have different TS parameters like ranges etc
 typedef float fuel_table_t[FUEL_LOAD_COUNT][FUEL_RPM_COUNT];
 typedef float ignition_table_t[IGN_LOAD_COUNT][IGN_RPM_COUNT];
 
 typedef float baro_corr_table_t[BARO_CORR_SIZE][BARO_CORR_SIZE];
 
-typedef float fsio_table_8x8_t[FSIO_TABLE_8][FSIO_TABLE_8];
+typedef float fsio_table_8x8_f32t[FSIO_TABLE_8][FSIO_TABLE_8];
+typedef uint8_t fsio_table_8x8_u8t[FSIO_TABLE_8][FSIO_TABLE_8];
 typedef float tps_tps_table_t[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE];
 
 
@@ -78,7 +80,6 @@ typedef float fsio_setting_t;
 typedef brain_pin_e brain_input_pin_e;
 
 typedef fuel_table_t ve_table_t;
-typedef fuel_table_t afr_table_t;
 
 typedef void (*VoidPtr)(void*);
 
diff --git a/firmware/controllers/core/fsio_core.cpp b/firmware/controllers/core/fsio_core.cpp
index e7c8855019..8807cf7ab1 100644
--- a/firmware/controllers/core/fsio_core.cpp
+++ b/firmware/controllers/core/fsio_core.cpp
@@ -21,7 +21,7 @@
 #include "fsio_impl.h"
 
 extern fsio8_Map3D_f32t fsioTable1;
-extern fsio8_Map3D_f32t fsioTable2;
+extern fsio8_Map3D_u8t fsioTable2;
 
 LENameOrdinalPair * LE_FIRST = NULL;
 
@@ -270,7 +270,7 @@ bool LECalculator::processElement(Engine *engine, LEElement *element) {
 
 				push(element->action, t->getValue(xValue, yValue));
 			} else {
-				fsio8_Map3D_f32t *t = &fsioTable2;
+				fsio8_Map3D_u8t *t = &fsioTable2;
 
 				push(element->action, t->getValue(xValue, yValue));
 			}
diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp
index 9bc52316df..5685074074 100644
--- a/firmware/controllers/core/fsio_impl.cpp
+++ b/firmware/controllers/core/fsio_impl.cpp
@@ -18,7 +18,9 @@
 #define NO_PWM 0
 
 fsio8_Map3D_f32t fsioTable1("fsio#1");
-fsio8_Map3D_f32t fsioTable2("fsio#2");
+fsio8_Map3D_u8t fsioTable2("fsio#2");
+fsio8_Map3D_u8t fsioTable3("fsio#3");
+fsio8_Map3D_u8t fsioTable4("fsio#4");
 
 
 /**
@@ -485,6 +487,10 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
 			config->fsioTable1RpmBins);
 	fsioTable2.init(config->fsioTable2, config->fsioTable2LoadBins,
 			config->fsioTable2RpmBins);
+	fsioTable3.init(config->fsioTable3, config->fsioTable3LoadBins,
+			config->fsioTable3RpmBins);
+	fsioTable4.init(config->fsioTable4, config->fsioTable4LoadBins,
+			config->fsioTable4RpmBins);
 
 }
 
diff --git a/firmware/controllers/core/table_helper.h b/firmware/controllers/core/table_helper.h
index 7b5db80b6c..b018b7362a 100644
--- a/firmware/controllers/core/table_helper.h
+++ b/firmware/controllers/core/table_helper.h
@@ -126,7 +126,12 @@ void Map3D<RPM_BIN_SIZE, LOAD_BIN_SIZE, vType>::setAll(vType value) {
 	}
 }
 
-typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, float> afr_Map3D_t;
+/**
+ * AFR value is packed into uint8_t with a multiplier of 10
+ */
+#define AFR_STORAGE_MULT 10
+
+typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, uint8_t> afr_Map3D_t;
 typedef Map3D<IGN_RPM_COUNT, IGN_LOAD_COUNT, float> ign_Map3D_t;
 typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, float> fuel_Map3D_t;
 typedef Map3D<BARO_CORR_SIZE, BARO_CORR_SIZE, float> baroCorr_Map3D_t;
diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h
index ca024cc6b4..dde894594e 100644
--- a/firmware/controllers/flash_main.h
+++ b/firmware/controllers/flash_main.h
@@ -11,7 +11,7 @@
 
 #include "engine.h"
 
-#define FLASH_DATA_VERSION 9800
+#define FLASH_DATA_VERSION 10000
 
 typedef enum {
 	OK = 0,
diff --git a/firmware/controllers/math/speed_density.cpp b/firmware/controllers/math/speed_density.cpp
index 51e72de15b..5f7c931aca 100644
--- a/firmware/controllers/math/speed_density.cpp
+++ b/firmware/controllers/math/speed_density.cpp
@@ -24,7 +24,7 @@
 
 fuel_Map3D_t veMap("VE");
 fuel_Map3D_t ve2Map("VE2");
-afr_Map3D_t afrMap("AFR");
+afr_Map3D_t afrMap("AFR", 1.0 / AFR_STORAGE_MULT);
 baroCorr_Map3D_t baroCorrMap("baro");
 
 #define tpMin 0
diff --git a/firmware/integration/rusefi.xml b/firmware/integration/rusefi.xml
index e4f8ad5d7d..2fff432ba0 100644
--- a/firmware/integration/rusefi.xml
+++ b/firmware/integration/rusefi.xml
@@ -81,8 +81,8 @@
         <table type="3D" name="Target AFR"
         category="Fuel"
         storageaddress="@@afrTable_offset_hex@@" sizex="@@FUEL_LOAD_COUNT@@"
-               sizey="@@FUEL_RPM_COUNT@@" storagetype="float" endian="big">
-            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+               sizey="@@FUEL_RPM_COUNT@@" 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="@@afrLoadBins_offset_hex@@" storagetype="float" endian="big">
                 <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 4bf66047f2..fe569ca0cf 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -67,9 +67,10 @@ struct_no_prefix engine_configuration_s
 ! please note that 1024 here is 4 * FUEL_RPM_COUNT * FUEL_LOAD_COUNT  
 custom fuel_table_t	1024 array,   F32,   @OFFSET@, [16x16],"ms",      1,     0,      0.0,   300.0,   2
 custom ve_table_t 1024 array,   F32,   @OFFSET@, [16x16],"%", 1, 0, 0, 999.0, 2
-custom afr_table_t 1024 array,   F32,   @OFFSET@, [16x16],"deg",	   1,     0,        0,  25.0,     2 
+custom afr_table_t 256 array,   U08,   @OFFSET@, [16x16],"deg",	   0.1,     0,        0,  25.0,     1 
 
-custom fsio_table_8x8_t	256 array,   F32,   @OFFSET@, [8x8],"value",      1,     0,      0.0,   30000.0,   2
+custom fsio_table_8x8_u8t	64 array,   U08,   @OFFSET@, [8x8],"value",      1,     0,      0.0,   255.0,   0
+custom fsio_table_8x8_f32t	256 array,   F32,   @OFFSET@, [8x8],"value",      1,     0,      0.0,   30000.0,   2
 custom tps_tps_table_t	256 array,   F32,   @OFFSET@, [8x8],"value",      1,     0,      0.0,   30000.0,   2
 
 
@@ -765,12 +766,20 @@ tps_tps_table_t tpsTpsAccelTable;
 float[TPS_TPS_ACCEL_TABLE] tpsTpsAccelFromRpmBins;;"from",	   1,      0,      0.0,  30000.0,   2
 float[TPS_TPS_ACCEL_TABLE] tpsTpsAccelToRpmBins;RPM is float and not integer in order to use unified methods for interpolation;"to",	   1,      0,      0.0,  25500.0,   2
 
-fsio_table_8x8_t fsioTable1;
+fsio_table_8x8_f32t fsioTable1;
 float[FSIO_TABLE_8] fsioTable1LoadBins;;"L",	   1,      0,      0.0,  30000.0,   2
 float[FSIO_TABLE_8] fsioTable1RpmBins;RPM is float and not integer in order to use unified methods for interpolation;"RPM",	   1,      0,      0.0,  25500.0,   2
 
-fsio_table_8x8_t fsioTable2;
-float[FSIO_TABLE_8] fsioTable2LoadBins;;"L",	   1,      0,      0.0,  30000.0,   2
+fsio_table_8x8_u8t fsioTable2;
+float[FSIO_TABLE_8] fsioTable2LoadBins;;"L",	   1,      0,      0.0,  255,   0
 float[FSIO_TABLE_8] fsioTable2RpmBins;RPM is float and not integer in order to use unified methods for interpolation;"RPM",	   1,      0,      0.0,  25500.0,   2
 
+fsio_table_8x8_u8t fsioTable3;
+float[FSIO_TABLE_8] fsioTable3LoadBins;;"L",	   1,      0,      0.0,  255,   0
+float[FSIO_TABLE_8] fsioTable3RpmBins;RPM is float and not integer in order to use unified methods for interpolation;"RPM",	   1,      0,      0.0,  25500.0,   2
+
+fsio_table_8x8_u8t fsioTable4;
+float[FSIO_TABLE_8] fsioTable4LoadBins;;"L",	   1,      0,      0.0,  255,   0
+float[FSIO_TABLE_8] fsioTable4RpmBins;RPM is float and not integer in order to use unified methods for interpolation;"RPM",	   1,      0,      0.0,  25500.0,   2
+
 end_struct
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 5d5b8e2b87..8e9b520116 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -298,5 +298,5 @@ int getRusEfiVersion(void) {
 		return 123; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] * 0 != 0)
 		return 3211; // this is here to make the compiler happy about the unused array
-	return 20160626;
+	return 20160630;
 }
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index a0f158a5e7..5654d73cbc 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -42,9 +42,9 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 01 14:38:02 EDT 2016
+; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 01 22:05:53 EDT 2016
 
-pageSize            = 17080
+pageSize            = 16376
 page = 1
 	engineType					 = bits, S32, 0, [0:2], "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
@@ -629,19 +629,25 @@ page = 1
 	veTable						 = array, F32, 13816, [16x16],"%", 1, 0, 0, 999.0, 2
 	veLoadBins						= array, F32,	14840,	[16],	"%", 1, 0.0, 0, 300.0, 2
 	veRpmBins						= array, F32,	14904,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	afrTable					 = array, F32, 14968, [16x16],"deg", 1, 0, 0, 25.0, 2
-	afrLoadBins						= array, F32,	15992,	[16],	"%", 1, 0.0, 0, 300.0, 2
-	afrRpmBins						= array, F32,	16056,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
-	tpsTpsAccelTable			 = array, F32, 16120, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelFromRpmBins			= array, F32,	16376,	[8],	"from", 1, 0, 0.0, 30000.0, 2
-	tpsTpsAccelToRpmBins			= array, F32,	16408,	[8],	"to", 1, 0, 0.0, 25500.0, 2
-	fsioTable1					 = array, F32, 16440, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	fsioTable1LoadBins				= array, F32,	16696,	[8],	"L", 1, 0, 0.0, 30000.0, 2
-	fsioTable1RpmBins				= array, F32,	16728,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-	fsioTable2					 = array, F32, 16760, [8x8],"value", 1, 0, 0.0, 30000.0, 2
-	fsioTable2LoadBins				= array, F32,	17016,	[8],	"L", 1, 0, 0.0, 30000.0, 2
-	fsioTable2RpmBins				= array, F32,	17048,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
-; total TS size = 17080
+	afrTable					 = array, U08, 14968, [16x16],"deg", 0.1, 0, 0, 25.0, 1
+	afrLoadBins						= array, F32,	15224,	[16],	"%", 1, 0.0, 0, 300.0, 2
+	afrRpmBins						= array, F32,	15288,	[16],	"RPM", 1, 0.0, 0, 18000.0, 2
+	tpsTpsAccelTable			 = array, F32, 15352, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelFromRpmBins			= array, F32,	15608,	[8],	"from", 1, 0, 0.0, 30000.0, 2
+	tpsTpsAccelToRpmBins			= array, F32,	15640,	[8],	"to", 1, 0, 0.0, 25500.0, 2
+	fsioTable1					 = array, F32, 15672, [8x8],"value", 1, 0, 0.0, 30000.0, 2
+	fsioTable1LoadBins				= array, F32,	15928,	[8],	"L", 1, 0, 0.0, 30000.0, 2
+	fsioTable1RpmBins				= array, F32,	15960,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable2					 = array, U08, 15992, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable2LoadBins				= array, F32,	16056,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable2RpmBins				= array, F32,	16088,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable3					 = array, U08, 16120, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable3LoadBins				= array, F32,	16184,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable3RpmBins				= array, F32,	16216,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+	fsioTable4					 = array, U08, 16248, [8x8],"value", 1, 0, 0.0, 255.0, 0
+	fsioTable4LoadBins				= array, F32,	16312,	[8],	"L", 1, 0, 0.0, 255, 0
+	fsioTable4RpmBins				= array, F32,	16344,	[8],	"RPM", 1, 0, 0.0, 25500.0, 2
+; total TS size = 16376
 [SettingContextHelp]
 	injector_flow = "cc/min, cubic centimeter 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"
 	injector_lag = "Base injector lag\nSee also vBatt correction curve"
@@ -967,11 +973,20 @@ fileVersion = { 20160430 }
       yBins       = fsioTable1LoadBins,  engineLoad
       zBins       = fsioTable1
 
-   table = fsioTable2Tbl,  fsioTable2Map,  "FSIO Table #1",   1
+   table = fsioTable2Tbl,  fsioTable2Map,  "FSIO Table #2",   1
       xBins       = fsioTable2RpmBins,  rpm
       yBins       = fsioTable2LoadBins,  engineLoad
       zBins       = fsioTable2
 
+   table = fsioTable3Tbl,  fsioTable3Map,  "FSIO Table #3",   1
+      xBins       = fsioTable3RpmBins,  rpm
+      yBins       = fsioTable3LoadBins,  engineLoad
+      zBins       = fsioTable3
+
+   table = fsioTable4Tbl,  fsioTable4Map,  "FSIO Table #4",   1
+      xBins       = fsioTable4RpmBins,  rpm
+      yBins       = fsioTable4LoadBins,  engineLoad
+      zBins       = fsioTable4
 
    table = baroCorrTbl,  baroCorrMap,  "Baro Correction",   1
       ;       constant, variable
@@ -1289,6 +1304,8 @@ fileVersion = { 20160430 }
 		subMenu = fsioDialog,               "FSIO"
 		subMenu = fsioTable1Tbl,			"FSIO Table #1"
 		subMenu = fsioTable2Tbl,			"FSIO Table #2"
+		subMenu = fsioTable3Tbl,			"FSIO Table #3"
+		subMenu = fsioTable4Tbl,			"FSIO Table #4"
 		subMenu	= std_separator
 	 	subMenu = connection,            	"Connection"
 		subMenu = std_separator
diff --git a/java_console/io/src/com/rusefi/TsPageSize.java b/java_console/io/src/com/rusefi/TsPageSize.java
index 75f2b413e2..39dcf9d9d2 100644
--- a/java_console/io/src/com/rusefi/TsPageSize.java
+++ b/java_console/io/src/com/rusefi/TsPageSize.java
@@ -1,5 +1,5 @@
 package com.rusefi;
 
 public interface TsPageSize {
-    int IMAGE_SIZE = 17080;
+    int IMAGE_SIZE = 16376;
 }
diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java
index 63ed3b4669..5894b0b0af 100644
--- a/java_console/models/src/com/rusefi/config/Fields.java
+++ b/java_console/models/src/com/rusefi/config/Fields.java
@@ -1,6 +1,6 @@
 package com.rusefi.config;
 
-// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 26 20:48:53 EDT 2016
+// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 01 17:21:02 EDT 2016
 public class Fields {
 	public static final int LE_COMMAND_LENGTH = 200;
 	public static final int FSIO_ADC_COUNT = 4;
@@ -51,8 +51,8 @@ public class Fields {
 	public static final int directSelfStimulation_offset_hex = 50;
 	public static final int activateAuxPid1_offset = 80;
 	public static final int activateAuxPid1_offset_hex = 50;
-	public static final int issue_294_2_offset = 80;
-	public static final int issue_294_2_offset_hex = 50;
+	public static final int isVerboseAuxPid_offset = 80;
+	public static final int isVerboseAuxPid_offset_hex = 50;
 	public static final int issue_294_3_offset = 80;
 	public static final int issue_294_3_offset_hex = 50;
 	public static final int issue_294_4_offset = 80;
@@ -841,8 +841,15 @@ public class Fields {
 	public static final int auxPid1_offset_offset = 2424;
 	public static final int auxPid1_offset_offset_hex = 978;
 	public static final int crankingIdleAdjustment_offset = 2428;
-	public static final int unused_offset = 2432;
-	public static final int unused_offset_hex = 980;
+	public static final int tChargeMinRpmMinTps_offset = 2432;
+	public static final int tChargeMinRpmMinTps_offset_hex = 980;
+	public static final int tChargeMinRpmMaxTps_offset = 2436;
+	public static final int tChargeMinRpmMaxTps_offset_hex = 984;
+	public static final int tChargeMaxRpmMinTps_offset = 2440;
+	public static final int tChargeMaxRpmMinTps_offset_hex = 988;
+	public static final int tChargeMaxRpmMaxTps_offset = 2444;
+	public static final int unused_offset = 2448;
+	public static final int unused_offset_hex = 990;
 	public static final int le_formulas1_offset = 3048;
 	public static final int le_formulas2_offset = 3248;
 	public static final int le_formulas3_offset = 3448;
@@ -902,32 +909,31 @@ public class Fields {
 	public static final int veLoadBins_offset = 14840;
 	public static final int veRpmBins_offset = 14904;
 	public static final int afrTable_offset = 14968;
-	public static final int afrLoadBins_offset = 15992;
-	public static final int afrRpmBins_offset = 16056;
-	public static final int tpsTpsAccelTable_offset = 16120;
-	public static final int tpsTpsAccelFromRpmBins_offset = 16376;
-	public static final int tpsTpsAccelToRpmBins_offset = 16408;
-	public static final int tpsTpsAccelToRpmBins_offset_hex = 4018;
-	public static final int fsioTable1_offset = 16440;
-	public static final int fsioTable1_offset_hex = 4038;
-	public static final int fsioTable1LoadBins_offset = 16696;
-	public static final int fsioTable1LoadBins_offset_hex = 4138;
-	public static final int fsioTable1RpmBins_offset = 16728;
-	public static final int fsioTable1RpmBins_offset_hex = 4158;
-	public static final int fsioTable2_offset = 16760;
-	public static final int fsioTable2_offset_hex = 4178;
-	public static final int fsioTable2LoadBins_offset = 17016;
-	public static final int fsioTable2LoadBins_offset_hex = 4278;
-	public static final int fsioTable2RpmBins_offset = 17048;
-	public static final int fsioTable2RpmBins_offset_hex = 4298;
-	public static final int TOTAL_CONFIG_SIZE = 17080;
+	public static final int afrLoadBins_offset = 15224;
+	public static final int afrRpmBins_offset = 15288;
+	public static final int tpsTpsAccelTable_offset = 15352;
+	public static final int tpsTpsAccelFromRpmBins_offset = 15608;
+	public static final int tpsTpsAccelToRpmBins_offset = 15640;
+	public static final int fsioTable1_offset = 15672;
+	public static final int fsioTable1LoadBins_offset = 15928;
+	public static final int fsioTable1RpmBins_offset = 15960;
+	public static final int fsioTable2_offset = 15992;
+	public static final int fsioTable2LoadBins_offset = 16056;
+	public static final int fsioTable2RpmBins_offset = 16088;
+	public static final int fsioTable3_offset = 16120;
+	public static final int fsioTable3LoadBins_offset = 16184;
+	public static final int fsioTable3RpmBins_offset = 16216;
+	public static final int fsioTable4_offset = 16248;
+	public static final int fsioTable4LoadBins_offset = 16312;
+	public static final int fsioTable4RpmBins_offset = 16344;
+	public static final int TOTAL_CONFIG_SIZE = 16376;
 	public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT);
 	public static final Field ENGINESNIFFERRPMTHRESHOLD = Field.create("ENGINESNIFFERRPMTHRESHOLD", 4, FieldType.INT);
 	public static final Field INJECTOR_FLOW = Field.create("INJECTOR_FLOW", 8, FieldType.FLOAT);
 	public static final Field INJECTOR_LAG = Field.create("INJECTOR_LAG", 12, FieldType.FLOAT);
 	public static final Field DIRECTSELFSTIMULATION = Field.create("DIRECTSELFSTIMULATION", 80, FieldType.BIT, 0);
 	public static final Field ACTIVATEAUXPID1 = Field.create("ACTIVATEAUXPID1", 80, FieldType.BIT, 1);
-	public static final Field ISSUE_294_2 = Field.create("ISSUE_294_2", 80, FieldType.BIT, 2);
+	public static final Field ISVERBOSEAUXPID = Field.create("ISVERBOSEAUXPID", 80, FieldType.BIT, 2);
 	public static final Field ISSUE_294_3 = Field.create("ISSUE_294_3", 80, FieldType.BIT, 3);
 	public static final Field ISSUE_294_4 = Field.create("ISSUE_294_4", 80, FieldType.BIT, 4);
 	public static final Field ISSUE_294_5 = Field.create("ISSUE_294_5", 80, FieldType.BIT, 5);
@@ -1438,6 +1444,10 @@ public class Fields {
 	public static final Field AUXPID1_DFACTOR = Field.create("AUXPID1_DFACTOR", 2420, FieldType.FLOAT);
 	public static final Field AUXPID1_OFFSET = Field.create("AUXPID1_OFFSET", 2424, FieldType.FLOAT);
 	public static final Field CRANKINGIDLEADJUSTMENT = Field.create("CRANKINGIDLEADJUSTMENT", 2428, FieldType.FLOAT);
+	public static final Field TCHARGEMINRPMMINTPS = Field.create("TCHARGEMINRPMMINTPS", 2432, FieldType.FLOAT);
+	public static final Field TCHARGEMINRPMMAXTPS = Field.create("TCHARGEMINRPMMAXTPS", 2436, FieldType.FLOAT);
+	public static final Field TCHARGEMAXRPMMINTPS = Field.create("TCHARGEMAXRPMMINTPS", 2440, FieldType.FLOAT);
+	public static final Field TCHARGEMAXRPMMAXTPS = Field.create("TCHARGEMAXRPMMAXTPS", 2444, FieldType.FLOAT);
 	public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3048, FieldType.INT);
 	public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3248, FieldType.INT);
 	public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT);
@@ -1462,7 +1472,9 @@ public class Fields {
 	public static final Field IGNITIONTABLE = Field.create("IGNITIONTABLE", 12664, FieldType.INT);
 	public static final Field VETABLE = Field.create("VETABLE", 13816, FieldType.INT);
 	public static final Field AFRTABLE = Field.create("AFRTABLE", 14968, FieldType.INT);
-	public static final Field TPSTPSACCELTABLE = Field.create("TPSTPSACCELTABLE", 16120, FieldType.INT);
-	public static final Field FSIOTABLE1 = Field.create("FSIOTABLE1", 16440, FieldType.INT);
-	public static final Field FSIOTABLE2 = Field.create("FSIOTABLE2", 16760, FieldType.INT);
+	public static final Field TPSTPSACCELTABLE = Field.create("TPSTPSACCELTABLE", 15352, FieldType.INT);
+	public static final Field FSIOTABLE1 = Field.create("FSIOTABLE1", 15672, FieldType.INT);
+	public static final Field FSIOTABLE2 = Field.create("FSIOTABLE2", 15992, FieldType.INT);
+	public static final Field FSIOTABLE3 = Field.create("FSIOTABLE3", 16120, FieldType.INT);
+	public static final Field FSIOTABLE4 = Field.create("FSIOTABLE4", 16248, FieldType.INT);
 }
diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml
index 29252a0215..b225fe19da 100644
--- a/java_console/rusefi.xml
+++ b/java_console/rusefi.xml
@@ -7,7 +7,7 @@
             <ecuid>RUSEFI</ecuid>
             <make>rusEfi</make>
             <model>rusEfi</model>
-            <filesize>17080</filesize>
+            <filesize>16376</filesize>
         </romid>
 
         <table type="3D" name="Ignition Advance"
@@ -81,14 +81,14 @@
         <table type="3D" name="Target AFR"
         category="Fuel"
         storageaddress="3a78" sizex="16"
-               sizey="16" storagetype="float" endian="big">
-            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+               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="3e78" storagetype="float" endian="big">
+            <table type="X Axis" storageaddress="3b78" storagetype="float" endian="big">
                 <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
                          coarseincrement="1"/>
             </table>
-            <table type="Y Axis" storageaddress="3eb8" storagetype="float" endian="big">
+            <table type="Y Axis" storageaddress="3bb8" storagetype="float" endian="big">
                 <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
             </table>
         </table>