diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h
index a5b66a48ff..d60dc76cf7 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 Thu Mar 03 21:43:13 EST 2016
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 21:51:11 EST 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@@ -1498,8 +1498,12 @@ typedef struct {
/**
* offset 2304
*/
+ float mapAccelTaper[MAP_ACCEL_TAPER];
+ /**
+ * offset 2336
+ */
int unused[178];
- /** total size 3016*/
+ /** total size 3048*/
} engine_configuration_s;
typedef struct {
@@ -1508,170 +1512,183 @@ typedef struct {
*/
engine_configuration_s engineConfiguration;
/**
- * offset 3016
+ * offset 3048
*/
le_formula_t le_formulas[LE_COMMAND_COUNT];
/**
- * offset 6216
+ * offset 6248
*/
le_formula_t timingMultiplier;
/**
- * offset 6416
+ * offset 6448
*/
le_formula_t timingAdditive;
/**
- * offset 6616
+ * offset 6648
*/
float cltFuelCorrBins[CLT_CURVE_SIZE];
/**
- * offset 6680
+ * offset 6712
*/
float cltFuelCorr[CLT_CURVE_SIZE];
/**
- * offset 6744
+ * offset 6776
*/
float iatFuelCorrBins[IAT_CURVE_SIZE];
/**
- * offset 6808
+ * offset 6840
*/
float iatFuelCorr[IAT_CURVE_SIZE];
/**
- * offset 6872
+ * offset 6904
*/
float crankingFuelCoef[CRANKING_CURVE_SIZE];
/**
- * offset 6904
+ * offset 6936
*/
float crankingFuelBins[CRANKING_CURVE_SIZE];
/**
- * offset 6936
+ * offset 6968
*/
float crankingCycleCoef[CRANKING_CURVE_SIZE];
/**
- * offset 6968
+ * offset 7000
*/
float crankingCycleBins[CRANKING_CURVE_SIZE];
/**
* CLT-based adjustment for simple manual idle controller
- * offset 7000
+ * offset 7032
*/
float cltIdleCorrBins[CLT_CURVE_SIZE];
/**
- * offset 7064
+ * offset 7096
*/
float cltIdleCorr[CLT_CURVE_SIZE];
/**
* kg/hour value.
* By the way 2.081989116 kg/h = 1 ft³/m
- * offset 7128
+ * offset 7160
*/
float mafDecoding[MAF_DECODING_COUNT];
/**
- * offset 8152
+ * offset 8184
*/
float mafDecodingBins[MAF_DECODING_COUNT];
/**
- * offset 9176
+ * offset 9208
*/
angle_table_t ignitionIatCorrTable;
/**
- * offset 10200
+ * offset 10232
*/
float ignitionIatCorrLoadBins[IGN_LOAD_COUNT];
/**
- * offset 10264
+ * offset 10296
*/
float ignitionIatCorrRpmBins[IGN_RPM_COUNT];
/**
- * offset 10328
+ * offset 10360
*/
angle_table_t injectionPhase;
/**
- * offset 11352
+ * offset 11384
*/
float injPhaseLoadBins[FUEL_LOAD_COUNT];
/**
- * offset 11416
+ * offset 11448
*/
float injPhaseRpmBins[FUEL_RPM_COUNT];
/**
- * offset 11480
+ * offset 11512
*/
fuel_table_t fuelTable;
/**
- * offset 12504
+ * offset 12536
*/
float fuelLoadBins[FUEL_LOAD_COUNT];
/**
* RPM is float and not integer in order to use unified methods for interpolation
- * offset 12568
+ * offset 12600
*/
float fuelRpmBins[FUEL_RPM_COUNT];
/**
- * offset 12632
+ * offset 12664
*/
ignition_table_t ignitionTable;
/**
- * offset 13656
+ * offset 13688
*/
float ignitionLoadBins[IGN_LOAD_COUNT];
/**
- * offset 13720
+ * offset 13752
*/
float ignitionRpmBins[IGN_RPM_COUNT];
/**
- * offset 13784
+ * offset 13816
*/
ve_table_t veTable;
/**
- * offset 14808
+ * offset 14840
*/
float veLoadBins[FUEL_LOAD_COUNT];
/**
- * offset 14872
+ * offset 14904
*/
float veRpmBins[FUEL_RPM_COUNT];
/**
- * offset 14936
+ * offset 14968
*/
afr_table_t afrTable;
/**
- * offset 15960
+ * offset 15992
*/
float afrLoadBins[FUEL_LOAD_COUNT];
/**
- * offset 16024
+ * offset 16056
*/
float afrRpmBins[FUEL_RPM_COUNT];
/**
- * offset 16088
+ * offset 16120
+ */
+ tps_tps_table_t tpsTpsAccelTable;
+ /**
+ * offset 16376
+ */
+ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE];
+ /**
+ * RPM is float and not integer in order to use unified methods for interpolation
+ * offset 16408
+ */
+ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE];
+ /**
+ * offset 16440
*/
fsio_table_8x8_t fsioTable1;
/**
- * offset 16344
+ * offset 16696
*/
float fsioTable1LoadBins[FSIO_TABLE_8];
/**
* RPM is float and not integer in order to use unified methods for interpolation
- * offset 16376
+ * offset 16728
*/
float fsioTable1RpmBins[FSIO_TABLE_8];
/**
- * offset 16408
+ * offset 16760
*/
fsio_table_8x8_t fsioTable2;
/**
- * offset 16664
+ * offset 17016
*/
float fsioTable2LoadBins[FSIO_TABLE_8];
/**
* RPM is float and not integer in order to use unified methods for interpolation
- * offset 16696
+ * offset 17048
*/
float fsioTable2RpmBins[FSIO_TABLE_8];
- /** total size 16728*/
+ /** total size 17080*/
} persistent_config_s;
#endif
// end
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Mar 03 21:43:13 EST 2016
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 21:51:11 EST 2016
diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h
index 94600490d1..fedd03490e 100644
--- a/firmware/controllers/algo/rusefi_generated.h
+++ b/firmware/controllers/algo/rusefi_generated.h
@@ -23,6 +23,8 @@
#define FUEL_RPM_COUNT 16
#define FUEL_LOAD_COUNT 16
#define FSIO_TABLE_8 8
+#define TPS_TPS_ACCEL_TABLE 8
+#define MAP_ACCEL_TAPER 8
#define BARO_CORR_SIZE 4
#define MAF_DECODING_COUNT 256
#define engineConfiguration_offset 0
@@ -745,79 +747,85 @@
#define warmupTargetAfr_offset 2280
#define warmupAfrThreshold_offset 2296
#define boostCutPressure_offset 2300
-#define unused_offset 2304
-#define unused_offset_hex 900
-#define le_formulas1_offset 3016
-#define le_formulas2_offset 3216
-#define le_formulas3_offset 3416
-#define le_formulas4_offset 3616
-#define le_formulas5_offset 3816
-#define le_formulas6_offset 4016
-#define le_formulas7_offset 4216
-#define le_formulas7_offset_hex 1078
-#define le_formulas8_offset 4416
-#define le_formulas8_offset_hex 1140
-#define le_formulas9_offset 4616
-#define le_formulas9_offset_hex 1208
-#define le_formulas10_offset 4816
-#define le_formulas11_offset 5016
-#define le_formulas11_offset_hex 1398
-#define le_formulas12_offset 5216
-#define le_formulas12_offset_hex 1460
-#define le_formulas13_offset 5416
-#define le_formulas13_offset_hex 1528
-#define le_formulas14_offset 5616
-#define le_formulas15_offset 5816
-#define le_formulas16_offset 6016
-#define le_formulas16_offset_hex 1780
-#define timingMultiplier_offset 6216
-#define timingMultiplier_offset_hex 1848
-#define timingAdditive_offset 6416
-#define timingAdditive_offset_hex 1910
-#define cltFuelCorrBins_offset 6616
-#define cltFuelCorr_offset 6680
-#define iatFuelCorrBins_offset 6744
-#define iatFuelCorr_offset 6808
-#define crankingFuelCoef_offset 6872
-#define crankingFuelBins_offset 6904
-#define crankingCycleCoef_offset 6936
-#define crankingCycleBins_offset 6968
-#define cltIdleCorrBins_offset 7000
-#define cltIdleCorr_offset 7064
-#define mafDecoding_offset 7128
-#define mafDecodingBins_offset 8152
-#define ignitionIatCorrTable_offset 9176
-#define ignitionIatCorrLoadBins_offset 10200
-#define ignitionIatCorrRpmBins_offset 10264
-#define ignitionIatCorrRpmBins_offset_hex 2818
-#define injectionPhase_offset 10328
-#define injectionPhase_offset_hex 2858
-#define injPhaseLoadBins_offset 11352
-#define injPhaseRpmBins_offset 11416
-#define fuelTable_offset 11480
-#define fuelLoadBins_offset 12504
-#define fuelRpmBins_offset 12568
-#define fuelRpmBins_offset_hex 3118
-#define ignitionTable_offset 12632
-#define ignitionTable_offset_hex 3158
-#define ignitionLoadBins_offset 13656
-#define ignitionLoadBins_offset_hex 3558
-#define ignitionRpmBins_offset 13720
-#define ignitionRpmBins_offset_hex 3598
-#define veTable_offset 13784
-#define veLoadBins_offset 14808
-#define veRpmBins_offset 14872
-#define afrTable_offset 14936
-#define afrLoadBins_offset 15960
-#define afrRpmBins_offset 16024
-#define fsioTable1_offset 16088
-#define fsioTable1LoadBins_offset 16344
-#define fsioTable1RpmBins_offset 16376
-#define fsioTable2_offset 16408
-#define fsioTable2_offset_hex 4018
-#define fsioTable2LoadBins_offset 16664
-#define fsioTable2LoadBins_offset_hex 4118
-#define fsioTable2RpmBins_offset 16696
-#define fsioTable2RpmBins_offset_hex 4138
-#define TOTAL_CONFIG_SIZE 16728
-#define TOTAL_CONFIG_SIZE_hex 4158
+#define mapAccelTaper_offset 2304
+#define mapAccelTaper_offset_hex 900
+#define unused_offset 2336
+#define unused_offset_hex 920
+#define le_formulas1_offset 3048
+#define le_formulas2_offset 3248
+#define le_formulas3_offset 3448
+#define le_formulas4_offset 3648
+#define le_formulas5_offset 3848
+#define le_formulas6_offset 4048
+#define le_formulas7_offset 4248
+#define le_formulas7_offset_hex 1098
+#define le_formulas8_offset 4448
+#define le_formulas8_offset_hex 1160
+#define le_formulas9_offset 4648
+#define le_formulas9_offset_hex 1228
+#define le_formulas10_offset 4848
+#define le_formulas11_offset 5048
+#define le_formulas12_offset 5248
+#define le_formulas12_offset_hex 1480
+#define le_formulas13_offset 5448
+#define le_formulas13_offset_hex 1548
+#define le_formulas14_offset 5648
+#define le_formulas14_offset_hex 1610
+#define le_formulas15_offset 5848
+#define le_formulas16_offset 6048
+#define timingMultiplier_offset 6248
+#define timingMultiplier_offset_hex 1868
+#define timingAdditive_offset 6448
+#define timingAdditive_offset_hex 1930
+#define cltFuelCorrBins_offset 6648
+#define cltFuelCorr_offset 6712
+#define iatFuelCorrBins_offset 6776
+#define iatFuelCorr_offset 6840
+#define crankingFuelCoef_offset 6904
+#define crankingFuelBins_offset 6936
+#define crankingCycleCoef_offset 6968
+#define crankingCycleBins_offset 7000
+#define cltIdleCorrBins_offset 7032
+#define cltIdleCorr_offset 7096
+#define mafDecoding_offset 7160
+#define mafDecodingBins_offset 8184
+#define ignitionIatCorrTable_offset 9208
+#define ignitionIatCorrLoadBins_offset 10232
+#define ignitionIatCorrRpmBins_offset 10296
+#define ignitionIatCorrRpmBins_offset_hex 2838
+#define injectionPhase_offset 10360
+#define injectionPhase_offset_hex 2878
+#define injPhaseLoadBins_offset 11384
+#define injPhaseRpmBins_offset 11448
+#define fuelTable_offset 11512
+#define fuelLoadBins_offset 12536
+#define fuelRpmBins_offset 12600
+#define fuelRpmBins_offset_hex 3138
+#define ignitionTable_offset 12664
+#define ignitionTable_offset_hex 3178
+#define ignitionLoadBins_offset 13688
+#define ignitionLoadBins_offset_hex 3578
+#define ignitionRpmBins_offset 13752
+#define veTable_offset 13816
+#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
diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h
index b7d1330380..b37358a95b 100644
--- a/firmware/controllers/algo/rusefi_types.h
+++ b/firmware/controllers/algo/rusefi_types.h
@@ -60,19 +60,9 @@ typedef float ignition_table_t[IGN_LOAD_COUNT][IGN_RPM_COUNT];
typedef float baro_corr_table_t[BARO_CORR_SIZE][BARO_CORR_SIZE];
-// todo: rename this structure one all tables migrated
-typedef struct {
- float loadBins[IGN_LOAD_COUNT];
- float rpmBins[IGN_RPM_COUNT];
- ignition_table_t map;
-} full_i_table_s;
-
typedef float fsio_table_8x8_t[FSIO_TABLE_8][FSIO_TABLE_8];
-typedef struct {
- float loadBins[FSIO_TABLE_8];
- float rpmBins[FSIO_TABLE_8];
- fsio_table_8x8_t map;
-} full_fsio_8x8_table_s;
+typedef float tps_tps_table_t[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE];
+
// this is different type simply to have different hi/low range in rusefi.ini
typedef ignition_table_t angle_table_t;
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index f80f5a9551..a60bc9ee45 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -56,6 +56,9 @@ struct_no_prefix engine_configuration_s
#define FSIO_TABLE_8 8
+#define TPS_TPS_ACCEL_TABLE 8
+#define MAP_ACCEL_TAPER 8
+
#define BARO_CORR_SIZE 4
#define MAF_DECODING_COUNT 256
@@ -66,6 +69,7 @@ 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 fsio_table_8x8_t 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
! todo support table size multiplocation
@@ -652,6 +656,9 @@ baro_corr_table_t baroCorrTable;
float warmupAfrThreshold;;"tempterature", 1, 0, 0, 200, 3
float boostCutPressure;kPa value at which we need to cut fuel and spark, 0 if not enabled;"kPa", 1, 0, 0, 500, 0
+
+float[MAP_ACCEL_TAPER] mapAccelTaper;;"counter", 1, 0, 0.0, 300, 0
+
int[178] unused;
@@ -709,6 +716,10 @@ float[FUEL_RPM_COUNT] afrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
! float[FUEL_LOAD_COUNT] ve2LoadBins;;"%", 1, 0.0, 0, 300.0, 2
! float[FUEL_RPM_COUNT] ve2RpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
+tps_tps_table_t tpsTpsAccelTable;
+float[TPS_TPS_ACCEL_TABLE] tpsTpsAccelFromRpmBins;;"L", 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;"RPM", 1, 0, 0.0, 25500.0, 2
+
fsio_table_8x8_t 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
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index fd829f0a26..0ebdbb61e0 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -41,9 +41,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 Thu Mar 03 21:43:13 EST 2016
+; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 21:51:11 EST 2016
-pageSize = 16728
+pageSize = 17080
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
@@ -532,62 +532,66 @@ page = 1
warmupTargetAfr = array, F32, 2280, [4], "AFR", 1, 0, 0.0, 20.0, 2
warmupAfrThreshold = scalar, F32, 2296, "tempterature", 1, 0, 0, 200, 3
boostCutPressure = scalar, F32, 2300, "kPa", 1, 0, 0, 500, 0
-;skipping unused offset 2304
- le_formulas1 = array, U08, 3016, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas2 = array, U08, 3216, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas3 = array, U08, 3416, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas4 = array, U08, 3616, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas5 = array, U08, 3816, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas6 = array, U08, 4016, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas7 = array, U08, 4216, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas8 = array, U08, 4416, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas9 = array, U08, 4616, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas10 = array, U08, 4816, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas11 = array, U08, 5016, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas12 = array, U08, 5216, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas13 = array, U08, 5416, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas14 = array, U08, 5616, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas15 = array, U08, 5816, [200],"char", 1, 0, 0.0, 3.0, 2
- le_formulas16 = array, U08, 6016, [200],"char", 1, 0, 0.0, 3.0, 2
- timingMultiplier = array, U08, 6216, [200],"char", 1, 0, 0.0, 3.0, 2
- timingAdditive = array, U08, 6416, [200],"char", 1, 0, 0.0, 3.0, 2
- cltFuelCorrBins = array, F32, 6616, [16], "C", 1, 0, -100.0, 250.0, 2
- cltFuelCorr = array, F32, 6680, [16], "%", 1, 0, 0.0, 500.0, 2
- iatFuelCorrBins = array, F32, 6744, [16], "C", 1, 0, -100.0, 250.0, 2
- iatFuelCorr = array, F32, 6808, [16], "%", 1, 0, 0.0, 500.0, 2
- crankingFuelCoef = array, F32, 6872, [8], "%", 1, 0, 0.0, 700.0, 2
- crankingFuelBins = array, F32, 6904, [8], "C", 1, 0, -80.0, 170.0, 2
- crankingCycleCoef = array, F32, 6936, [8], "%", 1, 0, 0.0, 500.0, 2
- crankingCycleBins = array, F32, 6968, [8], "counter", 1, 0, -80.0, 170.0, 2
- cltIdleCorrBins = array, F32, 7000, [16], "C", 1, 0, -100.0, 250.0, 2
- cltIdleCorr = array, F32, 7064, [16], "%", 1, 0, 0.0, 500.0, 2
- mafDecoding = array, F32, 7128, [256], "kg/hour", 1, 0, -500.0, 4000.0, 2
- mafDecodingBins = array, F32, 8152, [256], "V", 1, 0, -5.0, 150.0, 2
- ignitionIatCorrTable = array, F32, 9176, [16x16],"deg", 1, 0, -720, 720, 2
- ignitionIatCorrLoadBins = array, F32, 10200, [16], "Load", 1, 0.0, 0, 300.0, 2
- ignitionIatCorrRpmBins = array, F32, 10264, [16], "RPM", 1, 0.0, 0, 18000.0, 2
- injectionPhase = array, F32, 10328, [16x16],"deg", 1, 0, -720, 720, 2
- injPhaseLoadBins = array, F32, 11352, [16], "Load", 1, 0.0, 0, 300.0, 2
- injPhaseRpmBins = array, F32, 11416, [16], "RPM", 1, 0.0, 0, 18000.0, 2
- fuelTable = array, F32, 11480, [16x16],"ms", 1, 0, 0.0, 300.0, 2
- fuelLoadBins = array, F32, 12504, [16], "V", 1, 0, 0.0, 300.0, 2
- fuelRpmBins = array, F32, 12568, [16], "RPM", 1, 0, 0.0, 25500.0, 2
- ignitionTable = array, F32, 12632, [16x16],"deg", 1, 0, -20, 90, 2
- ignitionLoadBins = array, F32, 13656, [16], "Load", 1, 0.0, 0, 300.0, 2
- ignitionRpmBins = array, F32, 13720, [16], "RPM", 1, 0.0, 0, 18000.0, 2
- veTable = array, F32, 13784, [16x16],"%", 1, 0, 0, 999.0, 2
- veLoadBins = array, F32, 14808, [16], "%", 1, 0.0, 0, 300.0, 2
- veRpmBins = array, F32, 14872, [16], "RPM", 1, 0.0, 0, 18000.0, 2
- afrTable = array, F32, 14936, [16x16],"deg", 1, 0, 0, 25.0, 2
- afrLoadBins = array, F32, 15960, [16], "%", 1, 0.0, 0, 300.0, 2
- afrRpmBins = array, F32, 16024, [16], "RPM", 1, 0.0, 0, 18000.0, 2
- fsioTable1 = array, F32, 16088, [8x8],"value", 1, 0, 0.0, 30000.0, 2
- fsioTable1LoadBins = array, F32, 16344, [8], "L", 1, 0, 0.0, 30000.0, 2
- fsioTable1RpmBins = array, F32, 16376, [8], "RPM", 1, 0, 0.0, 25500.0, 2
- fsioTable2 = array, F32, 16408, [8x8],"value", 1, 0, 0.0, 30000.0, 2
- fsioTable2LoadBins = array, F32, 16664, [8], "L", 1, 0, 0.0, 30000.0, 2
- fsioTable2RpmBins = array, F32, 16696, [8], "RPM", 1, 0, 0.0, 25500.0, 2
-; total TS size = 16728
+ mapAccelTaper = array, F32, 2304, [8], "counter", 1, 0, 0.0, 300, 0
+;skipping unused offset 2336
+ le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas4 = array, U08, 3648, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas5 = array, U08, 3848, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas6 = array, U08, 4048, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas7 = array, U08, 4248, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas8 = array, U08, 4448, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas9 = array, U08, 4648, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas10 = array, U08, 4848, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas11 = array, U08, 5048, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas12 = array, U08, 5248, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas13 = array, U08, 5448, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas14 = array, U08, 5648, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas15 = array, U08, 5848, [200],"char", 1, 0, 0.0, 3.0, 2
+ le_formulas16 = array, U08, 6048, [200],"char", 1, 0, 0.0, 3.0, 2
+ timingMultiplier = array, U08, 6248, [200],"char", 1, 0, 0.0, 3.0, 2
+ timingAdditive = array, U08, 6448, [200],"char", 1, 0, 0.0, 3.0, 2
+ cltFuelCorrBins = array, F32, 6648, [16], "C", 1, 0, -100.0, 250.0, 2
+ cltFuelCorr = array, F32, 6712, [16], "%", 1, 0, 0.0, 500.0, 2
+ iatFuelCorrBins = array, F32, 6776, [16], "C", 1, 0, -100.0, 250.0, 2
+ iatFuelCorr = array, F32, 6840, [16], "%", 1, 0, 0.0, 500.0, 2
+ crankingFuelCoef = array, F32, 6904, [8], "%", 1, 0, 0.0, 700.0, 2
+ crankingFuelBins = array, F32, 6936, [8], "C", 1, 0, -80.0, 170.0, 2
+ crankingCycleCoef = array, F32, 6968, [8], "%", 1, 0, 0.0, 500.0, 2
+ crankingCycleBins = array, F32, 7000, [8], "counter", 1, 0, -80.0, 170.0, 2
+ cltIdleCorrBins = array, F32, 7032, [16], "C", 1, 0, -100.0, 250.0, 2
+ cltIdleCorr = array, F32, 7096, [16], "%", 1, 0, 0.0, 500.0, 2
+ mafDecoding = array, F32, 7160, [256], "kg/hour", 1, 0, -500.0, 4000.0, 2
+ mafDecodingBins = array, F32, 8184, [256], "V", 1, 0, -5.0, 150.0, 2
+ ignitionIatCorrTable = array, F32, 9208, [16x16],"deg", 1, 0, -720, 720, 2
+ ignitionIatCorrLoadBins = array, F32, 10232, [16], "Load", 1, 0.0, 0, 300.0, 2
+ ignitionIatCorrRpmBins = array, F32, 10296, [16], "RPM", 1, 0.0, 0, 18000.0, 2
+ injectionPhase = array, F32, 10360, [16x16],"deg", 1, 0, -720, 720, 2
+ injPhaseLoadBins = array, F32, 11384, [16], "Load", 1, 0.0, 0, 300.0, 2
+ injPhaseRpmBins = array, F32, 11448, [16], "RPM", 1, 0.0, 0, 18000.0, 2
+ fuelTable = array, F32, 11512, [16x16],"ms", 1, 0, 0.0, 300.0, 2
+ fuelLoadBins = array, F32, 12536, [16], "V", 1, 0, 0.0, 300.0, 2
+ fuelRpmBins = array, F32, 12600, [16], "RPM", 1, 0, 0.0, 25500.0, 2
+ ignitionTable = array, F32, 12664, [16x16],"deg", 1, 0, -20, 90, 2
+ ignitionLoadBins = array, F32, 13688, [16], "Load", 1, 0.0, 0, 300.0, 2
+ ignitionRpmBins = array, F32, 13752, [16], "RPM", 1, 0.0, 0, 18000.0, 2
+ 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], "L", 1, 0, 0.0, 30000.0, 2
+ tpsTpsAccelToRpmBins = array, F32, 16408, [8], "RPM", 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
; CONFIG_DEFINITION_END
diff --git a/java_console/io/src/com/rusefi/TsPageSize.java b/java_console/io/src/com/rusefi/TsPageSize.java
index 4346c9915e..75f2b413e2 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 = 16728;
+ int IMAGE_SIZE = 17080;
}
diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java
index 74b513ab6b..987c7cf152 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 Thu Mar 03 21:43:13 EST 2016
+// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 21:51:11 EST 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int TS_FILE_VERSION = 20160122;
@@ -27,6 +27,8 @@ public class Fields {
public static final int FUEL_RPM_COUNT = 16;
public static final int FUEL_LOAD_COUNT = 16;
public static final int FSIO_TABLE_8 = 8;
+ public static final int TPS_TPS_ACCEL_TABLE = 8;
+ public static final int MAP_ACCEL_TAPER = 8;
public static final int BARO_CORR_SIZE = 4;
public static final int MAF_DECODING_COUNT = 256;
public static final int engineConfiguration_offset = 0;
@@ -749,82 +751,88 @@ public class Fields {
public static final int warmupTargetAfr_offset = 2280;
public static final int warmupAfrThreshold_offset = 2296;
public static final int boostCutPressure_offset = 2300;
- public static final int unused_offset = 2304;
- public static final int unused_offset_hex = 900;
- public static final int le_formulas1_offset = 3016;
- public static final int le_formulas2_offset = 3216;
- public static final int le_formulas3_offset = 3416;
- public static final int le_formulas4_offset = 3616;
- public static final int le_formulas5_offset = 3816;
- public static final int le_formulas6_offset = 4016;
- public static final int le_formulas7_offset = 4216;
- public static final int le_formulas7_offset_hex = 1078;
- public static final int le_formulas8_offset = 4416;
- public static final int le_formulas8_offset_hex = 1140;
- public static final int le_formulas9_offset = 4616;
- public static final int le_formulas9_offset_hex = 1208;
- public static final int le_formulas10_offset = 4816;
- public static final int le_formulas11_offset = 5016;
- public static final int le_formulas11_offset_hex = 1398;
- public static final int le_formulas12_offset = 5216;
- public static final int le_formulas12_offset_hex = 1460;
- public static final int le_formulas13_offset = 5416;
- public static final int le_formulas13_offset_hex = 1528;
- public static final int le_formulas14_offset = 5616;
- public static final int le_formulas15_offset = 5816;
- public static final int le_formulas16_offset = 6016;
- public static final int le_formulas16_offset_hex = 1780;
- public static final int timingMultiplier_offset = 6216;
- public static final int timingMultiplier_offset_hex = 1848;
- public static final int timingAdditive_offset = 6416;
- public static final int timingAdditive_offset_hex = 1910;
- public static final int cltFuelCorrBins_offset = 6616;
- public static final int cltFuelCorr_offset = 6680;
- public static final int iatFuelCorrBins_offset = 6744;
- public static final int iatFuelCorr_offset = 6808;
- public static final int crankingFuelCoef_offset = 6872;
- public static final int crankingFuelBins_offset = 6904;
- public static final int crankingCycleCoef_offset = 6936;
- public static final int crankingCycleBins_offset = 6968;
- public static final int cltIdleCorrBins_offset = 7000;
- public static final int cltIdleCorr_offset = 7064;
- public static final int mafDecoding_offset = 7128;
- public static final int mafDecodingBins_offset = 8152;
- public static final int ignitionIatCorrTable_offset = 9176;
- public static final int ignitionIatCorrLoadBins_offset = 10200;
- public static final int ignitionIatCorrRpmBins_offset = 10264;
- public static final int ignitionIatCorrRpmBins_offset_hex = 2818;
- public static final int injectionPhase_offset = 10328;
- public static final int injectionPhase_offset_hex = 2858;
- public static final int injPhaseLoadBins_offset = 11352;
- public static final int injPhaseRpmBins_offset = 11416;
- public static final int fuelTable_offset = 11480;
- public static final int fuelLoadBins_offset = 12504;
- public static final int fuelRpmBins_offset = 12568;
- public static final int fuelRpmBins_offset_hex = 3118;
- public static final int ignitionTable_offset = 12632;
- public static final int ignitionTable_offset_hex = 3158;
- public static final int ignitionLoadBins_offset = 13656;
- public static final int ignitionLoadBins_offset_hex = 3558;
- public static final int ignitionRpmBins_offset = 13720;
- public static final int ignitionRpmBins_offset_hex = 3598;
- public static final int veTable_offset = 13784;
- public static final int veLoadBins_offset = 14808;
- public static final int veRpmBins_offset = 14872;
- public static final int afrTable_offset = 14936;
- public static final int afrLoadBins_offset = 15960;
- public static final int afrRpmBins_offset = 16024;
- public static final int fsioTable1_offset = 16088;
- public static final int fsioTable1LoadBins_offset = 16344;
- public static final int fsioTable1RpmBins_offset = 16376;
- public static final int fsioTable2_offset = 16408;
- public static final int fsioTable2_offset_hex = 4018;
- public static final int fsioTable2LoadBins_offset = 16664;
- public static final int fsioTable2LoadBins_offset_hex = 4118;
- public static final int fsioTable2RpmBins_offset = 16696;
- public static final int fsioTable2RpmBins_offset_hex = 4138;
- public static final int TOTAL_CONFIG_SIZE = 16728;
- public static final int TOTAL_CONFIG_SIZE_hex = 4158;
+ public static final int mapAccelTaper_offset = 2304;
+ public static final int mapAccelTaper_offset_hex = 900;
+ public static final int unused_offset = 2336;
+ public static final int unused_offset_hex = 920;
+ public static final int le_formulas1_offset = 3048;
+ public static final int le_formulas2_offset = 3248;
+ public static final int le_formulas3_offset = 3448;
+ public static final int le_formulas4_offset = 3648;
+ public static final int le_formulas5_offset = 3848;
+ public static final int le_formulas6_offset = 4048;
+ public static final int le_formulas7_offset = 4248;
+ public static final int le_formulas7_offset_hex = 1098;
+ public static final int le_formulas8_offset = 4448;
+ public static final int le_formulas8_offset_hex = 1160;
+ public static final int le_formulas9_offset = 4648;
+ public static final int le_formulas9_offset_hex = 1228;
+ public static final int le_formulas10_offset = 4848;
+ public static final int le_formulas11_offset = 5048;
+ public static final int le_formulas12_offset = 5248;
+ public static final int le_formulas12_offset_hex = 1480;
+ public static final int le_formulas13_offset = 5448;
+ public static final int le_formulas13_offset_hex = 1548;
+ public static final int le_formulas14_offset = 5648;
+ public static final int le_formulas14_offset_hex = 1610;
+ public static final int le_formulas15_offset = 5848;
+ public static final int le_formulas16_offset = 6048;
+ public static final int timingMultiplier_offset = 6248;
+ public static final int timingMultiplier_offset_hex = 1868;
+ public static final int timingAdditive_offset = 6448;
+ public static final int timingAdditive_offset_hex = 1930;
+ public static final int cltFuelCorrBins_offset = 6648;
+ public static final int cltFuelCorr_offset = 6712;
+ public static final int iatFuelCorrBins_offset = 6776;
+ public static final int iatFuelCorr_offset = 6840;
+ public static final int crankingFuelCoef_offset = 6904;
+ public static final int crankingFuelBins_offset = 6936;
+ public static final int crankingCycleCoef_offset = 6968;
+ public static final int crankingCycleBins_offset = 7000;
+ public static final int cltIdleCorrBins_offset = 7032;
+ public static final int cltIdleCorr_offset = 7096;
+ public static final int mafDecoding_offset = 7160;
+ public static final int mafDecodingBins_offset = 8184;
+ public static final int ignitionIatCorrTable_offset = 9208;
+ public static final int ignitionIatCorrLoadBins_offset = 10232;
+ public static final int ignitionIatCorrRpmBins_offset = 10296;
+ public static final int ignitionIatCorrRpmBins_offset_hex = 2838;
+ public static final int injectionPhase_offset = 10360;
+ public static final int injectionPhase_offset_hex = 2878;
+ public static final int injPhaseLoadBins_offset = 11384;
+ public static final int injPhaseRpmBins_offset = 11448;
+ public static final int fuelTable_offset = 11512;
+ public static final int fuelLoadBins_offset = 12536;
+ public static final int fuelRpmBins_offset = 12600;
+ public static final int fuelRpmBins_offset_hex = 3138;
+ public static final int ignitionTable_offset = 12664;
+ public static final int ignitionTable_offset_hex = 3178;
+ public static final int ignitionLoadBins_offset = 13688;
+ public static final int ignitionLoadBins_offset_hex = 3578;
+ public static final int ignitionRpmBins_offset = 13752;
+ public static final int veTable_offset = 13816;
+ 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 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);
@@ -1298,30 +1306,31 @@ public class Fields {
public static final Field WARMUPAFRPID_OFFSET = Field.create("WARMUPAFRPID_OFFSET", 2260, FieldType.FLOAT);
public static final Field WARMUPAFRTHRESHOLD = Field.create("WARMUPAFRTHRESHOLD", 2296, FieldType.FLOAT);
public static final Field BOOSTCUTPRESSURE = Field.create("BOOSTCUTPRESSURE", 2300, FieldType.FLOAT);
- public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3016, FieldType.INT);
- public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3216, FieldType.INT);
- public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3416, FieldType.INT);
- public static final Field LE_FORMULAS4 = Field.create("LE_FORMULAS4", 3616, FieldType.INT);
- public static final Field LE_FORMULAS5 = Field.create("LE_FORMULAS5", 3816, FieldType.INT);
- public static final Field LE_FORMULAS6 = Field.create("LE_FORMULAS6", 4016, FieldType.INT);
- public static final Field LE_FORMULAS7 = Field.create("LE_FORMULAS7", 4216, FieldType.INT);
- public static final Field LE_FORMULAS8 = Field.create("LE_FORMULAS8", 4416, FieldType.INT);
- public static final Field LE_FORMULAS9 = Field.create("LE_FORMULAS9", 4616, FieldType.INT);
- public static final Field LE_FORMULAS10 = Field.create("LE_FORMULAS10", 4816, FieldType.INT);
- public static final Field LE_FORMULAS11 = Field.create("LE_FORMULAS11", 5016, FieldType.INT);
- public static final Field LE_FORMULAS12 = Field.create("LE_FORMULAS12", 5216, FieldType.INT);
- public static final Field LE_FORMULAS13 = Field.create("LE_FORMULAS13", 5416, FieldType.INT);
- public static final Field LE_FORMULAS14 = Field.create("LE_FORMULAS14", 5616, FieldType.INT);
- public static final Field LE_FORMULAS15 = Field.create("LE_FORMULAS15", 5816, FieldType.INT);
- public static final Field LE_FORMULAS16 = Field.create("LE_FORMULAS16", 6016, FieldType.INT);
- public static final Field TIMINGMULTIPLIER = Field.create("TIMINGMULTIPLIER", 6216, FieldType.INT);
- public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 6416, FieldType.INT);
- public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 9176, FieldType.INT);
- public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 10328, FieldType.INT);
- public static final Field FUELTABLE = Field.create("FUELTABLE", 11480, FieldType.INT);
- public static final Field IGNITIONTABLE = Field.create("IGNITIONTABLE", 12632, FieldType.INT);
- public static final Field VETABLE = Field.create("VETABLE", 13784, FieldType.INT);
- public static final Field AFRTABLE = Field.create("AFRTABLE", 14936, FieldType.INT);
- public static final Field FSIOTABLE1 = Field.create("FSIOTABLE1", 16088, FieldType.INT);
- public static final Field FSIOTABLE2 = Field.create("FSIOTABLE2", 16408, FieldType.INT);
+ 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);
+ public static final Field LE_FORMULAS4 = Field.create("LE_FORMULAS4", 3648, FieldType.INT);
+ public static final Field LE_FORMULAS5 = Field.create("LE_FORMULAS5", 3848, FieldType.INT);
+ public static final Field LE_FORMULAS6 = Field.create("LE_FORMULAS6", 4048, FieldType.INT);
+ public static final Field LE_FORMULAS7 = Field.create("LE_FORMULAS7", 4248, FieldType.INT);
+ public static final Field LE_FORMULAS8 = Field.create("LE_FORMULAS8", 4448, FieldType.INT);
+ public static final Field LE_FORMULAS9 = Field.create("LE_FORMULAS9", 4648, FieldType.INT);
+ public static final Field LE_FORMULAS10 = Field.create("LE_FORMULAS10", 4848, FieldType.INT);
+ public static final Field LE_FORMULAS11 = Field.create("LE_FORMULAS11", 5048, FieldType.INT);
+ public static final Field LE_FORMULAS12 = Field.create("LE_FORMULAS12", 5248, FieldType.INT);
+ public static final Field LE_FORMULAS13 = Field.create("LE_FORMULAS13", 5448, FieldType.INT);
+ public static final Field LE_FORMULAS14 = Field.create("LE_FORMULAS14", 5648, FieldType.INT);
+ public static final Field LE_FORMULAS15 = Field.create("LE_FORMULAS15", 5848, FieldType.INT);
+ public static final Field LE_FORMULAS16 = Field.create("LE_FORMULAS16", 6048, FieldType.INT);
+ public static final Field TIMINGMULTIPLIER = Field.create("TIMINGMULTIPLIER", 6248, FieldType.INT);
+ public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 6448, FieldType.INT);
+ public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 9208, FieldType.INT);
+ public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 10360, FieldType.INT);
+ public static final Field FUELTABLE = Field.create("FUELTABLE", 11512, FieldType.INT);
+ 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);
}
diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml
index 3bb73a6770..29252a0215 100644
--- a/java_console/rusefi.xml
+++ b/java_console/rusefi.xml
@@ -7,20 +7,20 @@
RUSEFI
rusEfi
rusEfi
- 16728
+ 17080
-
-
@@ -29,15 +29,15 @@
-
-
@@ -46,15 +46,15 @@
-
-
@@ -63,16 +63,16 @@
-
-
@@ -80,15 +80,15 @@
-
+
-
@@ -108,20 +108,20 @@