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 a11a77a25b..15b818b643 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 Sun Jul 19 16:19:41 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 22 19:41:17 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2995,7 +2995,7 @@ struct engine_configuration_s { /** * offset 3288 */ - ignition_tps_table_t ignitionTpsTable; + uint8_t unused3288[512]; /** * offset 3800 */ @@ -3530,4 +3530,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 Sun Jul 19 16:19:41 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 22 19:41:17 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 0cd2634110..3665dbfe00 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -786,7 +786,6 @@ #define ignitionRpmBins_offset 17376 #define ignitionTable_offset 16288 #define ignitionTpsBins_offset 3800 -#define ignitionTpsTable_offset 3288 #define ignMathCalculateAtIndex_offset 1488 #define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_BRAKE_DOWN "brake: down" @@ -1075,8 +1074,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.19 -#define SIGNATURE_HASH 1773501990 +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 3833170085 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1344,7 +1343,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.19.kin.1773501990" +#define TS_SIGNATURE "rusEFI 2020.07.22.kin.3833170085" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1358,6 +1357,7 @@ #define unused244_3_offset 2428 #define unused2508_offset 2508 #define unused2516_offset 2516 +#define unused3288_offset 3288 #define unused6312_offset 6312 #define unused806_offset 806 #define unused_1484_bit_24_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 75d323740c..70c3e63e8d 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 Sun Jul 19 16:19:31 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:40:59 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2995,7 +2995,7 @@ struct engine_configuration_s { /** * offset 3288 */ - ignition_tps_table_t ignitionTpsTable; + uint8_t unused3288[512]; /** * offset 3800 */ @@ -3530,4 +3530,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 Sun Jul 19 16:19:31 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:40:59 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 0c408da060..6f7e5a9f56 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 Sun Jul 19 16:19:31 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:40:59 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 e76d70e27b..135b7662b1 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 Sun Jul 19 16:19:31 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:40:59 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 e6e4374c3c..ef9557d3a5 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 Sun Jul 19 16:19:31 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:40:59 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 4ef82ae79c..4d2821901f 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 Sun Jul 19 16:19:31 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:40:59 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 8046404fd0..778699efa7 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -786,7 +786,6 @@ #define ignitionRpmBins_offset 17376 #define ignitionTable_offset 16288 #define ignitionTpsBins_offset 3800 -#define ignitionTpsTable_offset 3288 #define ignMathCalculateAtIndex_offset 1488 #define INDICATOR_NAME_AC_SWITCH "AC switch" #define INDICATOR_NAME_BRAKE_DOWN "brake: down" @@ -1075,8 +1074,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.19 -#define SIGNATURE_HASH 2760614588 +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 692540479 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1344,7 +1343,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.19.all.2760614588" +#define TS_SIGNATURE "rusEFI 2020.07.22.all.692540479" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1358,6 +1357,7 @@ #define unused244_3_offset 2428 #define unused2508_offset 2508 #define unused2516_offset 2516 +#define unused3288_offset 3288 #define unused6312_offset 6312 #define unused806_offset 806 #define unused_1484_bit_24_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 684a34ecc3..65f52e49ce 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.21 -#define SIGNATURE_HASH 3066610021 -#define TS_SIGNATURE "rusEFI 2020.07.21.all.3066610021" +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 692540479 +#define TS_SIGNATURE "rusEFI 2020.07.22.all.692540479" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 1097eb40e9..f3dea3c05d 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.07.21 -#define SIGNATURE_HASH 1750052230 -#define TS_SIGNATURE "rusEFI 2020.07.21.frankenso_na6.1750052230" +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 4156569820 +#define TS_SIGNATURE "rusEFI 2020.07.22.frankenso_na6.4156569820" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 58182dda0f..02414ee618 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.21 -#define SIGNATURE_HASH 2079727103 -#define TS_SIGNATURE "rusEFI 2020.07.21.kin.2079727103" +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 3833170085 +#define TS_SIGNATURE "rusEFI 2020.07.22.kin.3833170085" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 3830679ff3..ee04715c9a 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.07.21 -#define SIGNATURE_HASH 4281735147 -#define TS_SIGNATURE "rusEFI 2020.07.21.mre_f4.4281735147" +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 1622770353 +#define TS_SIGNATURE "rusEFI 2020.07.22.mre_f4.1622770353" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f19ffcd8ff..7e6cf57e7c 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.07.21 -#define SIGNATURE_HASH 4281735147 -#define TS_SIGNATURE "rusEFI 2020.07.21.mre_f7.4281735147" +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 1622770353 +#define TS_SIGNATURE "rusEFI 2020.07.22.mre_f7.1622770353" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index c011b803ea..951d6e1ab6 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.07.21 -#define SIGNATURE_HASH 1137973729 -#define TS_SIGNATURE "rusEFI 2020.07.21.prometheus_405.1137973729" +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 3696987323 +#define TS_SIGNATURE "rusEFI 2020.07.22.prometheus_405.3696987323" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 65c185621d..93f1cdbacd 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.07.21 -#define SIGNATURE_HASH 1137973729 -#define TS_SIGNATURE "rusEFI 2020.07.21.prometheus_469.1137973729" +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 3696987323 +#define TS_SIGNATURE "rusEFI 2020.07.22.prometheus_469.3696987323" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index adc0307124..fef0319235 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.07.21 -#define SIGNATURE_HASH 995733674 -#define TS_SIGNATURE "rusEFI 2020.07.21.proteus_f4.995733674" +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 2765497840 +#define TS_SIGNATURE "rusEFI 2020.07.22.proteus_f4.2765497840" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 593d88309f..a9279fabbd 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.07.21 -#define SIGNATURE_HASH 995733674 -#define TS_SIGNATURE "rusEFI 2020.07.21.proteus_f7.995733674" +#define SIGNATURE_DATE 2020.07.22 +#define SIGNATURE_HASH 2765497840 +#define TS_SIGNATURE "rusEFI 2020.07.22.proteus_f7.2765497840" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 82bfc80500..bb90ae2300 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 f962b0b120..13d4d576a1 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -24,8 +24,6 @@ ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false -;#unset tuneByMAF - [SettingGroups] ; the referenceName will over-ride previous, so if you are creating a ; settingGroup with a reference name of lambdaSensor, it will replace the @@ -33,24 +31,14 @@ enable2ndByteCanID = false ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = tuneVeMode, "VE Autotune Mode" - settingOption = tuneByTPS, "TPS-Based (See Injection -> Inj.Settings)" - settingOption = tuneByMAF, "MAF-Based" - settingOption = tuneByLoad, "Load-Based (Default)" - -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" -; settingOption = FA_PLAIN_MAF, "Plain MAF" -; settingOption = FA_TPS, "AlphaN/TPS" -; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. - [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.21.all.3066610021" + signature = "rusEFI 2020.07.22.all.692540479" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.21.all.3066610021" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.22.all.692540479" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,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 Tue Jul 21 18:35:44 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:40:59 UTC 2020 pageSize = 20000 page = 1 @@ -1003,7 +991,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1, 0, 0.0, 100.0, 2 - ignitionTpsTable = array, S16, 3288, [16x16],"deg", 0.01, 0, -20, 90, 2 + unused3288 = array, U08, 3288, [512], "units", 1, 0, -20, 100, 0 ignitionTpsBins = array, F32, 3800, [16], "TPS", 1, 0.0, 0, 100.0, 2 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 @@ -1430,11 +1418,7 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition -#if tuneByMAF - veAnalyzeMap = fuelTableMAFTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#else veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#endif lambdaTargetTables = afrTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable @@ -2087,29 +2071,12 @@ page = 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 ; constant, variable xBins = ignitionRpmBins, RPMValue -#if FA_PLAIN_MAF - yBins = ignitionLoadBins, MAFValue -#elif FA_TPS - yBins = ignitionLoadBins, TPSValue -#else - yBins = ignitionLoadBins, engineLoad -#endif - + yBins = ignitionLoadBins, ignitionLoad zBins = ignitionTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - - table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 - ; constant, variable - ; Currently we share ignitionRpmBins between two advance tables... Is it ok? - xBins = ignitionRpmBins, RPMValue - yBins = ignitionTpsBins, TPSValue - zBins = ignitionTpsTable - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2122,11 +2089,7 @@ page = 1 table = veTableTbl, veTableMap, "VE Table", 1 ; constant, variable xBins = veRpmBins, RPMValue -#if tuneByTPS - yBins = ignitionTpsBins, TPSValue -#else yBins = veLoadBins, fuelingLoad -#endif zBins = veTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2580,7 +2543,6 @@ menuDialog = main subMenu = std_separator subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0} - subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1} subMenu = std_separator # corrections @@ -2887,12 +2849,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Mode", injectionMode, {isInjectionEnabled == 1} field = "#Batch injection with individual wiring" field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2} -#if tuneByTPS field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} -#else field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} -#endif dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} @@ -2922,7 +2881,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Wasted spark with individual coils" field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2} field = "Timing Mode", timingMode, {isIgnitionEnabled == 1} - field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1} field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 2c52971092..35f7da6009 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -24,8 +24,6 @@ ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false -;#unset tuneByMAF - [SettingGroups] ; the referenceName will over-ride previous, so if you are creating a ; settingGroup with a reference name of lambdaSensor, it will replace the @@ -33,24 +31,14 @@ enable2ndByteCanID = false ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = tuneVeMode, "VE Autotune Mode" - settingOption = tuneByTPS, "TPS-Based (See Injection -> Inj.Settings)" - settingOption = tuneByMAF, "MAF-Based" - settingOption = tuneByLoad, "Load-Based (Default)" - -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" -; settingOption = FA_PLAIN_MAF, "Plain MAF" -; settingOption = FA_TPS, "AlphaN/TPS" -; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. - [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.21.frankenso_na6.1750052230" + signature = "rusEFI 2020.07.22.frankenso_na6.4156569820" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.21.frankenso_na6.1750052230" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.22.frankenso_na6.4156569820" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,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 Tue Jul 21 18:35:49 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:41:10 UTC 2020 pageSize = 20000 page = 1 @@ -1003,7 +991,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1, 0, 0.0, 100.0, 2 - ignitionTpsTable = array, S16, 3288, [16x16],"deg", 0.01, 0, -20, 90, 2 + unused3288 = array, U08, 3288, [512], "units", 1, 0, -20, 100, 0 ignitionTpsBins = array, F32, 3800, [16], "TPS", 1, 0.0, 0, 100.0, 2 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 @@ -1430,11 +1418,7 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition -#if tuneByMAF - veAnalyzeMap = fuelTableMAFTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#else veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#endif lambdaTargetTables = afrTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable @@ -2087,29 +2071,12 @@ page = 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 ; constant, variable xBins = ignitionRpmBins, RPMValue -#if FA_PLAIN_MAF - yBins = ignitionLoadBins, MAFValue -#elif FA_TPS - yBins = ignitionLoadBins, TPSValue -#else - yBins = ignitionLoadBins, engineLoad -#endif - + yBins = ignitionLoadBins, ignitionLoad zBins = ignitionTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - - table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 - ; constant, variable - ; Currently we share ignitionRpmBins between two advance tables... Is it ok? - xBins = ignitionRpmBins, RPMValue - yBins = ignitionTpsBins, TPSValue - zBins = ignitionTpsTable - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2122,11 +2089,7 @@ page = 1 table = veTableTbl, veTableMap, "VE Table", 1 ; constant, variable xBins = veRpmBins, RPMValue -#if tuneByTPS - yBins = ignitionTpsBins, TPSValue -#else yBins = veLoadBins, fuelingLoad -#endif zBins = veTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2580,7 +2543,6 @@ menuDialog = main subMenu = std_separator subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0} - subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1} subMenu = std_separator # corrections @@ -2887,12 +2849,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Mode", injectionMode, {isInjectionEnabled == 1} field = "#Batch injection with individual wiring" field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2} -#if tuneByTPS field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} -#else field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} -#endif dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} @@ -2922,7 +2881,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Wasted spark with individual coils" field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2} field = "Timing Mode", timingMode, {isIgnitionEnabled == 1} - field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1} field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 2aaca2b038..9bf176b70a 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -24,8 +24,6 @@ ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false -;#unset tuneByMAF - [SettingGroups] ; the referenceName will over-ride previous, so if you are creating a ; settingGroup with a reference name of lambdaSensor, it will replace the @@ -33,24 +31,14 @@ enable2ndByteCanID = false ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = tuneVeMode, "VE Autotune Mode" - settingOption = tuneByTPS, "TPS-Based (See Injection -> Inj.Settings)" - settingOption = tuneByMAF, "MAF-Based" - settingOption = tuneByLoad, "Load-Based (Default)" - -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" -; settingOption = FA_PLAIN_MAF, "Plain MAF" -; settingOption = FA_TPS, "AlphaN/TPS" -; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. - [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.21.kin.2079727103" + signature = "rusEFI 2020.07.22.kin.3833170085" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.21.kin.2079727103" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.22.kin.3833170085" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,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 Tue Jul 21 18:35:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 22 19:41:17 UTC 2020 pageSize = 20000 page = 1 @@ -1003,7 +991,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1, 0, 0.0, 100.0, 2 - ignitionTpsTable = array, S16, 3288, [16x16],"deg", 0.01, 0, -20, 90, 2 + unused3288 = array, U08, 3288, [512], "units", 1, 0, -20, 100, 0 ignitionTpsBins = array, F32, 3800, [16], "TPS", 1, 0.0, 0, 100.0, 2 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 @@ -1430,11 +1418,7 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition -#if tuneByMAF - veAnalyzeMap = fuelTableMAFTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#else veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#endif lambdaTargetTables = afrTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable @@ -2087,29 +2071,12 @@ page = 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 ; constant, variable xBins = ignitionRpmBins, RPMValue -#if FA_PLAIN_MAF - yBins = ignitionLoadBins, MAFValue -#elif FA_TPS - yBins = ignitionLoadBins, TPSValue -#else - yBins = ignitionLoadBins, engineLoad -#endif - + yBins = ignitionLoadBins, ignitionLoad zBins = ignitionTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - - table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 - ; constant, variable - ; Currently we share ignitionRpmBins between two advance tables... Is it ok? - xBins = ignitionRpmBins, RPMValue - yBins = ignitionTpsBins, TPSValue - zBins = ignitionTpsTable - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2122,11 +2089,7 @@ page = 1 table = veTableTbl, veTableMap, "VE Table", 1 ; constant, variable xBins = veRpmBins, RPMValue -#if tuneByTPS - yBins = ignitionTpsBins, TPSValue -#else yBins = veLoadBins, fuelingLoad -#endif zBins = veTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2580,7 +2543,6 @@ menuDialog = main subMenu = std_separator subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0} - subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1} subMenu = std_separator # corrections @@ -2887,12 +2849,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Mode", injectionMode, {isInjectionEnabled == 1} field = "#Batch injection with individual wiring" field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2} -#if tuneByTPS field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} -#else field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} -#endif dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} @@ -2922,7 +2881,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Wasted spark with individual coils" field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2} field = "Timing Mode", timingMode, {isIgnitionEnabled == 1} - field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1} field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index bdccd5db05..5d5167fcc2 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -24,8 +24,6 @@ ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false -;#unset tuneByMAF - [SettingGroups] ; the referenceName will over-ride previous, so if you are creating a ; settingGroup with a reference name of lambdaSensor, it will replace the @@ -33,24 +31,14 @@ enable2ndByteCanID = false ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = tuneVeMode, "VE Autotune Mode" - settingOption = tuneByTPS, "TPS-Based (See Injection -> Inj.Settings)" - settingOption = tuneByMAF, "MAF-Based" - settingOption = tuneByLoad, "Load-Based (Default)" - -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" -; settingOption = FA_PLAIN_MAF, "Plain MAF" -; settingOption = FA_TPS, "AlphaN/TPS" -; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. - [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.21.mre_f4.4281735147" + signature = "rusEFI 2020.07.22.mre_f4.1622770353" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.21.mre_f4.4281735147" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.22.mre_f4.1622770353" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,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 Tue Jul 21 18:35:47 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:41:09 UTC 2020 pageSize = 20000 page = 1 @@ -1003,7 +991,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1, 0, 0.0, 100.0, 2 - ignitionTpsTable = array, S16, 3288, [16x16],"deg", 0.01, 0, -20, 90, 2 + unused3288 = array, U08, 3288, [512], "units", 1, 0, -20, 100, 0 ignitionTpsBins = array, F32, 3800, [16], "TPS", 1, 0.0, 0, 100.0, 2 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 @@ -1430,11 +1418,7 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition -#if tuneByMAF - veAnalyzeMap = fuelTableMAFTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#else veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#endif lambdaTargetTables = afrTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable @@ -2087,29 +2071,12 @@ page = 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 ; constant, variable xBins = ignitionRpmBins, RPMValue -#if FA_PLAIN_MAF - yBins = ignitionLoadBins, MAFValue -#elif FA_TPS - yBins = ignitionLoadBins, TPSValue -#else - yBins = ignitionLoadBins, engineLoad -#endif - + yBins = ignitionLoadBins, ignitionLoad zBins = ignitionTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - - table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 - ; constant, variable - ; Currently we share ignitionRpmBins between two advance tables... Is it ok? - xBins = ignitionRpmBins, RPMValue - yBins = ignitionTpsBins, TPSValue - zBins = ignitionTpsTable - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2122,11 +2089,7 @@ page = 1 table = veTableTbl, veTableMap, "VE Table", 1 ; constant, variable xBins = veRpmBins, RPMValue -#if tuneByTPS - yBins = ignitionTpsBins, TPSValue -#else yBins = veLoadBins, fuelingLoad -#endif zBins = veTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2580,7 +2543,6 @@ menuDialog = main subMenu = std_separator subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0} - subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1} subMenu = std_separator # corrections @@ -2882,12 +2844,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Mode", injectionMode, {isInjectionEnabled == 1} field = "#Batch injection with individual wiring" field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2} -#if tuneByTPS field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} -#else field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} -#endif dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} @@ -2917,7 +2876,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Wasted spark with individual coils" field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2} field = "Timing Mode", timingMode, {isIgnitionEnabled == 1} - field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1} field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 21b4bfcba4..54e84e4549 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -24,8 +24,6 @@ ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false -;#unset tuneByMAF - [SettingGroups] ; the referenceName will over-ride previous, so if you are creating a ; settingGroup with a reference name of lambdaSensor, it will replace the @@ -33,24 +31,14 @@ enable2ndByteCanID = false ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = tuneVeMode, "VE Autotune Mode" - settingOption = tuneByTPS, "TPS-Based (See Injection -> Inj.Settings)" - settingOption = tuneByMAF, "MAF-Based" - settingOption = tuneByLoad, "Load-Based (Default)" - -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" -; settingOption = FA_PLAIN_MAF, "Plain MAF" -; settingOption = FA_TPS, "AlphaN/TPS" -; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. - [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.21.mre_f7.4281735147" + signature = "rusEFI 2020.07.22.mre_f7.1622770353" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.21.mre_f7.4281735147" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.22.mre_f7.1622770353" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,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 Tue Jul 21 18:35:46 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:41:05 UTC 2020 pageSize = 20000 page = 1 @@ -1003,7 +991,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1, 0, 0.0, 100.0, 2 - ignitionTpsTable = array, S16, 3288, [16x16],"deg", 0.01, 0, -20, 90, 2 + unused3288 = array, U08, 3288, [512], "units", 1, 0, -20, 100, 0 ignitionTpsBins = array, F32, 3800, [16], "TPS", 1, 0.0, 0, 100.0, 2 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 @@ -1430,11 +1418,7 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition -#if tuneByMAF - veAnalyzeMap = fuelTableMAFTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#else veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#endif lambdaTargetTables = afrTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable @@ -2087,29 +2071,12 @@ page = 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 ; constant, variable xBins = ignitionRpmBins, RPMValue -#if FA_PLAIN_MAF - yBins = ignitionLoadBins, MAFValue -#elif FA_TPS - yBins = ignitionLoadBins, TPSValue -#else - yBins = ignitionLoadBins, engineLoad -#endif - + yBins = ignitionLoadBins, ignitionLoad zBins = ignitionTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - - table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 - ; constant, variable - ; Currently we share ignitionRpmBins between two advance tables... Is it ok? - xBins = ignitionRpmBins, RPMValue - yBins = ignitionTpsBins, TPSValue - zBins = ignitionTpsTable - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2122,11 +2089,7 @@ page = 1 table = veTableTbl, veTableMap, "VE Table", 1 ; constant, variable xBins = veRpmBins, RPMValue -#if tuneByTPS - yBins = ignitionTpsBins, TPSValue -#else yBins = veLoadBins, fuelingLoad -#endif zBins = veTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2580,7 +2543,6 @@ menuDialog = main subMenu = std_separator subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0} - subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1} subMenu = std_separator # corrections @@ -2882,12 +2844,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Mode", injectionMode, {isInjectionEnabled == 1} field = "#Batch injection with individual wiring" field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2} -#if tuneByTPS field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} -#else field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} -#endif dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} @@ -2917,7 +2876,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Wasted spark with individual coils" field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2} field = "Timing Mode", timingMode, {isIgnitionEnabled == 1} - field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1} field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 320f831126..c34e62a29c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -24,8 +24,6 @@ ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false -;#unset tuneByMAF - [SettingGroups] ; the referenceName will over-ride previous, so if you are creating a ; settingGroup with a reference name of lambdaSensor, it will replace the @@ -33,24 +31,14 @@ enable2ndByteCanID = false ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = tuneVeMode, "VE Autotune Mode" - settingOption = tuneByTPS, "TPS-Based (See Injection -> Inj.Settings)" - settingOption = tuneByMAF, "MAF-Based" - settingOption = tuneByLoad, "Load-Based (Default)" - -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" -; settingOption = FA_PLAIN_MAF, "Plain MAF" -; settingOption = FA_TPS, "AlphaN/TPS" -; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. - [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.21.prometheus_405.1137973729" + signature = "rusEFI 2020.07.22.prometheus_405.3696987323" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.21.prometheus_405.1137973729" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.22.prometheus_405.3696987323" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,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 Tue Jul 21 18:35:51 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:41:13 UTC 2020 pageSize = 20000 page = 1 @@ -1003,7 +991,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1, 0, 0.0, 100.0, 2 - ignitionTpsTable = array, S16, 3288, [16x16],"deg", 0.01, 0, -20, 90, 2 + unused3288 = array, U08, 3288, [512], "units", 1, 0, -20, 100, 0 ignitionTpsBins = array, F32, 3800, [16], "TPS", 1, 0.0, 0, 100.0, 2 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 @@ -1430,11 +1418,7 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition -#if tuneByMAF - veAnalyzeMap = fuelTableMAFTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#else veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#endif lambdaTargetTables = afrTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable @@ -2087,29 +2071,12 @@ page = 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 ; constant, variable xBins = ignitionRpmBins, RPMValue -#if FA_PLAIN_MAF - yBins = ignitionLoadBins, MAFValue -#elif FA_TPS - yBins = ignitionLoadBins, TPSValue -#else - yBins = ignitionLoadBins, engineLoad -#endif - + yBins = ignitionLoadBins, ignitionLoad zBins = ignitionTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - - table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 - ; constant, variable - ; Currently we share ignitionRpmBins between two advance tables... Is it ok? - xBins = ignitionRpmBins, RPMValue - yBins = ignitionTpsBins, TPSValue - zBins = ignitionTpsTable - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2122,11 +2089,7 @@ page = 1 table = veTableTbl, veTableMap, "VE Table", 1 ; constant, variable xBins = veRpmBins, RPMValue -#if tuneByTPS - yBins = ignitionTpsBins, TPSValue -#else yBins = veLoadBins, fuelingLoad -#endif zBins = veTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2580,7 +2543,6 @@ menuDialog = main subMenu = std_separator subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0} - subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1} subMenu = std_separator # corrections @@ -2883,12 +2845,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Mode", injectionMode, {isInjectionEnabled == 1} field = "#Batch injection with individual wiring" field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2} -#if tuneByTPS field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} -#else field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} -#endif dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} @@ -2918,7 +2877,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Wasted spark with individual coils" field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2} field = "Timing Mode", timingMode, {isIgnitionEnabled == 1} - field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1} field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index bb1e477120..eb6b6e7b94 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -24,8 +24,6 @@ ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false -;#unset tuneByMAF - [SettingGroups] ; the referenceName will over-ride previous, so if you are creating a ; settingGroup with a reference name of lambdaSensor, it will replace the @@ -33,24 +31,14 @@ enable2ndByteCanID = false ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = tuneVeMode, "VE Autotune Mode" - settingOption = tuneByTPS, "TPS-Based (See Injection -> Inj.Settings)" - settingOption = tuneByMAF, "MAF-Based" - settingOption = tuneByLoad, "Load-Based (Default)" - -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" -; settingOption = FA_PLAIN_MAF, "Plain MAF" -; settingOption = FA_TPS, "AlphaN/TPS" -; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. - [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.21.prometheus_469.1137973729" + signature = "rusEFI 2020.07.22.prometheus_469.3696987323" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.21.prometheus_469.1137973729" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.22.prometheus_469.3696987323" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,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 Tue Jul 21 18:35:50 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:41:11 UTC 2020 pageSize = 20000 page = 1 @@ -1003,7 +991,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1, 0, 0.0, 100.0, 2 - ignitionTpsTable = array, S16, 3288, [16x16],"deg", 0.01, 0, -20, 90, 2 + unused3288 = array, U08, 3288, [512], "units", 1, 0, -20, 100, 0 ignitionTpsBins = array, F32, 3800, [16], "TPS", 1, 0.0, 0, 100.0, 2 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 @@ -1430,11 +1418,7 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition -#if tuneByMAF - veAnalyzeMap = fuelTableMAFTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#else veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#endif lambdaTargetTables = afrTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable @@ -2087,29 +2071,12 @@ page = 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 ; constant, variable xBins = ignitionRpmBins, RPMValue -#if FA_PLAIN_MAF - yBins = ignitionLoadBins, MAFValue -#elif FA_TPS - yBins = ignitionLoadBins, TPSValue -#else - yBins = ignitionLoadBins, engineLoad -#endif - + yBins = ignitionLoadBins, ignitionLoad zBins = ignitionTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - - table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 - ; constant, variable - ; Currently we share ignitionRpmBins between two advance tables... Is it ok? - xBins = ignitionRpmBins, RPMValue - yBins = ignitionTpsBins, TPSValue - zBins = ignitionTpsTable - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2122,11 +2089,7 @@ page = 1 table = veTableTbl, veTableMap, "VE Table", 1 ; constant, variable xBins = veRpmBins, RPMValue -#if tuneByTPS - yBins = ignitionTpsBins, TPSValue -#else yBins = veLoadBins, fuelingLoad -#endif zBins = veTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2580,7 +2543,6 @@ menuDialog = main subMenu = std_separator subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0} - subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1} subMenu = std_separator # corrections @@ -2883,12 +2845,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Mode", injectionMode, {isInjectionEnabled == 1} field = "#Batch injection with individual wiring" field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2} -#if tuneByTPS field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} -#else field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} -#endif dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} @@ -2918,7 +2877,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Wasted spark with individual coils" field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2} field = "Timing Mode", timingMode, {isIgnitionEnabled == 1} - field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1} field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index c552939446..4f4a7713fb 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -24,8 +24,6 @@ ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false -;#unset tuneByMAF - [SettingGroups] ; the referenceName will over-ride previous, so if you are creating a ; settingGroup with a reference name of lambdaSensor, it will replace the @@ -33,24 +31,14 @@ enable2ndByteCanID = false ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = tuneVeMode, "VE Autotune Mode" - settingOption = tuneByTPS, "TPS-Based (See Injection -> Inj.Settings)" - settingOption = tuneByMAF, "MAF-Based" - settingOption = tuneByLoad, "Load-Based (Default)" - -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" -; settingOption = FA_PLAIN_MAF, "Plain MAF" -; settingOption = FA_TPS, "AlphaN/TPS" -; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. - [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.21.proteus_f4.995733674" + signature = "rusEFI 2020.07.22.proteus_f4.2765497840" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.21.proteus_f4.995733674" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.22.proteus_f4.2765497840" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,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 Tue Jul 21 18:35:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:41:16 UTC 2020 pageSize = 20000 page = 1 @@ -1003,7 +991,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1, 0, 0.0, 100.0, 2 - ignitionTpsTable = array, S16, 3288, [16x16],"deg", 0.01, 0, -20, 90, 2 + unused3288 = array, U08, 3288, [512], "units", 1, 0, -20, 100, 0 ignitionTpsBins = array, F32, 3800, [16], "TPS", 1, 0.0, 0, 100.0, 2 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 @@ -1430,11 +1418,7 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition -#if tuneByMAF - veAnalyzeMap = fuelTableMAFTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#else veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#endif lambdaTargetTables = afrTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable @@ -2087,29 +2071,12 @@ page = 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 ; constant, variable xBins = ignitionRpmBins, RPMValue -#if FA_PLAIN_MAF - yBins = ignitionLoadBins, MAFValue -#elif FA_TPS - yBins = ignitionLoadBins, TPSValue -#else - yBins = ignitionLoadBins, engineLoad -#endif - + yBins = ignitionLoadBins, ignitionLoad zBins = ignitionTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - - table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 - ; constant, variable - ; Currently we share ignitionRpmBins between two advance tables... Is it ok? - xBins = ignitionRpmBins, RPMValue - yBins = ignitionTpsBins, TPSValue - zBins = ignitionTpsTable - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2122,11 +2089,7 @@ page = 1 table = veTableTbl, veTableMap, "VE Table", 1 ; constant, variable xBins = veRpmBins, RPMValue -#if tuneByTPS - yBins = ignitionTpsBins, TPSValue -#else yBins = veLoadBins, fuelingLoad -#endif zBins = veTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2580,7 +2543,6 @@ menuDialog = main subMenu = std_separator subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0} - subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1} subMenu = std_separator # corrections @@ -2878,12 +2840,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Mode", injectionMode, {isInjectionEnabled == 1} field = "#Batch injection with individual wiring" field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2} -#if tuneByTPS field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} -#else field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} -#endif dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} @@ -2913,7 +2872,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Wasted spark with individual coils" field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2} field = "Timing Mode", timingMode, {isIgnitionEnabled == 1} - field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1} field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index ffbd0cb01c..5e67ef8f94 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -24,8 +24,6 @@ ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false -;#unset tuneByMAF - [SettingGroups] ; the referenceName will over-ride previous, so if you are creating a ; settingGroup with a reference name of lambdaSensor, it will replace the @@ -33,24 +31,14 @@ enable2ndByteCanID = false ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName - settingGroup = tuneVeMode, "VE Autotune Mode" - settingOption = tuneByTPS, "TPS-Based (See Injection -> Inj.Settings)" - settingOption = tuneByMAF, "MAF-Based" - settingOption = tuneByLoad, "Load-Based (Default)" - -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" -; settingOption = FA_PLAIN_MAF, "Plain MAF" -; settingOption = FA_TPS, "AlphaN/TPS" -; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. - [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.21.proteus_f7.995733674" + signature = "rusEFI 2020.07.22.proteus_f7.2765497840" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.21.proteus_f7.995733674" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.22.proteus_f7.2765497840" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,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 Tue Jul 21 18:35:53 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:41:14 UTC 2020 pageSize = 20000 page = 1 @@ -1003,7 +991,7 @@ page = 1 coastingFuelCutMap = scalar, S16, 3158, "kPa", 1, 0, 0, 250, 0 iacCoastingBins = array, F32, 3160, [16], "C", 1, 0, -100.0, 250.0, 2 iacCoasting = array, F32, 3224, [16], "%", 1, 0, 0.0, 100.0, 2 - ignitionTpsTable = array, S16, 3288, [16x16],"deg", 0.01, 0, -20, 90, 2 + unused3288 = array, U08, 3288, [512], "units", 1, 0, -20, 100, 0 ignitionTpsBins = array, F32, 3800, [16], "TPS", 1, 0.0, 0, 100.0, 2 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4 @@ -1430,11 +1418,7 @@ page = 1 [VeAnalyze] ; tableName, lambdaTargetTableName, lambdaChannel, egoCorrectionChannel, activeCondition -#if tuneByMAF - veAnalyzeMap = fuelTableMAFTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#else veAnalyzeMap = veTableTbl, afrTableTbl, AFRValue, egoCorrection, { 1 } -#endif lambdaTargetTables = afrTableTbl, afrTSCustom ; filter = Name, "DisplayName", outputChannel, operator, defaultVal, userAdjustable @@ -2087,29 +2071,12 @@ page = 1 table = ignitionTableTbl, ignitionTableMap, "Ignition Table", 1 ; constant, variable xBins = ignitionRpmBins, RPMValue -#if FA_PLAIN_MAF - yBins = ignitionLoadBins, MAFValue -#elif FA_TPS - yBins = ignitionLoadBins, TPSValue -#else - yBins = ignitionLoadBins, engineLoad -#endif - + yBins = ignitionLoadBins, ignitionLoad zBins = ignitionTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - - table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 - ; constant, variable - ; Currently we share ignitionRpmBins between two advance tables... Is it ok? - xBins = ignitionRpmBins, RPMValue - yBins = ignitionTpsBins, TPSValue - zBins = ignitionTpsTable - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" - table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2122,11 +2089,7 @@ page = 1 table = veTableTbl, veTableMap, "VE Table", 1 ; constant, variable xBins = veRpmBins, RPMValue -#if tuneByTPS - yBins = ignitionTpsBins, TPSValue -#else yBins = veLoadBins, fuelingLoad -#endif zBins = veTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2580,7 +2543,6 @@ menuDialog = main subMenu = std_separator subMenu = ignitionTableTbl, "Ignition advance", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 0} - subMenu = ignitionTpsTableTbl, "Ignition advance (TPS)", 0, {isIgnitionEnabled == 1 && useTPSAdvanceTable == 1} subMenu = std_separator # corrections @@ -2878,12 +2840,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Mode", injectionMode, {isInjectionEnabled == 1} field = "#Batch injection with individual wiring" field = "Two wire batch emulation", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2} -#if tuneByTPS field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {isInjectionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} -#else field = "#Enabled for TPS-Based 'VE Autotune Mode' in Project Settings" field = "Use TPS instead of Load for VE table", useTPSBasedVeTable, {0} -#endif dialog = ignitionOutputs, "Ignition Outputs" field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} @@ -2913,7 +2872,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Wasted spark with individual coils" field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2} field = "Timing Mode", timingMode, {isIgnitionEnabled == 1} - field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY} + field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1} field = "#Use fixed timing while validating with a timing gun" field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1} 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 4a8bc3e39c..25ed10ff86 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 Sun Jul 19 16:19:31 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 22 19:40:59 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -780,7 +780,6 @@ public class Fields { public static final int ignitionRpmBins_offset = 17376; public static final int ignitionTable_offset = 16288; public static final int ignitionTpsBins_offset = 3800; - public static final int ignitionTpsTable_offset = 3288; public static final int ignMathCalculateAtIndex_offset = 1488; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; @@ -1057,6 +1056,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 = 692540479; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1303,7 +1303,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.07.19.all.2760614588"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.22.all.692540479"; 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 +1317,7 @@ public class Fields { public static final int unused244_3_offset = 2428; public static final int unused2508_offset = 2508; public static final int unused2516_offset = 2516; + public static final int unused3288_offset = 3288; public static final int unused6312_offset = 6312; public static final int unused806_offset = 806; public static final int unused_1484_bit_24_offset = 1476; @@ -2307,7 +2308,6 @@ public class Fields { public static final Field COASTINGFUELCUTCLT = Field.create("COASTINGFUELCUTCLT", 3154, FieldType.INT16); public static final Field PIDEXTRAFORLOWRPM = Field.create("PIDEXTRAFORLOWRPM", 3156, FieldType.INT16); public static final Field COASTINGFUELCUTMAP = Field.create("COASTINGFUELCUTMAP", 3158, FieldType.INT16); - public static final Field IGNITIONTPSTABLE = Field.create("IGNITIONTPSTABLE", 3288, FieldType.INT); public static final Field TCHARGEAIRCOEFMIN = Field.create("TCHARGEAIRCOEFMIN", 3864, FieldType.FLOAT); public static final Field TCHARGEAIRCOEFMAX = Field.create("TCHARGEAIRCOEFMAX", 3868, FieldType.FLOAT); public static final Field TCHARGEAIRFLOWMAX = Field.create("TCHARGEAIRFLOWMAX", 3872, FieldType.FLOAT); @@ -3287,7 +3287,6 @@ public class Fields { COASTINGFUELCUTCLT, PIDEXTRAFORLOWRPM, COASTINGFUELCUTMAP, - IGNITIONTPSTABLE, TCHARGEAIRCOEFMIN, TCHARGEAIRCOEFMAX, TCHARGEAIRFLOWMAX, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 1770605489..5448a59080 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +