diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 1ebce53639..358b78ab4d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 02:06:34 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 20:50:06 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3424,16 +3424,7 @@ struct persistent_config_s { /** * offset 15136 */ - fuel_table_t fuelTable; - /** - * offset 16160 - */ - float fuelLoadBins[FUEL_LOAD_COUNT]; - /** - * RPM is float and not integer in order to use unified methods for interpolation - * offset 16224 - */ - float fuelRpmBins[FUEL_RPM_COUNT]; + uint8_t unused15136[1152]; /** * offset 16288 */ @@ -3541,4 +3532,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 02:06:34 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 20:50:06 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 84cbe82702..9f216aaf52 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -526,12 +526,9 @@ #define fuelLevelEmptyTankVoltage_offset 684 #define fuelLevelFullTankVoltage_offset 688 #define fuelLevelSensor_offset 514 -#define fuelLoadBins_offset 16160 #define fuelPumpPin_offset 658 #define fuelPumpPinMode_offset 659 #define fuelRailPressure_offset 1756 -#define fuelRpmBins_offset 16224 -#define fuelTable_offset 15136 #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" @@ -1079,7 +1076,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 220050204 +#define SIGNATURE_HASH 1634949560 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1349,7 +1346,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.03.kin.220050204" +#define TS_SIGNATURE "rusEFI 2020.08.03.kin.1634949560" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1358,6 +1355,7 @@ #define un1used_former_warmup_target_afr_offset 2109 #define unused1059_offset 3964 #define unused1476b20_offset 1476 +#define unused15136_offset 15136 #define unused2432_offset 2432 #define unused244_1_offset 2420 #define unused244_2_offset 2424 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 193677426d..6157763654 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:50 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3424,16 +3424,7 @@ struct persistent_config_s { /** * offset 15136 */ - fuel_table_t fuelTable; - /** - * offset 16160 - */ - float fuelLoadBins[FUEL_LOAD_COUNT]; - /** - * RPM is float and not integer in order to use unified methods for interpolation - * offset 16224 - */ - float fuelRpmBins[FUEL_RPM_COUNT]; + uint8_t unused15136[1152]; /** * offset 16288 */ @@ -3541,4 +3532,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:50 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 80ebaaaa37..03c332119f 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:50 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 37df69d54c..a2e89c2f5b 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:50 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 1b1721f89d..cccd604a45 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:50 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 5a8744bc94..b8214dc3c9 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:50 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 0dcbc3209b..bce7b15aef 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -526,12 +526,9 @@ #define fuelLevelEmptyTankVoltage_offset 684 #define fuelLevelFullTankVoltage_offset 688 #define fuelLevelSensor_offset 514 -#define fuelLoadBins_offset 16160 #define fuelPumpPin_offset 658 #define fuelPumpPinMode_offset 659 #define fuelRailPressure_offset 1756 -#define fuelRpmBins_offset 16224 -#define fuelTable_offset 15136 #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" #define GAUGE_NAME_ACCEL_X "Acceleration: X" #define GAUGE_NAME_ACCEL_Y "Acceleration: Y" @@ -1079,7 +1076,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 3223547782 +#define SIGNATURE_HASH 1319574552 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1349,7 +1346,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.03.all.3223547782" +#define TS_SIGNATURE "rusEFI 2020.08.03.all.1319574552" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1358,6 +1355,7 @@ #define un1used_former_warmup_target_afr_offset 2109 #define unused1059_offset 3964 #define unused1476b20_offset 1476 +#define unused15136_offset 15136 #define unused2432_offset 2432 #define unused244_1_offset 2420 #define unused244_2_offset 2424 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 47c5b61bf1..c03a2e7a28 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 3223547782 -#define TS_SIGNATURE "rusEFI 2020.08.03.all.3223547782" +#define SIGNATURE_HASH 1319574552 +#define TS_SIGNATURE "rusEFI 2020.08.03.all.1319574552" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 60f2fc7266..74982d5b5c 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 514065253 -#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.514065253" +#define SIGNATURE_HASH 1925900737 +#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.1925900737" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 11751cc76e..6ecf86c20e 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 220050204 -#define TS_SIGNATURE "rusEFI 2020.08.03.kin.220050204" +#define SIGNATURE_HASH 1634949560 +#define TS_SIGNATURE "rusEFI 2020.08.03.kin.1634949560" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index f00175ef3e..75043e2a62 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 2313009416 -#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.2313009416" +#define SIGNATURE_HASH 3853734828 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.3853734828" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 5561b94ba6..13a5052224 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 2313009416 -#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.2313009416" +#define SIGNATURE_HASH 3853734828 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.3853734828" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 0db80fd046..025f308a3c 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 893368066 -#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.893368066" +#define SIGNATURE_HASH 1498504614 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.1498504614" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index f65f05cbe1..467e34a55a 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 893368066 -#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.893368066" +#define SIGNATURE_HASH 1498504614 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.1498504614" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 9bdc45dec8..45e311c987 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 1303518793 -#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.1303518793" +#define SIGNATURE_HASH 568128749 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.568128749" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 2ca822fdfe..5083cfbacb 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.08.03 -#define SIGNATURE_HASH 1303518793 -#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.1303518793" +#define SIGNATURE_HASH 568128749 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.568128749" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index edeea8bdc2..f1ca17fab9 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 0d12aac516..85f17b91b8 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.03.all.3223547782" + signature = "rusEFI 2020.08.03.all.1319574552" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.03.all.3223547782" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.all.1319574552" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:50 UTC 2020 pageSize = 20000 page = 1 @@ -1153,9 +1153,7 @@ page = 1 injectionPhase = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2 injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0.0, 0, 500.0, 2 injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - fuelTable = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2 - fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 500.0, 2 - fuelRpmBins = array, F32, 16224, [16], "RPM", 1, 0, 0.0, 25500.0, 2 + unused15136 = array, U08, 15136, [1152], "units", 1, 0, -20, 100, 0 ignitionTable = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0.0, 0, 500.0, 2 ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0.0, 0, 18000.0, 2 @@ -1436,12 +1434,6 @@ page = 1 filter = minTps, "Minimum TPS", TPSValue, < , 1, , true -;[VeAnalyze] -; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRValue, egoCorrection , { 1 } -; filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true - - - [OutputChannels] ochGetCommand = "O%2o%2c" @@ -1992,26 +1984,6 @@ page = 1 [TableEditor] ; table_id, map3d_id, "title", page - table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, TPSValue - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - - table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, engineLoad - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 topicHelp = "tpstpsHelp" @@ -2517,7 +2489,6 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2803,27 +2774,6 @@ cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] - dialog = fuelTableBottomDialog, "", card - panel = fuelTableELTbl, Center - - dialog = fuelTableRight, "", yAxis - topicHelp = "https://rusefi.com/s/fuel" - displayOnlyField = "Fuel Algorithm", fuelAlgorithm - panel = fuelTableBottomDialog, Center - liveGraph = fuelLive, "Fuel", South - graphLine = AFRValue - graphLine = RPMValue - - dialog = fuelTableGaugesPanel, yAxis - gauge = TPSGauge - gauge = MAFGauge - gauge = MAPGauge - - dialog = fuelTableDialog, "Fuel Table", xAxis - topicHelp = "fuelHelp" - panel = fuelTableGaugesPanel - panel = fuelTableRight - dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index a4c35b5bba..7f14fa5095 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.03.frankenso_na6.514065253" + signature = "rusEFI 2020.08.03.frankenso_na6.1925900737" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.03.frankenso_na6.514065253" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.frankenso_na6.1925900737" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:27 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:50:00 UTC 2020 pageSize = 20000 page = 1 @@ -1153,9 +1153,7 @@ page = 1 injectionPhase = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2 injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0.0, 0, 500.0, 2 injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - fuelTable = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2 - fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 500.0, 2 - fuelRpmBins = array, F32, 16224, [16], "RPM", 1, 0, 0.0, 25500.0, 2 + unused15136 = array, U08, 15136, [1152], "units", 1, 0, -20, 100, 0 ignitionTable = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0.0, 0, 500.0, 2 ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0.0, 0, 18000.0, 2 @@ -1436,12 +1434,6 @@ page = 1 filter = minTps, "Minimum TPS", TPSValue, < , 1, , true -;[VeAnalyze] -; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRValue, egoCorrection , { 1 } -; filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true - - - [OutputChannels] ochGetCommand = "O%2o%2c" @@ -1992,26 +1984,6 @@ page = 1 [TableEditor] ; table_id, map3d_id, "title", page - table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, TPSValue - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - - table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, engineLoad - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 topicHelp = "tpstpsHelp" @@ -2517,7 +2489,6 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2803,27 +2774,6 @@ cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] - dialog = fuelTableBottomDialog, "", card - panel = fuelTableELTbl, Center - - dialog = fuelTableRight, "", yAxis - topicHelp = "https://rusefi.com/s/fuel" - displayOnlyField = "Fuel Algorithm", fuelAlgorithm - panel = fuelTableBottomDialog, Center - liveGraph = fuelLive, "Fuel", South - graphLine = AFRValue - graphLine = RPMValue - - dialog = fuelTableGaugesPanel, yAxis - gauge = TPSGauge - gauge = MAFGauge - gauge = MAPGauge - - dialog = fuelTableDialog, "Fuel Table", xAxis - topicHelp = "fuelHelp" - panel = fuelTableGaugesPanel - panel = fuelTableRight - dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 5adb9997f8..8236cc5d64 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.03.kin.220050204" + signature = "rusEFI 2020.08.03.kin.1634949560" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.03.kin.220050204" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.kin.1634949560" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 02:06:34 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 20:50:06 UTC 2020 pageSize = 20000 page = 1 @@ -1153,9 +1153,7 @@ page = 1 injectionPhase = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2 injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0.0, 0, 500.0, 2 injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - fuelTable = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2 - fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 500.0, 2 - fuelRpmBins = array, F32, 16224, [16], "RPM", 1, 0, 0.0, 25500.0, 2 + unused15136 = array, U08, 15136, [1152], "units", 1, 0, -20, 100, 0 ignitionTable = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0.0, 0, 500.0, 2 ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0.0, 0, 18000.0, 2 @@ -1436,12 +1434,6 @@ page = 1 filter = minTps, "Minimum TPS", TPSValue, < , 1, , true -;[VeAnalyze] -; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRValue, egoCorrection , { 1 } -; filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true - - - [OutputChannels] ochGetCommand = "O%2o%2c" @@ -1992,26 +1984,6 @@ page = 1 [TableEditor] ; table_id, map3d_id, "title", page - table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, TPSValue - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - - table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, engineLoad - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 topicHelp = "tpstpsHelp" @@ -2517,7 +2489,6 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2803,27 +2774,6 @@ cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] - dialog = fuelTableBottomDialog, "", card - panel = fuelTableELTbl, Center - - dialog = fuelTableRight, "", yAxis - topicHelp = "https://rusefi.com/s/fuel" - displayOnlyField = "Fuel Algorithm", fuelAlgorithm - panel = fuelTableBottomDialog, Center - liveGraph = fuelLive, "Fuel", South - graphLine = AFRValue - graphLine = RPMValue - - dialog = fuelTableGaugesPanel, yAxis - gauge = TPSGauge - gauge = MAFGauge - gauge = MAPGauge - - dialog = fuelTableDialog, "Fuel Table", xAxis - topicHelp = "fuelHelp" - panel = fuelTableGaugesPanel - panel = fuelTableRight - dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index dda7bca03e..14ba331f35 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.03.mre_f4.2313009416" + signature = "rusEFI 2020.08.03.mre_f4.3853734828" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.03.mre_f4.2313009416" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.mre_f4.3853734828" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:26 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:59 UTC 2020 pageSize = 20000 page = 1 @@ -1153,9 +1153,7 @@ page = 1 injectionPhase = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2 injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0.0, 0, 500.0, 2 injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - fuelTable = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2 - fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 500.0, 2 - fuelRpmBins = array, F32, 16224, [16], "RPM", 1, 0, 0.0, 25500.0, 2 + unused15136 = array, U08, 15136, [1152], "units", 1, 0, -20, 100, 0 ignitionTable = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0.0, 0, 500.0, 2 ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0.0, 0, 18000.0, 2 @@ -1436,12 +1434,6 @@ page = 1 filter = minTps, "Minimum TPS", TPSValue, < , 1, , true -;[VeAnalyze] -; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRValue, egoCorrection , { 1 } -; filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true - - - [OutputChannels] ochGetCommand = "O%2o%2c" @@ -1992,26 +1984,6 @@ page = 1 [TableEditor] ; table_id, map3d_id, "title", page - table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, TPSValue - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - - table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, engineLoad - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 topicHelp = "tpstpsHelp" @@ -2517,7 +2489,6 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2798,27 +2769,6 @@ cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] - dialog = fuelTableBottomDialog, "", card - panel = fuelTableELTbl, Center - - dialog = fuelTableRight, "", yAxis - topicHelp = "https://rusefi.com/s/fuel" - displayOnlyField = "Fuel Algorithm", fuelAlgorithm - panel = fuelTableBottomDialog, Center - liveGraph = fuelLive, "Fuel", South - graphLine = AFRValue - graphLine = RPMValue - - dialog = fuelTableGaugesPanel, yAxis - gauge = TPSGauge - gauge = MAFGauge - gauge = MAPGauge - - dialog = fuelTableDialog, "Fuel Table", xAxis - topicHelp = "fuelHelp" - panel = fuelTableGaugesPanel - panel = fuelTableRight - dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 21044eab08..9835c6086d 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.03.mre_f7.2313009416" + signature = "rusEFI 2020.08.03.mre_f7.3853734828" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.03.mre_f7.2313009416" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.mre_f7.3853734828" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:25 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:55 UTC 2020 pageSize = 20000 page = 1 @@ -1153,9 +1153,7 @@ page = 1 injectionPhase = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2 injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0.0, 0, 500.0, 2 injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - fuelTable = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2 - fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 500.0, 2 - fuelRpmBins = array, F32, 16224, [16], "RPM", 1, 0, 0.0, 25500.0, 2 + unused15136 = array, U08, 15136, [1152], "units", 1, 0, -20, 100, 0 ignitionTable = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0.0, 0, 500.0, 2 ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0.0, 0, 18000.0, 2 @@ -1436,12 +1434,6 @@ page = 1 filter = minTps, "Minimum TPS", TPSValue, < , 1, , true -;[VeAnalyze] -; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRValue, egoCorrection , { 1 } -; filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true - - - [OutputChannels] ochGetCommand = "O%2o%2c" @@ -1992,26 +1984,6 @@ page = 1 [TableEditor] ; table_id, map3d_id, "title", page - table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, TPSValue - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - - table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, engineLoad - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 topicHelp = "tpstpsHelp" @@ -2517,7 +2489,6 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2798,27 +2769,6 @@ cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] - dialog = fuelTableBottomDialog, "", card - panel = fuelTableELTbl, Center - - dialog = fuelTableRight, "", yAxis - topicHelp = "https://rusefi.com/s/fuel" - displayOnlyField = "Fuel Algorithm", fuelAlgorithm - panel = fuelTableBottomDialog, Center - liveGraph = fuelLive, "Fuel", South - graphLine = AFRValue - graphLine = RPMValue - - dialog = fuelTableGaugesPanel, yAxis - gauge = TPSGauge - gauge = MAFGauge - gauge = MAPGauge - - dialog = fuelTableDialog, "Fuel Table", xAxis - topicHelp = "fuelHelp" - panel = fuelTableGaugesPanel - panel = fuelTableRight - dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 85d59e71a8..eeaea67ccf 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.03.prometheus_405.893368066" + signature = "rusEFI 2020.08.03.prometheus_405.1498504614" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.03.prometheus_405.893368066" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.prometheus_405.1498504614" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:30 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:50:03 UTC 2020 pageSize = 20000 page = 1 @@ -1153,9 +1153,7 @@ page = 1 injectionPhase = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2 injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0.0, 0, 500.0, 2 injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - fuelTable = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2 - fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 500.0, 2 - fuelRpmBins = array, F32, 16224, [16], "RPM", 1, 0, 0.0, 25500.0, 2 + unused15136 = array, U08, 15136, [1152], "units", 1, 0, -20, 100, 0 ignitionTable = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0.0, 0, 500.0, 2 ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0.0, 0, 18000.0, 2 @@ -1436,12 +1434,6 @@ page = 1 filter = minTps, "Minimum TPS", TPSValue, < , 1, , true -;[VeAnalyze] -; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRValue, egoCorrection , { 1 } -; filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true - - - [OutputChannels] ochGetCommand = "O%2o%2c" @@ -1992,26 +1984,6 @@ page = 1 [TableEditor] ; table_id, map3d_id, "title", page - table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, TPSValue - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - - table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, engineLoad - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 topicHelp = "tpstpsHelp" @@ -2517,7 +2489,6 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2799,27 +2770,6 @@ cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] - dialog = fuelTableBottomDialog, "", card - panel = fuelTableELTbl, Center - - dialog = fuelTableRight, "", yAxis - topicHelp = "https://rusefi.com/s/fuel" - displayOnlyField = "Fuel Algorithm", fuelAlgorithm - panel = fuelTableBottomDialog, Center - liveGraph = fuelLive, "Fuel", South - graphLine = AFRValue - graphLine = RPMValue - - dialog = fuelTableGaugesPanel, yAxis - gauge = TPSGauge - gauge = MAFGauge - gauge = MAPGauge - - dialog = fuelTableDialog, "Fuel Table", xAxis - topicHelp = "fuelHelp" - panel = fuelTableGaugesPanel - panel = fuelTableRight - dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 306fea2de9..c5f59d7014 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.03.prometheus_469.893368066" + signature = "rusEFI 2020.08.03.prometheus_469.1498504614" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.03.prometheus_469.893368066" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.prometheus_469.1498504614" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:29 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:50:02 UTC 2020 pageSize = 20000 page = 1 @@ -1153,9 +1153,7 @@ page = 1 injectionPhase = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2 injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0.0, 0, 500.0, 2 injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - fuelTable = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2 - fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 500.0, 2 - fuelRpmBins = array, F32, 16224, [16], "RPM", 1, 0, 0.0, 25500.0, 2 + unused15136 = array, U08, 15136, [1152], "units", 1, 0, -20, 100, 0 ignitionTable = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0.0, 0, 500.0, 2 ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0.0, 0, 18000.0, 2 @@ -1436,12 +1434,6 @@ page = 1 filter = minTps, "Minimum TPS", TPSValue, < , 1, , true -;[VeAnalyze] -; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRValue, egoCorrection , { 1 } -; filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true - - - [OutputChannels] ochGetCommand = "O%2o%2c" @@ -1992,26 +1984,6 @@ page = 1 [TableEditor] ; table_id, map3d_id, "title", page - table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, TPSValue - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - - table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, engineLoad - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 topicHelp = "tpstpsHelp" @@ -2517,7 +2489,6 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2799,27 +2770,6 @@ cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] - dialog = fuelTableBottomDialog, "", card - panel = fuelTableELTbl, Center - - dialog = fuelTableRight, "", yAxis - topicHelp = "https://rusefi.com/s/fuel" - displayOnlyField = "Fuel Algorithm", fuelAlgorithm - panel = fuelTableBottomDialog, Center - liveGraph = fuelLive, "Fuel", South - graphLine = AFRValue - graphLine = RPMValue - - dialog = fuelTableGaugesPanel, yAxis - gauge = TPSGauge - gauge = MAFGauge - gauge = MAPGauge - - dialog = fuelTableDialog, "Fuel Table", xAxis - topicHelp = "fuelHelp" - panel = fuelTableGaugesPanel - panel = fuelTableRight - dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6f48f5bfde..6a142e84f8 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.03.proteus_f4.1303518793" + signature = "rusEFI 2020.08.03.proteus_f4.568128749" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.03.proteus_f4.1303518793" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.proteus_f4.568128749" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:33 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:50:05 UTC 2020 pageSize = 20000 page = 1 @@ -1153,9 +1153,7 @@ page = 1 injectionPhase = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2 injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0.0, 0, 500.0, 2 injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - fuelTable = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2 - fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 500.0, 2 - fuelRpmBins = array, F32, 16224, [16], "RPM", 1, 0, 0.0, 25500.0, 2 + unused15136 = array, U08, 15136, [1152], "units", 1, 0, -20, 100, 0 ignitionTable = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0.0, 0, 500.0, 2 ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0.0, 0, 18000.0, 2 @@ -1436,12 +1434,6 @@ page = 1 filter = minTps, "Minimum TPS", TPSValue, < , 1, , true -;[VeAnalyze] -; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRValue, egoCorrection , { 1 } -; filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true - - - [OutputChannels] ochGetCommand = "O%2o%2c" @@ -1992,26 +1984,6 @@ page = 1 [TableEditor] ; table_id, map3d_id, "title", page - table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, TPSValue - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - - table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, engineLoad - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 topicHelp = "tpstpsHelp" @@ -2517,7 +2489,6 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2794,27 +2765,6 @@ cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] - dialog = fuelTableBottomDialog, "", card - panel = fuelTableELTbl, Center - - dialog = fuelTableRight, "", yAxis - topicHelp = "https://rusefi.com/s/fuel" - displayOnlyField = "Fuel Algorithm", fuelAlgorithm - panel = fuelTableBottomDialog, Center - liveGraph = fuelLive, "Fuel", South - graphLine = AFRValue - graphLine = RPMValue - - dialog = fuelTableGaugesPanel, yAxis - gauge = TPSGauge - gauge = MAFGauge - gauge = MAPGauge - - dialog = fuelTableDialog, "Fuel Table", xAxis - topicHelp = "fuelHelp" - panel = fuelTableGaugesPanel - panel = fuelTableRight - dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 8bd96511cf..f321c61e63 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.03.proteus_f7.1303518793" + signature = "rusEFI 2020.08.03.proteus_f7.568128749" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.03.proteus_f7.1303518793" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.proteus_f7.568128749" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:31 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:50:04 UTC 2020 pageSize = 20000 page = 1 @@ -1153,9 +1153,7 @@ page = 1 injectionPhase = array, F32, 13984, [16x16],"deg", 1, 0, -720, 720, 2 injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0.0, 0, 500.0, 2 injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - fuelTable = array, F32, 15136, [16x16],"ms", 1, 0, 0.0, 500.0, 2 - fuelLoadBins = array, F32, 16160, [16], "V", 1, 0, 0.0, 500.0, 2 - fuelRpmBins = array, F32, 16224, [16], "RPM", 1, 0, 0.0, 25500.0, 2 + unused15136 = array, U08, 15136, [1152], "units", 1, 0, -20, 100, 0 ignitionTable = array, F32, 16288, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0.0, 0, 500.0, 2 ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0.0, 0, 18000.0, 2 @@ -1436,12 +1434,6 @@ page = 1 filter = minTps, "Minimum TPS", TPSValue, < , 1, , true -;[VeAnalyze] -; fuelAnalyzeMap = fuelTableTbl, afrTableTbl, AFRValue, egoCorrection , { 1 } -; filter = minRPMFilter, "Minimum RPM", RPMValue, < , 500, , true - - - [OutputChannels] ochGetCommand = "O%2o%2c" @@ -1992,26 +1984,6 @@ page = 1 [TableEditor] ; table_id, map3d_id, "title", page - table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, TPSValue - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - - table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 - topicHelp = "fuelHelp" - ; constant, variable - xBins = fuelRpmBins, RPMValue - yBins = fuelLoadBins, engineLoad - zBins = fuelTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 topicHelp = "tpstpsHelp" @@ -2517,7 +2489,6 @@ menuDialog = main subMenu = std_separator # Fuel table/VE - subMenu = fuelTableDialog, "Fuel table", 0, {isInjectionEnabled == 1 && fuelAlgorithm != LM_SPEED_DENSITY && fuelAlgorithm != LM_REAL_MAF} subMenu = veTableDialog, "VE", 0, {isInjectionEnabled == 1} subMenu = injPhaseTableTbl, "Injection phase", 0, {isInjectionEnabled == 1} subMenu = std_separator @@ -2794,27 +2765,6 @@ cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] - dialog = fuelTableBottomDialog, "", card - panel = fuelTableELTbl, Center - - dialog = fuelTableRight, "", yAxis - topicHelp = "https://rusefi.com/s/fuel" - displayOnlyField = "Fuel Algorithm", fuelAlgorithm - panel = fuelTableBottomDialog, Center - liveGraph = fuelLive, "Fuel", South - graphLine = AFRValue - graphLine = RPMValue - - dialog = fuelTableGaugesPanel, yAxis - gauge = TPSGauge - gauge = MAFGauge - gauge = MAPGauge - - dialog = fuelTableDialog, "Fuel Table", xAxis - topicHelp = "fuelHelp" - panel = fuelTableGaugesPanel - panel = fuelTableRight - dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index eb26623f7c..8ac567d996 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 02:06:23 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 20:49:50 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -521,12 +521,9 @@ public class Fields { public static final int fuelLevelEmptyTankVoltage_offset = 684; public static final int fuelLevelFullTankVoltage_offset = 688; public static final int fuelLevelSensor_offset = 514; - public static final int fuelLoadBins_offset = 16160; public static final int fuelPumpPin_offset = 658; public static final int fuelPumpPinMode_offset = 659; public static final int fuelRailPressure_offset = 1756; - public static final int fuelRpmBins_offset = 16224; - public static final int fuelTable_offset = 15136; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; @@ -1060,6 +1057,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 1319574552; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1308,7 +1306,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.08.03.all.3223547782"; + public static final String TS_SIGNATURE = "rusEFI 2020.08.03.all.1319574552"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1317,6 +1315,7 @@ public class Fields { public static final int un1used_former_warmup_target_afr_offset = 2109; public static final int unused1059_offset = 3964; public static final int unused1476b20_offset = 1476; + public static final int unused15136_offset = 15136; public static final int unused2432_offset = 2432; public static final int unused244_1_offset = 2420; public static final int unused244_2_offset = 2424; @@ -2425,7 +2424,6 @@ public class Fields { public static final Field TIMINGADDITIVE = Field.create("TIMINGADDITIVE", 10072, 200, FieldType.STRING); 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); @@ -3404,7 +3402,6 @@ public class Fields { TIMINGADDITIVE, IGNITIONIATCORRTABLE, INJECTIONPHASE, - FUELTABLE, IGNITIONTABLE, VETABLE, AFRTABLE, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 51b5768ba5..229aa6544d 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - + @@ -64,23 +64,6 @@ - - -
- -
- - -
- -