diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index f6f2487bc4..7698aed316 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 02:28:08 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 11:25:05 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -115,7 +115,9 @@ typedef struct pid_s pid_s; // start of cranking_parameters_s struct cranking_parameters_s { /** - * Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width. + * Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width. + * A reasonable starting point is 60mg per liter per cylinder. + * ex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel. * offset 0 */ float baseFuel; @@ -3750,4 +3752,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 02:28:08 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 11:25:05 UTC 2020 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 937cccd5ae..349a5a63d6 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1198,7 +1198,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 3599704892 +#define SIGNATURE_HASH 1917503311 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1517,7 +1517,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.26.hellen_cypress.3599704892" +#define TS_SIGNATURE "rusEFI 2020.10.26.hellen_cypress.1917503311" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 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 464225a39b..6a47d163eb 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 02:28:06 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 11:25:03 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -115,7 +115,9 @@ typedef struct pid_s pid_s; // start of cranking_parameters_s struct cranking_parameters_s { /** - * Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width. + * Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width. + * A reasonable starting point is 60mg per liter per cylinder. + * ex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel. * offset 0 */ float baseFuel; @@ -3750,4 +3752,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 02:28:06 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 11:25:03 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 27624c7473..9e3d340d5c 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1198,7 +1198,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 2274564550 +#define SIGNATURE_HASH 592903605 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1517,7 +1517,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.26.kin.2274564550" +#define TS_SIGNATURE "rusEFI 2020.10.26.kin.592903605" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 538f87dc61..442ed39378 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:45 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -115,7 +115,9 @@ typedef struct pid_s pid_s; // start of cranking_parameters_s struct cranking_parameters_s { /** - * Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width. + * Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width. + * A reasonable starting point is 60mg per liter per cylinder. + * ex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel. * offset 0 */ float baseFuel; @@ -3750,4 +3752,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:45 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 318ce08260..fe51949155 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:45 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 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 0f6134f316..aa5a02df86 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:45 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 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 6faf4958cf..16042a8221 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:45 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 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 3ea77a8c6d..f6ef299811 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:45 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 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 8badc8fedf..c2094b6ed3 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1198,7 +1198,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 1816666690 +#define SIGNATURE_HASH 3364734513 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1517,7 +1517,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.26.all.1816666690" +#define TS_SIGNATURE "rusEFI 2020.10.26.all.3364734513" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 41f19fa39b..2ae4feb462 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.10.26 -#define SIGNATURE_HASH 1816666690 -#define TS_SIGNATURE "rusEFI 2020.10.26.all.1816666690" +#define SIGNATURE_HASH 3364734513 +#define TS_SIGNATURE "rusEFI 2020.10.26.all.3364734513" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 642a574982..a4ce906073 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 2156577416 -#define TS_SIGNATURE "rusEFI 2020.10.26.frankenso_na6.2156577416" +#define SIGNATURE_HASH 609167099 +#define TS_SIGNATURE "rusEFI 2020.10.26.frankenso_na6.609167099" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 0369af7f01..c08d93c483 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 3599704892 -#define TS_SIGNATURE "rusEFI 2020.10.26.hellen_cypress.3599704892" +#define SIGNATURE_HASH 1917503311 +#define TS_SIGNATURE "rusEFI 2020.10.26.hellen_cypress.1917503311" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index ac97376736..805605c13a 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.10.26 -#define SIGNATURE_HASH 2274564550 -#define TS_SIGNATURE "rusEFI 2020.10.26.kin.2274564550" +#define SIGNATURE_HASH 592903605 +#define TS_SIGNATURE "rusEFI 2020.10.26.kin.592903605" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index f1e29728ec..c76d7f24b2 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 2086288411 -#define TS_SIGNATURE "rusEFI 2020.10.26.mre_f4.2086288411" +#define SIGNATURE_HASH 3634354280 +#define TS_SIGNATURE "rusEFI 2020.10.26.mre_f4.3634354280" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index df27c7bea9..ee8354cbd1 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 2086288411 -#define TS_SIGNATURE "rusEFI 2020.10.26.mre_f7.2086288411" +#define SIGNATURE_HASH 3634354280 +#define TS_SIGNATURE "rusEFI 2020.10.26.mre_f7.3634354280" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 1f3e91fdb0..0c47a92657 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 2176272210 -#define TS_SIGNATURE "rusEFI 2020.10.26.prometheus_405.2176272210" +#define SIGNATURE_HASH 628269857 +#define TS_SIGNATURE "rusEFI 2020.10.26.prometheus_405.628269857" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 1a9d18443a..0399d2e82d 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 2176272210 -#define TS_SIGNATURE "rusEFI 2020.10.26.prometheus_469.2176272210" +#define SIGNATURE_HASH 628269857 +#define TS_SIGNATURE "rusEFI 2020.10.26.prometheus_469.628269857" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8e98181a31..aec3b307c2 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 2592041281 -#define TS_SIGNATURE "rusEFI 2020.10.26.proteus_f4.2592041281" +#define SIGNATURE_HASH 1052413234 +#define TS_SIGNATURE "rusEFI 2020.10.26.proteus_f4.1052413234" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index a27e94e2eb..c91d43e2b8 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.10.26 -#define SIGNATURE_HASH 2592041281 -#define TS_SIGNATURE "rusEFI 2020.10.26.proteus_f7.2592041281" +#define SIGNATURE_HASH 1052413234 +#define TS_SIGNATURE "rusEFI 2020.10.26.proteus_f7.1052413234" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 717721dfc9..8973c2e57c 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 13d1c71817..1ef37bf89b 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.all.1816666690" + signature = "rusEFI 2020.10.26.all.3364734513" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.all.1816666690" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.all.3364734513" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:45 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4175,7 +4175,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 6aa3dca4ff..863a85b28e 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.frankenso_na6.2156577416" + signature = "rusEFI 2020.10.26.frankenso_na6.609167099" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.frankenso_na6.2156577416" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.frankenso_na6.609167099" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:54 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4175,7 +4175,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index b720314290..bfbd25f545 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.hellen_cypress.3599704892" + signature = "rusEFI 2020.10.26.hellen_cypress.1917503311" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.hellen_cypress.3599704892" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.hellen_cypress.1917503311" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 02:28:08 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 26 11:25:05 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4175,7 +4175,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index bb00117fd0..6ddb091d12 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.kin.2274564550" + signature = "rusEFI 2020.10.26.kin.592903605" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.kin.2274564550" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.kin.592903605" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 02:28:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 26 11:25:03 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4176,7 +4176,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 688984c30d..4793061ad9 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.mre_f4.2086288411" + signature = "rusEFI 2020.10.26.mre_f4.3634354280" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.mre_f4.2086288411" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.mre_f4.3634354280" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:55 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:52 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4150,7 +4150,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 7a2ae72cec..ab56232c06 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.mre_f7.2086288411" + signature = "rusEFI 2020.10.26.mre_f7.3634354280" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.mre_f7.2086288411" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.mre_f7.3634354280" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:53 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:50 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4150,7 +4150,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index cc3a6ea4f1..4927d943f1 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.prometheus_405.2176272210" + signature = "rusEFI 2020.10.26.prometheus_405.628269857" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.prometheus_405.2176272210" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.prometheus_405.628269857" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:28:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:58 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4171,7 +4171,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 0a4ac157c5..e6f3df2d21 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.prometheus_469.2176272210" + signature = "rusEFI 2020.10.26.prometheus_469.628269857" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.prometheus_469.2176272210" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.prometheus_469.628269857" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:58 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:56 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4171,7 +4171,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 883aadc210..f564522eef 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.proteus_f4.2592041281" + signature = "rusEFI 2020.10.26.proteus_f4.1052413234" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.proteus_f4.2592041281" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.proteus_f4.1052413234" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:28:05 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:25:01 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4142,7 +4142,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index c6ec509f82..a2ad960bb5 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.10.26.proteus_f7.2592041281" + signature = "rusEFI 2020.10.26.proteus_f7.1052413234" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.26.proteus_f7.2592041281" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.26.proteus_f7.1052413234" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:28:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:25:00 UTC 2020 pageSize = 20000 page = 1 @@ -119,7 +119,7 @@ page = 1 tpsMax = scalar, S16, 82, "ADC", 1.0, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 84, "%", 1.0, 0, -10, 0, 0 tpsErrorDetectionTooHigh = scalar, S16, 86, "%", 1.0, 0, 100, 110, 0 - cranking_baseFuel = scalar, F32, 88, "ms", 1.0, 0, 0, 200, 1 + cranking_baseFuel = scalar, F32, 88, "mg", 1.0, 0, 0, 500, 1 cranking_rpm = scalar, S16, 92, "RPM", 1.0, 0, 0, 3000, 0 cranking_alignmentFill_at_6 = array, U08, 94, [2], "units", 1.0, 0, -20, 100, 0 primingSquirtDurationMs = scalar, F32, 96, "*C", 1.0, 0, -40, 200, 1 @@ -1263,7 +1263,7 @@ page = 1 absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." - cranking_baseFuel = "Base duration of the fuel injection during cranking, this is modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width." + cranking_baseFuel = "Base mass of the per-cylinder fuel injected during cranking. This is then modified by the multipliers for CLT, IAT, TPS ect, to give the final cranking pulse width.\nA reasonable starting point is 60mg per liter per cylinder.\nex: 2 liter 4 cyl = 500cc/cyl, so 30mg cranking fuel." cranking_rpm = "This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" clt_bias_resistor = "Pull-up resistor value on your board" @@ -1594,10 +1594,10 @@ page = 1 ; fuel math chargeAirMass = scalar, U16, 44, "g",0.001, 0 - crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0 + crankingFuelMs = scalar, U16, 46, "mg",{1/100}, 0.0 currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0 baseFuel = scalar, U16, 50, "mg",{1/100}, 0 - fuelRunning = scalar, U16, 52, "ms",{1/300}, 0 + fuelRunning = scalar, U16, 52, "mg",{1/100}, 0 actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0 injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0 veValue = scalar, U08, 57, "ratio", 0.5, 0 @@ -2344,16 +2344,16 @@ gaugeCategory = Fueling ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld tChargeGauge = tCharge, "fuel: Estimated charge temperature", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 baroCorrectionGauge = baroCorrection,"fuel: Barometric pressure correction", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 - crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mg", 0, 100, 0, 0, 100, 100, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 cltCorrectionGauge = cltCorrection, "fuel: CLT correction", "mult", 0, 3, 0, 0, 3, 3, 2, 2 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base mass", "mSec", 0, 100, 0, 0, 100, 100, 2, 0 + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 10, 0, 0, 10, 10, 3, 1 + fuelRunningGauge = fuelRunning, "fuel: running", "mg", 0, 100, 0, 0, 100, 100, 3, 1 + baseFuelGauge = baseFuel, "fuel: base mass", "mg", 0, 100, 0, 0, 100, 100, 2, 0 fuelPidCorrectionGauge = fuelPidCorrection, "fuel: Short-term fuel trim", "%", -10, 10, -8, -5, 5, 8, 3, 1 fuelingLoadGauge = fuelingLoad, "fuel: load", "%", 0, 300, 0, 0, 300, 300, 1, 1 @@ -4142,7 +4142,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode field = "Fuel Source For Cranking", useRunningMathForCranking - field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} + field = "Base fuel mass", cranking_baseFuel, {useRunningMathForCranking == 0} dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition 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 23ee6b325a..9f14036138 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 02:27:45 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 26 11:24:42 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1152,7 +1152,6 @@ 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 = 1816666690; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1421,7 +1420,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.10.26.all.1816666690"; + public static final String TS_SIGNATURE = "rusEFI 2020.10.26.all.3364734513"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_60_2_VW = 20; public static final int TT_TT_ONE = 18; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 4b1bfa32a9..c06e3a67d7 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +