diff --git a/firmware/controllers/actuators/aux_pid.cpp b/firmware/controllers/actuators/aux_pid.cpp index c39dfbd99b..be8d4b896d 100644 --- a/firmware/controllers/actuators/aux_pid.cpp +++ b/firmware/controllers/actuators/aux_pid.cpp @@ -83,7 +83,7 @@ public: float value = engine->triggerCentral.getVVTPosition(); - float targetValue = table->getValue(rpm, getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE)); + float targetValue = table->getValue(rpm, getFuelingLoad(PASS_ENGINE_PARAMETER_SIGNATURE)); percent_t pwm = auxPid.getOutput(targetValue, value); if (engineConfiguration->isVerboseAuxPid1) { diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp index 201e1e7fee..02554d7ad5 100644 --- a/firmware/controllers/actuators/idle_thread.cpp +++ b/firmware/controllers/actuators/idle_thread.cpp @@ -338,7 +338,7 @@ static percent_t automaticIdleController(float tpsPos DECLARE_ENGINE_PARAMETER_S // Apply PID Multiplier if used if (CONFIG(useIacPidMultTable)) { - float engineLoad = getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE); + float engineLoad = getFuelingLoad(PASS_ENGINE_PARAMETER_SIGNATURE); float multCoef = iacPidMultMap.getValue(rpm / RPM_1_BYTE_PACKING_MULT, engineLoad); // PID can be completely disabled of multCoef==0, or it just works as usual if multCoef==1 newValue = interpolateClamped(0.0f, engine->engineState.idle.baseIdlePosition, 1.0f, newValue, multCoef); diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp index db2f22058b..494643e92f 100644 --- a/firmware/controllers/algo/fuel_math.cpp +++ b/firmware/controllers/algo/fuel_math.cpp @@ -264,17 +264,22 @@ angle_t getInjectionOffset(float rpm DECLARE_ENGINE_PARAMETER_SUFFIX) { if (cisnan(rpm)) { return 0; // error already reported } - float engineLoad = getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE); + + float engineLoad = getFuelingLoad(PASS_ENGINE_PARAMETER_SIGNATURE); + if (cisnan(engineLoad)) { return 0; // error already reported } + angle_t value = fuelPhaseMap.getValue(rpm, engineLoad); + if (cisnan(value)) { // we could be here while resetting configuration for example warning(CUSTOM_ERR_6569, "phase map not ready"); return 0; } - angle_t result = value + CONFIG(extraInjectionOffset); + + angle_t result = value + CONFIG(extraInjectionOffset); fixAngle(result, "inj offset#2", CUSTOM_ERR_6553); return result; } diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index ffa89b890d..4dc9ffaae6 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.07.05 -#define SIGNATURE_HASH 3237681268 -#define TS_SIGNATURE "rusEFI 2020.07.05.all.3237681268" +#define SIGNATURE_HASH 1833818646 +#define TS_SIGNATURE "rusEFI 2020.07.05.all.1833818646" diff --git a/firmware/controllers/generated/signature_fra.h b/firmware/controllers/generated/signature_fra.h index 70f0bbf3bb..35d7de7977 100644 --- a/firmware/controllers/generated/signature_fra.h +++ b/firmware/controllers/generated/signature_fra.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD fra #define SIGNATURE_DATE 2020.07.05 -#define SIGNATURE_HASH 511472791 -#define TS_SIGNATURE "rusEFI 2020.07.05.fra.511472791" +#define SIGNATURE_HASH 3016406773 +#define TS_SIGNATURE "rusEFI 2020.07.05.fra.3016406773" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index bd0bc05c30..45fd4b8376 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.07.05 -#define SIGNATURE_HASH 231064814 -#define TS_SIGNATURE "rusEFI 2020.07.05.kin.231064814" +#define SIGNATURE_HASH 2691892876 +#define TS_SIGNATURE "rusEFI 2020.07.05.kin.2691892876" diff --git a/firmware/controllers/generated/signature_mre.h b/firmware/controllers/generated/signature_mre.h index 806260ead4..8074dd0d07 100644 --- a/firmware/controllers/generated/signature_mre.h +++ b/firmware/controllers/generated/signature_mre.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre #define SIGNATURE_DATE 2020.07.05 -#define SIGNATURE_HASH 2298859258 -#define TS_SIGNATURE "rusEFI 2020.07.05.mre.2298859258" +#define SIGNATURE_HASH 615713944 +#define TS_SIGNATURE "rusEFI 2020.07.05.mre.615713944" diff --git a/firmware/controllers/generated/signature_pro.h b/firmware/controllers/generated/signature_pro.h index 759ab745ca..d96bfd5134 100644 --- a/firmware/controllers/generated/signature_pro.h +++ b/firmware/controllers/generated/signature_pro.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD pro #define SIGNATURE_DATE 2020.07.05 -#define SIGNATURE_HASH 1298819515 -#define TS_SIGNATURE "rusEFI 2020.07.05.pro.1298819515" +#define SIGNATURE_HASH 3772558297 +#define TS_SIGNATURE "rusEFI 2020.07.05.pro.3772558297" diff --git a/firmware/controllers/generated/signature_pth.h b/firmware/controllers/generated/signature_pth.h index 0ac55fa967..20be960e8c 100644 --- a/firmware/controllers/generated/signature_pth.h +++ b/firmware/controllers/generated/signature_pth.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD pth #define SIGNATURE_DATE 2020.07.05 -#define SIGNATURE_HASH 904380656 -#define TS_SIGNATURE "rusEFI 2020.07.05.pth.904380656" +#define SIGNATURE_HASH 2555445906 +#define TS_SIGNATURE "rusEFI 2020.07.05.pth.2555445906" diff --git a/firmware/tunerstudio/cache.zip b/firmware/tunerstudio/cache.zip index 3b5e9020be..5106982ae7 100644 Binary files a/firmware/tunerstudio/cache.zip and b/firmware/tunerstudio/cache.zip differ diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 3609381652..075599dab0 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.05.all.3237681268" + signature = "rusEFI 2020.07.05.all.1833818646" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.05.all.3237681268" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.05.all.1833818646" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sun Jul 05 20:29:44 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 05 22:16:28 UTC 2020 pageSize = 20000 page = 1 @@ -1655,7 +1655,6 @@ page = 1 egoCorrection = { 100 } time = { timeNow } -; engineLoad = { fuleAlgorithm == 0 ? MAF : TPS } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : intake))} @@ -2051,22 +2050,22 @@ page = 1 table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, engineLoad + yBins = fsioTable1LoadBins, fuelingLoad zBins = fsioTable1 table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, engineLoad + yBins = fsioTable2LoadBins, fuelingLoad zBins = fsioTable2 table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, engineLoad + yBins = fsioTable3LoadBins, fuelingLoad zBins = fsioTable3 table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, engineLoad + yBins = fsioTable4LoadBins, fuelingLoad zBins = fsioTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 @@ -2119,7 +2118,7 @@ page = 1 #if tuneByTPS yBins = ignitionTpsBins, TPSValue #else - yBins = veLoadBins, MAPValue + yBins = veLoadBins, fuelingLoad #endif zBins = veTable ; gridHeight = 2.0 @@ -2131,7 +2130,7 @@ page = 1 topicHelp = "fuelHelp" ; constant, variable xBins = injPhaseRpmBins, RPMValue - yBins = injPhaseLoadBins, engineLoad + yBins = injPhaseLoadBins, fuelingLoad zBins = injectionPhase ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2150,7 +2149,7 @@ page = 1 table = afrTableTbl, afrTableMap, "Target AFR Table", 1 ; constant, variable xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, MAPValue + yBins = afrLoadBins, fuelingLoad zBins = afrTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2159,7 +2158,7 @@ page = 1 table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 ; constant, variable xBins = iacPidMultRpmBins, RPMValue - yBins = iacPidMultLoadBins, engineLoad + yBins = iacPidMultLoadBins, fuelingLoad zBins = iacPidMultTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index a78ecc471d..cce8e797d0 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -377,7 +377,6 @@ enable2ndByteCanID = false egoCorrection = { 100 } time = { timeNow } -; engineLoad = { fuleAlgorithm == 0 ? MAF : TPS } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : intake))} @@ -773,22 +772,22 @@ enable2ndByteCanID = false table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, engineLoad + yBins = fsioTable1LoadBins, fuelingLoad zBins = fsioTable1 table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, engineLoad + yBins = fsioTable2LoadBins, fuelingLoad zBins = fsioTable2 table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, engineLoad + yBins = fsioTable3LoadBins, fuelingLoad zBins = fsioTable3 table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, engineLoad + yBins = fsioTable4LoadBins, fuelingLoad zBins = fsioTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 @@ -841,7 +840,7 @@ enable2ndByteCanID = false #if tuneByTPS yBins = ignitionTpsBins, TPSValue #else - yBins = veLoadBins, MAPValue + yBins = veLoadBins, fuelingLoad #endif zBins = veTable ; gridHeight = 2.0 @@ -853,7 +852,7 @@ enable2ndByteCanID = false topicHelp = "fuelHelp" ; constant, variable xBins = injPhaseRpmBins, RPMValue - yBins = injPhaseLoadBins, engineLoad + yBins = injPhaseLoadBins, fuelingLoad zBins = injectionPhase ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -872,7 +871,7 @@ enable2ndByteCanID = false table = afrTableTbl, afrTableMap, "Target AFR Table", 1 ; constant, variable xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, MAPValue + yBins = afrLoadBins, fuelingLoad zBins = afrTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -881,7 +880,7 @@ enable2ndByteCanID = false table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 ; constant, variable xBins = iacPidMultRpmBins, RPMValue - yBins = iacPidMultLoadBins, engineLoad + yBins = iacPidMultLoadBins, fuelingLoad zBins = iacPidMultTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 27f7fd3758..89a090dd13 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.05.fra.511472791" + signature = "rusEFI 2020.07.05.fra.3016406773" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.05.fra.511472791" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.05.fra.3016406773" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sun Jul 05 20:29:48 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 05 22:16:31 UTC 2020 pageSize = 20000 page = 1 @@ -1655,7 +1655,6 @@ page = 1 egoCorrection = { 100 } time = { timeNow } -; engineLoad = { fuleAlgorithm == 0 ? MAF : TPS } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : intake))} @@ -2051,22 +2050,22 @@ page = 1 table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, engineLoad + yBins = fsioTable1LoadBins, fuelingLoad zBins = fsioTable1 table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, engineLoad + yBins = fsioTable2LoadBins, fuelingLoad zBins = fsioTable2 table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, engineLoad + yBins = fsioTable3LoadBins, fuelingLoad zBins = fsioTable3 table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, engineLoad + yBins = fsioTable4LoadBins, fuelingLoad zBins = fsioTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 @@ -2119,7 +2118,7 @@ page = 1 #if tuneByTPS yBins = ignitionTpsBins, TPSValue #else - yBins = veLoadBins, MAPValue + yBins = veLoadBins, fuelingLoad #endif zBins = veTable ; gridHeight = 2.0 @@ -2131,7 +2130,7 @@ page = 1 topicHelp = "fuelHelp" ; constant, variable xBins = injPhaseRpmBins, RPMValue - yBins = injPhaseLoadBins, engineLoad + yBins = injPhaseLoadBins, fuelingLoad zBins = injectionPhase ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2150,7 +2149,7 @@ page = 1 table = afrTableTbl, afrTableMap, "Target AFR Table", 1 ; constant, variable xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, MAPValue + yBins = afrLoadBins, fuelingLoad zBins = afrTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2159,7 +2158,7 @@ page = 1 table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 ; constant, variable xBins = iacPidMultRpmBins, RPMValue - yBins = iacPidMultLoadBins, engineLoad + yBins = iacPidMultLoadBins, fuelingLoad zBins = iacPidMultTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index dc253dae80..12d3bd0c61 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.05.kin.231064814" + signature = "rusEFI 2020.07.05.kin.2691892876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.05.kin.231064814" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.05.kin.2691892876" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sun Jul 05 20:29:52 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 05 22:16:37 UTC 2020 pageSize = 20000 page = 1 @@ -1655,7 +1655,6 @@ page = 1 egoCorrection = { 100 } time = { timeNow } -; engineLoad = { fuleAlgorithm == 0 ? MAF : TPS } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : intake))} @@ -2051,22 +2050,22 @@ page = 1 table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, engineLoad + yBins = fsioTable1LoadBins, fuelingLoad zBins = fsioTable1 table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, engineLoad + yBins = fsioTable2LoadBins, fuelingLoad zBins = fsioTable2 table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, engineLoad + yBins = fsioTable3LoadBins, fuelingLoad zBins = fsioTable3 table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, engineLoad + yBins = fsioTable4LoadBins, fuelingLoad zBins = fsioTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 @@ -2119,7 +2118,7 @@ page = 1 #if tuneByTPS yBins = ignitionTpsBins, TPSValue #else - yBins = veLoadBins, MAPValue + yBins = veLoadBins, fuelingLoad #endif zBins = veTable ; gridHeight = 2.0 @@ -2131,7 +2130,7 @@ page = 1 topicHelp = "fuelHelp" ; constant, variable xBins = injPhaseRpmBins, RPMValue - yBins = injPhaseLoadBins, engineLoad + yBins = injPhaseLoadBins, fuelingLoad zBins = injectionPhase ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2150,7 +2149,7 @@ page = 1 table = afrTableTbl, afrTableMap, "Target AFR Table", 1 ; constant, variable xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, MAPValue + yBins = afrLoadBins, fuelingLoad zBins = afrTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2159,7 +2158,7 @@ page = 1 table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 ; constant, variable xBins = iacPidMultRpmBins, RPMValue - yBins = iacPidMultLoadBins, engineLoad + yBins = iacPidMultLoadBins, fuelingLoad zBins = iacPidMultTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 1f415fc353..4489aa31cb 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.05.mre.2298859258" + signature = "rusEFI 2020.07.05.mre.615713944" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.05.mre.2298859258" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.05.mre.615713944" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sun Jul 05 20:29:46 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 05 22:16:30 UTC 2020 pageSize = 20000 page = 1 @@ -1655,7 +1655,6 @@ page = 1 egoCorrection = { 100 } time = { timeNow } -; engineLoad = { fuleAlgorithm == 0 ? MAF : TPS } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : intake))} @@ -2051,22 +2050,22 @@ page = 1 table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, engineLoad + yBins = fsioTable1LoadBins, fuelingLoad zBins = fsioTable1 table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, engineLoad + yBins = fsioTable2LoadBins, fuelingLoad zBins = fsioTable2 table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, engineLoad + yBins = fsioTable3LoadBins, fuelingLoad zBins = fsioTable3 table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, engineLoad + yBins = fsioTable4LoadBins, fuelingLoad zBins = fsioTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 @@ -2119,7 +2118,7 @@ page = 1 #if tuneByTPS yBins = ignitionTpsBins, TPSValue #else - yBins = veLoadBins, MAPValue + yBins = veLoadBins, fuelingLoad #endif zBins = veTable ; gridHeight = 2.0 @@ -2131,7 +2130,7 @@ page = 1 topicHelp = "fuelHelp" ; constant, variable xBins = injPhaseRpmBins, RPMValue - yBins = injPhaseLoadBins, engineLoad + yBins = injPhaseLoadBins, fuelingLoad zBins = injectionPhase ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2150,7 +2149,7 @@ page = 1 table = afrTableTbl, afrTableMap, "Target AFR Table", 1 ; constant, variable xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, MAPValue + yBins = afrLoadBins, fuelingLoad zBins = afrTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2159,7 +2158,7 @@ page = 1 table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 ; constant, variable xBins = iacPidMultRpmBins, RPMValue - yBins = iacPidMultLoadBins, engineLoad + yBins = iacPidMultLoadBins, fuelingLoad zBins = iacPidMultTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 9013c7190c..6a99303c24 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.05.pth.904380656" + signature = "rusEFI 2020.07.05.pth.2555445906" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.05.pth.904380656" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.05.pth.2555445906" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sun Jul 05 20:29:49 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 05 22:16:32 UTC 2020 pageSize = 20000 page = 1 @@ -1655,7 +1655,6 @@ page = 1 egoCorrection = { 100 } time = { timeNow } -; engineLoad = { fuleAlgorithm == 0 ? MAF : TPS } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : intake))} @@ -2051,22 +2050,22 @@ page = 1 table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, engineLoad + yBins = fsioTable1LoadBins, fuelingLoad zBins = fsioTable1 table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, engineLoad + yBins = fsioTable2LoadBins, fuelingLoad zBins = fsioTable2 table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, engineLoad + yBins = fsioTable3LoadBins, fuelingLoad zBins = fsioTable3 table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, engineLoad + yBins = fsioTable4LoadBins, fuelingLoad zBins = fsioTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 @@ -2119,7 +2118,7 @@ page = 1 #if tuneByTPS yBins = ignitionTpsBins, TPSValue #else - yBins = veLoadBins, MAPValue + yBins = veLoadBins, fuelingLoad #endif zBins = veTable ; gridHeight = 2.0 @@ -2131,7 +2130,7 @@ page = 1 topicHelp = "fuelHelp" ; constant, variable xBins = injPhaseRpmBins, RPMValue - yBins = injPhaseLoadBins, engineLoad + yBins = injPhaseLoadBins, fuelingLoad zBins = injectionPhase ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2150,7 +2149,7 @@ page = 1 table = afrTableTbl, afrTableMap, "Target AFR Table", 1 ; constant, variable xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, MAPValue + yBins = afrLoadBins, fuelingLoad zBins = afrTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2159,7 +2158,7 @@ page = 1 table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 ; constant, variable xBins = iacPidMultRpmBins, RPMValue - yBins = iacPidMultLoadBins, engineLoad + yBins = iacPidMultLoadBins, fuelingLoad zBins = iacPidMultTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 9b37bf6570..2c9ab75bbb 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.05.pro.1298819515" + signature = "rusEFI 2020.07.05.pro.3772558297" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.05.pro.1298819515" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.05.pro.3772558297" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sun Jul 05 20:29:51 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 05 22:16:34 UTC 2020 pageSize = 20000 page = 1 @@ -1655,7 +1655,6 @@ page = 1 egoCorrection = { 100 } time = { timeNow } -; engineLoad = { fuleAlgorithm == 0 ? MAF : TPS } ; These "synthetic" channels provide the Y-axis (load) value for gen purp PWM table's Y axes gppwm1_load = {(gppwm1_loadAxis == 0) ? TPSValue : ((gppwm1_loadAxis == 1) ? MAPValue : ((gppwm1_loadAxis == 2) ? coolant : intake))} @@ -2051,22 +2050,22 @@ page = 1 table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, engineLoad + yBins = fsioTable1LoadBins, fuelingLoad zBins = fsioTable1 table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, engineLoad + yBins = fsioTable2LoadBins, fuelingLoad zBins = fsioTable2 table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, engineLoad + yBins = fsioTable3LoadBins, fuelingLoad zBins = fsioTable3 table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, engineLoad + yBins = fsioTable4LoadBins, fuelingLoad zBins = fsioTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 @@ -2119,7 +2118,7 @@ page = 1 #if tuneByTPS yBins = ignitionTpsBins, TPSValue #else - yBins = veLoadBins, MAPValue + yBins = veLoadBins, fuelingLoad #endif zBins = veTable ; gridHeight = 2.0 @@ -2131,7 +2130,7 @@ page = 1 topicHelp = "fuelHelp" ; constant, variable xBins = injPhaseRpmBins, RPMValue - yBins = injPhaseLoadBins, engineLoad + yBins = injPhaseLoadBins, fuelingLoad zBins = injectionPhase ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2150,7 +2149,7 @@ page = 1 table = afrTableTbl, afrTableMap, "Target AFR Table", 1 ; constant, variable xBins = afrRpmBins, RPMValue - yBins = afrLoadBins, MAPValue + yBins = afrLoadBins, fuelingLoad zBins = afrTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. @@ -2159,7 +2158,7 @@ page = 1 table = iacPidMultTbl, iacPidMultMap, "IAC PID Multiplier Table", 1 ; constant, variable xBins = iacPidMultRpmBins, RPMValue - yBins = iacPidMultLoadBins, engineLoad + yBins = iacPidMultLoadBins, fuelingLoad zBins = iacPidMultTable ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.