diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 480776d06d..852cd2f714 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 Sun Nov 19 11:49:44 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 13:55:54 EST 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1949,8 +1949,8 @@ typedef struct { /** * offset 2916 */ - int unusedEnd[33]; - /** total size 3048*/ + int unusedEnd[939]; + /** total size 6672*/ } engine_configuration_s; typedef struct { @@ -1959,209 +1959,209 @@ typedef struct { */ engine_configuration_s engineConfiguration; /** - * offset 3048 + * offset 6672 */ le_formula_t fsioFormulas[FSIO_COMMAND_COUNT]; /** - * offset 6248 + * offset 9872 */ le_formula_t timingMultiplier; /** - * offset 6448 + * offset 10072 */ le_formula_t timingAdditive; /** - * offset 6648 + * offset 10272 */ float cltFuelCorrBins[CLT_CURVE_SIZE]; /** - * offset 6712 + * offset 10336 */ float cltFuelCorr[CLT_CURVE_SIZE]; /** - * offset 6776 + * offset 10400 */ float iatFuelCorrBins[IAT_CURVE_SIZE]; /** - * offset 6840 + * offset 10464 */ float iatFuelCorr[IAT_CURVE_SIZE]; /** - * offset 6904 + * offset 10528 */ float crankingFuelCoef[CRANKING_CURVE_SIZE]; /** - * offset 6936 + * offset 10560 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; /** - * offset 6968 + * offset 10592 */ float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** - * offset 7000 + * offset 10624 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller - * offset 7032 + * offset 10656 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** - * offset 7096 + * offset 10720 */ float cltIdleCorr[CLT_CURVE_SIZE]; /** * kg/hour value. * By the way 2.081989116 kg/h = 1 ft³/m - * offset 7160 + * offset 10784 */ float mafDecoding[MAF_DECODING_COUNT]; /** - * offset 8184 + * offset 11808 */ float mafDecodingBins[MAF_DECODING_COUNT]; /** - * offset 9208 + * offset 12832 */ angle_table_t ignitionIatCorrTable; /** - * offset 10232 + * offset 13856 */ float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; /** - * offset 10296 + * offset 13920 */ float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; /** - * offset 10360 + * offset 13984 */ angle_table_t injectionPhase; /** - * offset 11384 + * offset 15008 */ float injPhaseLoadBins[FUEL_LOAD_COUNT]; /** - * offset 11448 + * offset 15072 */ float injPhaseRpmBins[FUEL_RPM_COUNT]; /** - * offset 11512 + * offset 15136 */ fuel_table_t fuelTable; /** - * offset 12536 + * offset 16160 */ float fuelLoadBins[FUEL_LOAD_COUNT]; /** * RPM is float and not integer in order to use unified methods for interpolation - * offset 12600 + * offset 16224 */ float fuelRpmBins[FUEL_RPM_COUNT]; /** - * offset 12664 + * offset 16288 */ ignition_table_t ignitionTable; /** - * offset 13688 + * offset 17312 */ float ignitionLoadBins[IGN_LOAD_COUNT]; /** - * offset 13752 + * offset 17376 */ float ignitionRpmBins[IGN_RPM_COUNT]; /** - * offset 13816 + * offset 17440 */ ve_table_t veTable; /** - * offset 14840 + * offset 18464 */ float veLoadBins[FUEL_LOAD_COUNT]; /** - * offset 14904 + * offset 18528 */ float veRpmBins[FUEL_RPM_COUNT]; /** - * offset 14968 + * offset 18592 */ afr_table_t afrTable; /** - * offset 15224 + * offset 18848 */ float afrLoadBins[FUEL_LOAD_COUNT]; /** - * offset 15288 + * offset 18912 */ float afrRpmBins[FUEL_RPM_COUNT]; /** - * offset 15352 + * offset 18976 */ tps_tps_table_t tpsTpsAccelTable; /** - * offset 15608 + * offset 19232 */ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE]; /** * RPM is float and not integer in order to use unified methods for interpolation - * offset 15640 + * offset 19264 */ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE]; /** - * offset 15672 + * offset 19296 */ fsio_table_8x8_f32t fsioTable1; /** - * offset 15928 + * offset 19552 */ float fsioTable1LoadBins[FSIO_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation - * offset 15960 + * offset 19584 */ float fsioTable1RpmBins[FSIO_TABLE_8]; /** - * offset 15992 + * offset 19616 */ fsio_table_8x8_u8t fsioTable2; /** - * offset 16056 + * offset 19680 */ float fsioTable2LoadBins[FSIO_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation - * offset 16088 + * offset 19712 */ float fsioTable2RpmBins[FSIO_TABLE_8]; /** - * offset 16120 + * offset 19744 */ fsio_table_8x8_u8t fsioTable3; /** - * offset 16184 + * offset 19808 */ float fsioTable3LoadBins[FSIO_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation - * offset 16216 + * offset 19840 */ float fsioTable3RpmBins[FSIO_TABLE_8]; /** - * offset 16248 + * offset 19872 */ fsio_table_8x8_u8t fsioTable4; /** - * offset 16312 + * offset 19936 */ float fsioTable4LoadBins[FSIO_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation - * offset 16344 + * offset 19968 */ float fsioTable4RpmBins[FSIO_TABLE_8]; - /** total size 16376*/ + /** total size 20000*/ } persistent_config_s; #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 11:49:44 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 13:55:54 EST 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 7117bae533..aacaa8fb20 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1450,134 +1450,134 @@ #define oilPressure_value2_offset_hex b60 #define unusedEnd_offset 2916 #define unusedEnd_offset_hex b64 -#define fsioFormulas1_offset 3048 -#define fsioFormulas1_offset_hex be8 -#define fsioFormulas2_offset 3248 -#define fsioFormulas2_offset_hex cb0 -#define fsioFormulas3_offset 3448 -#define fsioFormulas3_offset_hex d78 -#define fsioFormulas4_offset 3648 -#define fsioFormulas4_offset_hex e40 -#define fsioFormulas5_offset 3848 -#define fsioFormulas5_offset_hex f08 -#define fsioFormulas6_offset 4048 -#define fsioFormulas6_offset_hex fd0 -#define fsioFormulas7_offset 4248 -#define fsioFormulas7_offset_hex 1098 -#define fsioFormulas8_offset 4448 -#define fsioFormulas8_offset_hex 1160 -#define fsioFormulas9_offset 4648 -#define fsioFormulas9_offset_hex 1228 -#define fsioFormulas10_offset 4848 -#define fsioFormulas10_offset_hex 12f0 -#define fsioFormulas11_offset 5048 -#define fsioFormulas11_offset_hex 13b8 -#define fsioFormulas12_offset 5248 -#define fsioFormulas12_offset_hex 1480 -#define fsioFormulas13_offset 5448 -#define fsioFormulas13_offset_hex 1548 -#define fsioFormulas14_offset 5648 -#define fsioFormulas14_offset_hex 1610 -#define fsioFormulas15_offset 5848 -#define fsioFormulas15_offset_hex 16d8 -#define fsioFormulas16_offset 6048 -#define fsioFormulas16_offset_hex 17a0 -#define timingMultiplier_offset 6248 -#define timingMultiplier_offset_hex 1868 -#define timingAdditive_offset 6448 -#define timingAdditive_offset_hex 1930 -#define cltFuelCorrBins_offset 6648 -#define cltFuelCorrBins_offset_hex 19f8 -#define cltFuelCorr_offset 6712 -#define cltFuelCorr_offset_hex 1a38 -#define iatFuelCorrBins_offset 6776 -#define iatFuelCorrBins_offset_hex 1a78 -#define iatFuelCorr_offset 6840 -#define iatFuelCorr_offset_hex 1ab8 -#define crankingFuelCoef_offset 6904 -#define crankingFuelCoef_offset_hex 1af8 -#define crankingFuelBins_offset 6936 -#define crankingFuelBins_offset_hex 1b18 -#define crankingCycleCoef_offset 6968 -#define crankingCycleCoef_offset_hex 1b38 -#define crankingCycleBins_offset 7000 -#define crankingCycleBins_offset_hex 1b58 -#define cltIdleCorrBins_offset 7032 -#define cltIdleCorrBins_offset_hex 1b78 -#define cltIdleCorr_offset 7096 -#define cltIdleCorr_offset_hex 1bb8 -#define mafDecoding_offset 7160 -#define mafDecoding_offset_hex 1bf8 -#define mafDecodingBins_offset 8184 -#define mafDecodingBins_offset_hex 1ff8 -#define ignitionIatCorrTable_offset 9208 -#define ignitionIatCorrTable_offset_hex 23f8 -#define ignitionIatCorrLoadBins_offset 10232 -#define ignitionIatCorrLoadBins_offset_hex 27f8 -#define ignitionIatCorrRpmBins_offset 10296 -#define ignitionIatCorrRpmBins_offset_hex 2838 -#define injectionPhase_offset 10360 -#define injectionPhase_offset_hex 2878 -#define injPhaseLoadBins_offset 11384 -#define injPhaseLoadBins_offset_hex 2c78 -#define injPhaseRpmBins_offset 11448 -#define injPhaseRpmBins_offset_hex 2cb8 -#define fuelTable_offset 11512 -#define fuelTable_offset_hex 2cf8 -#define fuelLoadBins_offset 12536 -#define fuelLoadBins_offset_hex 30f8 -#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 ignitionRpmBins_offset_hex 35b8 -#define veTable_offset 13816 -#define veTable_offset_hex 35f8 -#define veLoadBins_offset 14840 -#define veLoadBins_offset_hex 39f8 -#define veRpmBins_offset 14904 -#define veRpmBins_offset_hex 3a38 -#define afrTable_offset 14968 -#define afrTable_offset_hex 3a78 -#define afrLoadBins_offset 15224 -#define afrLoadBins_offset_hex 3b78 -#define afrRpmBins_offset 15288 -#define afrRpmBins_offset_hex 3bb8 -#define tpsTpsAccelTable_offset 15352 -#define tpsTpsAccelTable_offset_hex 3bf8 -#define tpsTpsAccelFromRpmBins_offset 15608 -#define tpsTpsAccelFromRpmBins_offset_hex 3cf8 -#define tpsTpsAccelToRpmBins_offset 15640 -#define tpsTpsAccelToRpmBins_offset_hex 3d18 -#define fsioTable1_offset 15672 -#define fsioTable1_offset_hex 3d38 -#define fsioTable1LoadBins_offset 15928 -#define fsioTable1LoadBins_offset_hex 3e38 -#define fsioTable1RpmBins_offset 15960 -#define fsioTable1RpmBins_offset_hex 3e58 -#define fsioTable2_offset 15992 -#define fsioTable2_offset_hex 3e78 -#define fsioTable2LoadBins_offset 16056 -#define fsioTable2LoadBins_offset_hex 3eb8 -#define fsioTable2RpmBins_offset 16088 -#define fsioTable2RpmBins_offset_hex 3ed8 -#define fsioTable3_offset 16120 -#define fsioTable3_offset_hex 3ef8 -#define fsioTable3LoadBins_offset 16184 -#define fsioTable3LoadBins_offset_hex 3f38 -#define fsioTable3RpmBins_offset 16216 -#define fsioTable3RpmBins_offset_hex 3f58 -#define fsioTable4_offset 16248 -#define fsioTable4_offset_hex 3f78 -#define fsioTable4LoadBins_offset 16312 -#define fsioTable4LoadBins_offset_hex 3fb8 -#define fsioTable4RpmBins_offset 16344 -#define fsioTable4RpmBins_offset_hex 3fd8 -#define TOTAL_CONFIG_SIZE 16376 -#define TOTAL_CONFIG_SIZE_hex 3ff8 +#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 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 timingMultiplier_offset 9872 +#define timingMultiplier_offset_hex 2690 +#define timingAdditive_offset 10072 +#define timingAdditive_offset_hex 2758 +#define cltFuelCorrBins_offset 10272 +#define cltFuelCorrBins_offset_hex 2820 +#define cltFuelCorr_offset 10336 +#define cltFuelCorr_offset_hex 2860 +#define iatFuelCorrBins_offset 10400 +#define iatFuelCorrBins_offset_hex 28a0 +#define iatFuelCorr_offset 10464 +#define iatFuelCorr_offset_hex 28e0 +#define crankingFuelCoef_offset 10528 +#define crankingFuelCoef_offset_hex 2920 +#define crankingFuelBins_offset 10560 +#define crankingFuelBins_offset_hex 2940 +#define crankingCycleCoef_offset 10592 +#define crankingCycleCoef_offset_hex 2960 +#define crankingCycleBins_offset 10624 +#define crankingCycleBins_offset_hex 2980 +#define cltIdleCorrBins_offset 10656 +#define cltIdleCorrBins_offset_hex 29a0 +#define cltIdleCorr_offset 10720 +#define cltIdleCorr_offset_hex 29e0 +#define mafDecoding_offset 10784 +#define mafDecoding_offset_hex 2a20 +#define mafDecodingBins_offset 11808 +#define mafDecodingBins_offset_hex 2e20 +#define ignitionIatCorrTable_offset 12832 +#define ignitionIatCorrTable_offset_hex 3220 +#define ignitionIatCorrLoadBins_offset 13856 +#define ignitionIatCorrLoadBins_offset_hex 3620 +#define ignitionIatCorrRpmBins_offset 13920 +#define ignitionIatCorrRpmBins_offset_hex 3660 +#define injectionPhase_offset 13984 +#define injectionPhase_offset_hex 36a0 +#define injPhaseLoadBins_offset 15008 +#define injPhaseLoadBins_offset_hex 3aa0 +#define injPhaseRpmBins_offset 15072 +#define injPhaseRpmBins_offset_hex 3ae0 +#define fuelTable_offset 15136 +#define fuelTable_offset_hex 3b20 +#define fuelLoadBins_offset 16160 +#define fuelLoadBins_offset_hex 3f20 +#define fuelRpmBins_offset 16224 +#define fuelRpmBins_offset_hex 3f60 +#define ignitionTable_offset 16288 +#define ignitionTable_offset_hex 3fa0 +#define ignitionLoadBins_offset 17312 +#define ignitionLoadBins_offset_hex 43a0 +#define ignitionRpmBins_offset 17376 +#define ignitionRpmBins_offset_hex 43e0 +#define veTable_offset 17440 +#define veTable_offset_hex 4420 +#define veLoadBins_offset 18464 +#define veLoadBins_offset_hex 4820 +#define veRpmBins_offset 18528 +#define veRpmBins_offset_hex 4860 +#define afrTable_offset 18592 +#define afrTable_offset_hex 48a0 +#define afrLoadBins_offset 18848 +#define afrLoadBins_offset_hex 49a0 +#define afrRpmBins_offset 18912 +#define afrRpmBins_offset_hex 49e0 +#define tpsTpsAccelTable_offset 18976 +#define tpsTpsAccelTable_offset_hex 4a20 +#define tpsTpsAccelFromRpmBins_offset 19232 +#define tpsTpsAccelFromRpmBins_offset_hex 4b20 +#define tpsTpsAccelToRpmBins_offset 19264 +#define tpsTpsAccelToRpmBins_offset_hex 4b40 +#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 TOTAL_CONFIG_SIZE 20000 +#define TOTAL_CONFIG_SIZE_hex 4e20 #define GAUGE_NAME_VERSION "firmware" #define GAUGE_NAME_VVT "VVT postion" #define GAUGE_NAME_TIMING_ADVANCE "timing" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 57c1ab4b90..f0d01c7e56 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -826,7 +826,7 @@ brain_pin_e brakePedalPin oil_pressure_config_s oilPressure; - int[33] unusedEnd; + int[939] unusedEnd; end_struct diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index da60adca0a..61dde505c9 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -246,9 +246,9 @@ void chDbgStackOverflowPanic(thread_t *otp) { chDbgPanic3(panicMessage, __FILE__, __LINE__); } -static char UNUSED_RAM_SIZE[14100]; +static char UNUSED_RAM_SIZE[8000]; -static char UNUSED_CCM_SIZE[16000] CCM_OPTIONAL; +static char UNUSED_CCM_SIZE[12000] CCM_OPTIONAL; int getRusEfiVersion(void) { if (UNUSED_RAM_SIZE[0] != 0) diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 4b5b47943a..6b24e2df02 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -63,9 +63,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 Sun Nov 19 11:49:44 EST 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 13:55:54 EST 2017 -pageSize = 16376 +pageSize = 20000 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 @@ -732,70 +732,70 @@ page = 1 oilPressure_v2 = scalar, F32, 2908, "volts", 1, 0.0, 0, 10.0, 2 oilPressure_value2 = scalar, F32, 2912, "kPa", 1, 0.0, 0, 1000.0, 2 ;skipping unusedEnd offset 2916 - fsioFormulas1 = string, ASCII, 3048, 200 - fsioFormulas2 = string, ASCII, 3248, 200 - fsioFormulas3 = string, ASCII, 3448, 200 - fsioFormulas4 = string, ASCII, 3648, 200 - fsioFormulas5 = string, ASCII, 3848, 200 - fsioFormulas6 = string, ASCII, 4048, 200 - fsioFormulas7 = string, ASCII, 4248, 200 - fsioFormulas8 = string, ASCII, 4448, 200 - fsioFormulas9 = string, ASCII, 4648, 200 - fsioFormulas10 = string, ASCII, 4848, 200 - fsioFormulas11 = string, ASCII, 5048, 200 - fsioFormulas12 = string, ASCII, 5248, 200 - fsioFormulas13 = string, ASCII, 5448, 200 - fsioFormulas14 = string, ASCII, 5648, 200 - fsioFormulas15 = string, ASCII, 5848, 200 - fsioFormulas16 = string, ASCII, 6048, 200 - timingMultiplier = string, ASCII, 6248, 200 - timingAdditive = string, ASCII, 6448, 200 - 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], "Temperature", 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], "kPa", 1, 0.0, 0, 300.0, 2 - veRpmBins = array, F32, 14904, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - 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 + 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], "%", 1, 0, 0.0, 500.0, 2 + iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100.0, 250.0, 2 + iatFuelCorr = array, F32, 10464, [16], "%", 1, 0, 0.0, 500.0, 2 + crankingFuelCoef = array, F32, 10528, [8], "%", 1, 0, 0.0, 700.0, 2 + crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80.0, 170.0, 2 + crankingCycleCoef = array, F32, 10592, [8], "%", 1, 0, 0.0, 500.0, 2 + crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80.0, 170.0, 2 + cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100.0, 250.0, 2 + cltIdleCorr = array, F32, 10720, [16], "%", 1, 0, 0.0, 500.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, 300.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, 300.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, 300.0, 2 + fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 300.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, 300.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, 300.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, 300.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 [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" directSelfStimulation = "Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nPS: Funny name, right? :)" diff --git a/java_console/io/src/com/rusefi/TsPageSize.java b/java_console/io/src/com/rusefi/TsPageSize.java index 39dcf9d9d2..01043d9c66 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 = 16376; + int IMAGE_SIZE = 20000; } diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index b492b7de29..4a9d2a2506 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 Nov 19 11:49:44 EST 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 13:55:54 EST 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -973,83 +973,89 @@ public class Fields { public static final int oilPressure_v2_offset = 2908; public static final int oilPressure_value2_offset = 2912; public static final int unusedEnd_offset = 2916; - public static final int fsioFormulas1_offset = 3048; - public static final int fsioFormulas2_offset = 3248; - public static final int fsioFormulas3_offset = 3448; - public static final int fsioFormulas4_offset = 3648; - public static final int fsioFormulas5_offset = 3848; - public static final int fsioFormulas6_offset = 4048; - public static final int fsioFormulas7_offset = 4248; - public static final int fsioFormulas7_offset_hex = 1098; - public static final int fsioFormulas8_offset = 4448; - public static final int fsioFormulas8_offset_hex = 1160; - public static final int fsioFormulas9_offset = 4648; - public static final int fsioFormulas9_offset_hex = 1228; - public static final int fsioFormulas10_offset = 4848; - public static final int fsioFormulas11_offset = 5048; - public static final int fsioFormulas12_offset = 5248; - public static final int fsioFormulas12_offset_hex = 1480; - public static final int fsioFormulas13_offset = 5448; - public static final int fsioFormulas13_offset_hex = 1548; - public static final int fsioFormulas14_offset = 5648; - public static final int fsioFormulas14_offset_hex = 1610; - public static final int fsioFormulas15_offset = 5848; - public static final int fsioFormulas16_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 = 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 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 = 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 timingMultiplier_offset = 9872; + public static final int timingMultiplier_offset_hex = 2690; + public static final int timingAdditive_offset = 10072; + public static final int timingAdditive_offset_hex = 2758; + public static final int cltFuelCorrBins_offset = 10272; + public static final int cltFuelCorrBins_offset_hex = 2820; + public static final int cltFuelCorr_offset = 10336; + public static final int cltFuelCorr_offset_hex = 2860; + public static final int iatFuelCorrBins_offset = 10400; + public static final int iatFuelCorr_offset = 10464; + public static final int crankingFuelCoef_offset = 10528; + public static final int crankingFuelCoef_offset_hex = 2920; + public static final int crankingFuelBins_offset = 10560; + public static final int crankingFuelBins_offset_hex = 2940; + public static final int crankingCycleCoef_offset = 10592; + public static final int crankingCycleCoef_offset_hex = 2960; + public static final int crankingCycleBins_offset = 10624; + public static final int crankingCycleBins_offset_hex = 2980; + public static final int cltIdleCorrBins_offset = 10656; + public static final int cltIdleCorr_offset = 10720; + public static final int mafDecoding_offset = 10784; + public static final int mafDecodingBins_offset = 11808; + public static final int ignitionIatCorrTable_offset = 12832; + public static final int ignitionIatCorrTable_offset_hex = 3220; + 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 injectionPhase_offset = 13984; + public static final int injPhaseLoadBins_offset = 15008; + public static final int injPhaseRpmBins_offset = 15072; + public static final int fuelTable_offset = 15136; + public static final int fuelLoadBins_offset = 16160; + public static final int fuelRpmBins_offset = 16224; + public static final int ignitionTable_offset = 16288; + public static final int ignitionLoadBins_offset = 17312; + public static final int ignitionRpmBins_offset = 17376; + public static final int veTable_offset = 17440; + public static final int veTable_offset_hex = 4420; + public static final int veLoadBins_offset = 18464; + public static final int veLoadBins_offset_hex = 4820; + public static final int veRpmBins_offset = 18528; + public static final int veRpmBins_offset_hex = 4860; + public static final int afrTable_offset = 18592; + public static final int afrLoadBins_offset = 18848; + public static final int afrRpmBins_offset = 18912; + public static final int tpsTpsAccelTable_offset = 18976; + public static final int tpsTpsAccelFromRpmBins_offset = 19232; + public static final int tpsTpsAccelToRpmBins_offset = 19264; + 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 TOTAL_CONFIG_SIZE = 20000; public static final String GAUGE_NAME_VERSION = "firmware"; public static final String GAUGE_NAME_VVT = "VVT postion"; public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; @@ -1743,33 +1749,33 @@ public class Fields { public static final Field OILPRESSURE_VALUE1 = Field.create("OILPRESSURE_VALUE1", 2904, FieldType.FLOAT); public static final Field OILPRESSURE_V2 = Field.create("OILPRESSURE_V2", 2908, FieldType.FLOAT); public static final Field OILPRESSURE_VALUE2 = Field.create("OILPRESSURE_VALUE2", 2912, FieldType.FLOAT); - public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 3048, FieldType.INT); - public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 3248, FieldType.INT); - public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 3448, FieldType.INT); - public static final Field FSIOFORMULAS4 = Field.create("FSIOFORMULAS4", 3648, FieldType.INT); - public static final Field FSIOFORMULAS5 = Field.create("FSIOFORMULAS5", 3848, FieldType.INT); - public static final Field FSIOFORMULAS6 = Field.create("FSIOFORMULAS6", 4048, FieldType.INT); - public static final Field FSIOFORMULAS7 = Field.create("FSIOFORMULAS7", 4248, FieldType.INT); - public static final Field FSIOFORMULAS8 = Field.create("FSIOFORMULAS8", 4448, FieldType.INT); - public static final Field FSIOFORMULAS9 = Field.create("FSIOFORMULAS9", 4648, FieldType.INT); - public static final Field FSIOFORMULAS10 = Field.create("FSIOFORMULAS10", 4848, FieldType.INT); - public static final Field FSIOFORMULAS11 = Field.create("FSIOFORMULAS11", 5048, FieldType.INT); - public static final Field FSIOFORMULAS12 = Field.create("FSIOFORMULAS12", 5248, FieldType.INT); - public static final Field FSIOFORMULAS13 = Field.create("FSIOFORMULAS13", 5448, FieldType.INT); - public static final Field FSIOFORMULAS14 = Field.create("FSIOFORMULAS14", 5648, FieldType.INT); - public static final Field FSIOFORMULAS15 = Field.create("FSIOFORMULAS15", 5848, FieldType.INT); - public static final Field FSIOFORMULAS16 = Field.create("FSIOFORMULAS16", 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", 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); + 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); }