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 d63b39b86e..3a75fbefd2 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 Sat Jun 12 18:06:59 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Jun 13 12:00:39 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -818,19 +818,16 @@ struct engine_configuration_s { */ float primingSquirtDurationMs; /** - * Used if useConstantDwellDuringCranking is TRUE + * Dwell duration while cranking ms * offset 100 */ float ignitionDwellForCrankingMs; /** - * While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft - * degrees, not in absolute time as in running mode. - * set cranking_charge_angle X deg * offset 104 */ - float crankingChargeAngle; + float unused104; /** * @see hasMapSensor * @see isMapAveragingEnabled @@ -2147,7 +2144,7 @@ struct engine_configuration_s { uint16_t tps2SecondaryMax; /** offset 1464 bit 0 */ - bool unusedHereWeHave : 1; + bool unused1464b0 : 1; /** * Enables lambda sensor closed loop feedback for fuelling. offset 1464 bit 1 */ @@ -2162,9 +2159,8 @@ struct engine_configuration_s { offset 1464 bit 3 */ bool isVerboseETB : 1; /** - * If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode. offset 1464 bit 4 */ - bool useConstantDwellDuringCranking : 1; + bool unused1464b4 : 1; /** * This options enables data for 'engine sniffer' tab in console, which comes at some CPU price offset 1464 bit 5 */ @@ -4215,4 +4211,4 @@ struct 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 Sat Jun 12 18:06:59 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Jun 13 12:00:39 UTC 2021 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 61a3f7af57..972429a5fe 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 @@ -312,7 +312,6 @@ #define cranking_rpm_offset 92 #define crankingAdvance_offset 3124 #define crankingAdvanceBins_offset 3108 -#define crankingChargeAngle_offset 104 #define crankingCycleBins_offset 10624 #define crankingCycleCoef_offset 10592 #define crankingFuelBins_offset 10560 @@ -1280,8 +1279,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 1279579099 +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 2225823969 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1634,7 +1633,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.06.12.hellen_cypress.1279579099" +#define TS_SIGNATURE "rusEFI 2021.06.13.hellen_cypress.2225823969" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1687,6 +1686,7 @@ #define twoWireBatchInjection_offset 1476 #define uart_device_e_auto_enum "UART_NONE", "UART_DEVICE_1", "UART_DEVICE_2", "UART_DEVICE_3", "UART_DEVICE_4" #define uartConsoleSerialSpeed_offset 2076 +#define unused104_offset 104 #define unused1059_offset 3964 #define unused1126_offset 2116 #define unused1127_offset 2116 @@ -1694,6 +1694,8 @@ #define unused1129_offset 2116 #define unused1130_offset 2116 #define unused1366_offset 2652 +#define unused1464b0_offset 1464 +#define unused1464b4_offset 1464 #define unused1476b19_offset 1476 #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 @@ -1759,7 +1761,6 @@ #define unusedBit_492_31_offset 2116 #define unusedBit_492_8_offset 2116 #define unusedBit_492_9_offset 2116 -#define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2331 #define unusedOldIgnitionOffset_offset 445 #define unusedSpiPadding4_offset 2593 @@ -1767,7 +1768,6 @@ #define unusedSpiPadding8_offset 4010 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 -#define useConstantDwellDuringCranking_offset 1464 #define useETBforIdleControl_offset 744 #define useFixedBaroCorrFromMap_offset 1476 #define useFordRedundantTps_offset 76 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 af851e66ea..ceb17221b7 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 Sat Jun 12 18:06:57 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jun 13 12:00:37 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -818,19 +818,16 @@ struct engine_configuration_s { */ float primingSquirtDurationMs; /** - * Used if useConstantDwellDuringCranking is TRUE + * Dwell duration while cranking ms * offset 100 */ float ignitionDwellForCrankingMs; /** - * While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft - * degrees, not in absolute time as in running mode. - * set cranking_charge_angle X deg * offset 104 */ - float crankingChargeAngle; + float unused104; /** * @see hasMapSensor * @see isMapAveragingEnabled @@ -2147,7 +2144,7 @@ struct engine_configuration_s { uint16_t tps2SecondaryMax; /** offset 1464 bit 0 */ - bool unusedHereWeHave : 1; + bool unused1464b0 : 1; /** * Enables lambda sensor closed loop feedback for fuelling. offset 1464 bit 1 */ @@ -2162,9 +2159,8 @@ struct engine_configuration_s { offset 1464 bit 3 */ bool isVerboseETB : 1; /** - * If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode. offset 1464 bit 4 */ - bool useConstantDwellDuringCranking : 1; + bool unused1464b4 : 1; /** * This options enables data for 'engine sniffer' tab in console, which comes at some CPU price offset 1464 bit 5 */ @@ -4209,4 +4205,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jun 12 18:06:57 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jun 13 12:00:37 UTC 2021 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 78eaa6d4b7..9d161d152a 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -296,7 +296,6 @@ #define cranking_rpm_offset 92 #define crankingAdvance_offset 3096 #define crankingAdvanceBins_offset 3080 -#define crankingChargeAngle_offset 104 #define crankingCycleBins_offset 10596 #define crankingCycleCoef_offset 10564 #define crankingFuelBins_offset 10532 @@ -1264,8 +1263,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 3017875239 +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 2064559133 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1618,7 +1617,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.06.12.kin.3017875239" +#define TS_SIGNATURE "rusEFI 2021.06.13.kin.2064559133" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1671,6 +1670,7 @@ #define twoWireBatchInjection_offset 1476 #define uart_device_e_auto_enum "UART_NONE", "UART_DEVICE_1", "UART_DEVICE_2", "UART_DEVICE_3", "UART_DEVICE_4" #define uartConsoleSerialSpeed_offset 2076 +#define unused104_offset 104 #define unused1059_offset 3936 #define unused1126_offset 2116 #define unused1127_offset 2116 @@ -1678,6 +1678,8 @@ #define unused1129_offset 2116 #define unused1130_offset 2116 #define unused1366_offset 2624 +#define unused1464b0_offset 1464 +#define unused1464b4_offset 1464 #define unused1476b19_offset 1476 #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 @@ -1743,7 +1745,6 @@ #define unusedBit_492_31_offset 2116 #define unusedBit_492_8_offset 2116 #define unusedBit_492_9_offset 2116 -#define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2323 #define unusedOldIgnitionOffset_offset 445 #define unusedSpiPadding4_offset 2585 @@ -1751,7 +1752,6 @@ #define unusedSpiPadding8_offset 3982 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 -#define useConstantDwellDuringCranking_offset 1464 #define useETBforIdleControl_offset 744 #define useFixedBaroCorrFromMap_offset 1476 #define useFordRedundantTps_offset 76 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 51cbcd6b6a..3164a1e64b 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Jun 12 18:07:01 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:40 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -818,19 +818,16 @@ struct engine_configuration_s { */ float primingSquirtDurationMs; /** - * Used if useConstantDwellDuringCranking is TRUE + * Dwell duration while cranking ms * offset 100 */ float ignitionDwellForCrankingMs; /** - * While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft - * degrees, not in absolute time as in running mode. - * set cranking_charge_angle X deg * offset 104 */ - float crankingChargeAngle; + float unused104; /** * @see hasMapSensor * @see isMapAveragingEnabled @@ -2147,7 +2144,7 @@ struct engine_configuration_s { uint16_t tps2SecondaryMax; /** offset 1464 bit 0 */ - bool unusedHereWeHave : 1; + bool unused1464b0 : 1; /** * Enables lambda sensor closed loop feedback for fuelling. offset 1464 bit 1 */ @@ -2162,9 +2159,8 @@ struct engine_configuration_s { offset 1464 bit 3 */ bool isVerboseETB : 1; /** - * If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode. offset 1464 bit 4 */ - bool useConstantDwellDuringCranking : 1; + bool unused1464b4 : 1; /** * This options enables data for 'engine sniffer' tab in console, which comes at some CPU price offset 1464 bit 5 */ @@ -4215,4 +4211,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Jun 12 18:07:01 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:40 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index f99e98449e..363e5af62c 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -312,7 +312,6 @@ #define cranking_rpm_offset 92 #define crankingAdvance_offset 3124 #define crankingAdvanceBins_offset 3108 -#define crankingChargeAngle_offset 104 #define crankingCycleBins_offset 10624 #define crankingCycleCoef_offset 10592 #define crankingFuelBins_offset 10560 @@ -1280,8 +1279,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 2741241373 +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 1804317991 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1634,7 +1633,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.06.12.subaru_eg33_f7.2741241373" +#define TS_SIGNATURE "rusEFI 2021.06.13.subaru_eg33_f7.1804317991" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1687,6 +1686,7 @@ #define twoWireBatchInjection_offset 1476 #define uart_device_e_auto_enum "UART_NONE", "UART_DEVICE_1", "UART_DEVICE_2", "UART_DEVICE_3", "UART_DEVICE_4" #define uartConsoleSerialSpeed_offset 2076 +#define unused104_offset 104 #define unused1059_offset 3964 #define unused1126_offset 2116 #define unused1127_offset 2116 @@ -1694,6 +1694,8 @@ #define unused1129_offset 2116 #define unused1130_offset 2116 #define unused1366_offset 2652 +#define unused1464b0_offset 1464 +#define unused1464b4_offset 1464 #define unused1476b19_offset 1476 #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 @@ -1759,7 +1761,6 @@ #define unusedBit_492_31_offset 2116 #define unusedBit_492_8_offset 2116 #define unusedBit_492_9_offset 2116 -#define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2331 #define unusedOldIgnitionOffset_offset 445 #define unusedSpiPadding4_offset 2593 @@ -1767,7 +1768,6 @@ #define unusedSpiPadding8_offset 4010 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 -#define useConstantDwellDuringCranking_offset 1464 #define useETBforIdleControl_offset 744 #define useFixedBaroCorrFromMap_offset 1476 #define useFordRedundantTps_offset 76 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 1ff75cc645..13d33d251c 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 Sat Jun 12 18:06:28 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:12 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -818,19 +818,16 @@ struct engine_configuration_s { */ float primingSquirtDurationMs; /** - * Used if useConstantDwellDuringCranking is TRUE + * Dwell duration while cranking ms * offset 100 */ float ignitionDwellForCrankingMs; /** - * While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft - * degrees, not in absolute time as in running mode. - * set cranking_charge_angle X deg * offset 104 */ - float crankingChargeAngle; + float unused104; /** * @see hasMapSensor * @see isMapAveragingEnabled @@ -2147,7 +2144,7 @@ struct engine_configuration_s { uint16_t tps2SecondaryMax; /** offset 1464 bit 0 */ - bool unusedHereWeHave : 1; + bool unused1464b0 : 1; /** * Enables lambda sensor closed loop feedback for fuelling. offset 1464 bit 1 */ @@ -2162,9 +2159,8 @@ struct engine_configuration_s { offset 1464 bit 3 */ bool isVerboseETB : 1; /** - * If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode. offset 1464 bit 4 */ - bool useConstantDwellDuringCranking : 1; + bool unused1464b4 : 1; /** * This options enables data for 'engine sniffer' tab in console, which comes at some CPU price offset 1464 bit 5 */ @@ -4215,4 +4211,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 18:06:28 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:12 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 91daafcc6a..f516ae7fe6 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 Sat Jun 12 18:06:28 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:12 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 36ded57393..af9f22fc93 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 Sat Jun 12 18:06:28 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:12 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 54b9139b88..3c46afcb05 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 Sat Jun 12 18:06:28 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:12 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index d0f916f911..f75842a1c6 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 Sat Jun 12 18:06:28 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:12 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 0f03bb8b3f..5a1ccedf42 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -310,7 +310,6 @@ #define cranking_rpm_offset 92 #define crankingAdvance_offset 3124 #define crankingAdvanceBins_offset 3108 -#define crankingChargeAngle_offset 104 #define crankingCycleBins_offset 10624 #define crankingCycleCoef_offset 10592 #define crankingFuelBins_offset 10560 @@ -1277,8 +1276,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 238553099 +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 3336026929 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1631,7 +1630,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.06.12.all.238553099" +#define TS_SIGNATURE "rusEFI 2021.06.13.all.3336026929" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1684,6 +1683,7 @@ #define twoWireBatchInjection_offset 1476 #define uart_device_e_auto_enum "UART_NONE", "UART_DEVICE_1", "UART_DEVICE_2", "UART_DEVICE_3", "UART_DEVICE_4" #define uartConsoleSerialSpeed_offset 2076 +#define unused104_offset 104 #define unused1059_offset 3964 #define unused1126_offset 2116 #define unused1127_offset 2116 @@ -1691,6 +1691,8 @@ #define unused1129_offset 2116 #define unused1130_offset 2116 #define unused1366_offset 2652 +#define unused1464b0_offset 1464 +#define unused1464b4_offset 1464 #define unused1476b19_offset 1476 #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 @@ -1756,7 +1758,6 @@ #define unusedBit_492_31_offset 2116 #define unusedBit_492_8_offset 2116 #define unusedBit_492_9_offset 2116 -#define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2331 #define unusedOldIgnitionOffset_offset 445 #define unusedSpiPadding4_offset 2593 @@ -1764,7 +1765,6 @@ #define unusedSpiPadding8_offset 4010 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 -#define useConstantDwellDuringCranking_offset 1464 #define useETBforIdleControl_offset 744 #define useFixedBaroCorrFromMap_offset 1476 #define useFordRedundantTps_offset 76 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 9622f57333..f2b331afb5 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 238553099 -#define TS_SIGNATURE "rusEFI 2021.06.12.all.238553099" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 3336026929 +#define TS_SIGNATURE "rusEFI 2021.06.13.all.3336026929" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 40ff5f336f..b7f79815c7 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 913737266 -#define TS_SIGNATURE "rusEFI 2021.06.12.frankenso_na6.913737266" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 4271453448 +#define TS_SIGNATURE "rusEFI 2021.06.13.frankenso_na6.4271453448" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 4b94178c67..1e62e339ff 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121nissan -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 3327950904 -#define TS_SIGNATURE "rusEFI 2021.06.12.hellen121nissan.3327950904" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 246625026 +#define TS_SIGNATURE "rusEFI 2021.06.13.hellen121nissan.246625026" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 636dbd2db6..acbf368c50 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121vag -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 337071341 -#define TS_SIGNATURE "rusEFI 2021.06.12.hellen121vag.337071341" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 3707305943 +#define TS_SIGNATURE "rusEFI 2021.06.13.hellen121vag.3707305943" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index c67b847069..8befe89b01 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen128 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 4190510319 -#define TS_SIGNATURE "rusEFI 2021.06.12.hellen128.4190510319" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 824815573 +#define TS_SIGNATURE "rusEFI 2021.06.13.hellen128.824815573" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 986d6332a2..2208b58dd0 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen72 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 2697918336 -#define TS_SIGNATURE "rusEFI 2021.06.12.hellen72.2697918336" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 1747010746 +#define TS_SIGNATURE "rusEFI 2021.06.13.hellen72.1747010746" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index f1c7f286c2..450bf4095a 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellenNA6 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 1093144470 -#define TS_SIGNATURE "rusEFI 2021.06.12.hellenNA6.1093144470" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 2311568556 +#define TS_SIGNATURE "rusEFI 2021.06.13.hellenNA6.2311568556" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index e0cc09c8b5..69ca15aabb 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 1279579099 -#define TS_SIGNATURE "rusEFI 2021.06.12.hellen_cypress.1279579099" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 2225823969 +#define TS_SIGNATURE "rusEFI 2021.06.13.hellen_cypress.2225823969" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 42f542a41f..98e3b79af2 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 3017875239 -#define TS_SIGNATURE "rusEFI 2021.06.12.kin.3017875239" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 2064559133 +#define TS_SIGNATURE "rusEFI 2021.06.13.kin.2064559133" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5b629baaea..3b808b2fc6 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 2364182801 -#define TS_SIGNATURE "rusEFI 2021.06.12.mre_f4.2364182801" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 1141187115 +#define TS_SIGNATURE "rusEFI 2021.06.13.mre_f4.1141187115" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index bd9102a53b..4362ae476a 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 2364182801 -#define TS_SIGNATURE "rusEFI 2021.06.12.mre_f7.2364182801" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 1141187115 +#define TS_SIGNATURE "rusEFI 2021.06.13.mre_f7.1141187115" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 0a20c22339..87b04f7b7c 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 481167933 -#define TS_SIGNATURE "rusEFI 2021.06.12.prometheus_405.481167933" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 3561076999 +#define TS_SIGNATURE "rusEFI 2021.06.13.prometheus_405.3561076999" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 4b9d7c6004..ba2d111230 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 481167933 -#define TS_SIGNATURE "rusEFI 2021.06.12.prometheus_469.481167933" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 3561076999 +#define TS_SIGNATURE "rusEFI 2021.06.13.prometheus_469.3561076999" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 67cfc20027..913f3f4c5d 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 1737405712 -#define TS_SIGNATURE "rusEFI 2021.06.12.proteus_f4.1737405712" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 2942371370 +#define TS_SIGNATURE "rusEFI 2021.06.13.proteus_f4.2942371370" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 980642949e..bde0a64a51 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 1737405712 -#define TS_SIGNATURE "rusEFI 2021.06.12.proteus_f7.1737405712" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 2942371370 +#define TS_SIGNATURE "rusEFI 2021.06.13.proteus_f7.2942371370" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 26134d91f8..9c6eedc438 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.06.12 -#define SIGNATURE_HASH 2741241373 -#define TS_SIGNATURE "rusEFI 2021.06.12.subaru_eg33_f7.2741241373" +#define SIGNATURE_DATE 2021.06.13 +#define SIGNATURE_HASH 1804317991 +#define TS_SIGNATURE "rusEFI 2021.06.13.subaru_eg33_f7.1804317991" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 4516f54f55..0620ad2a18 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 e942569853..55e7679f6f 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 2021.06.12.all.238553099" + signature = "rusEFI 2021.06.13.all.3336026929" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.all.238553099" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.all.3336026929" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:28 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:12 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4542,7 +4541,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4556,8 +4555,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 743ec9d693..bc2a145d7e 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 2021.06.12.frankenso_na6.913737266" + signature = "rusEFI 2021.06.13.frankenso_na6.4271453448" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.frankenso_na6.913737266" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.frankenso_na6.4271453448" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:28 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4542,7 +4541,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4556,8 +4555,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index f360101f6d..974b033699 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.12.hellen121nissan.3327950904" + signature = "rusEFI 2021.06.13.hellen121nissan.246625026" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.hellen121nissan.3327950904" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.hellen121nissan.246625026" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:36 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:19 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4518,7 +4517,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4532,8 +4531,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index df224cec93..4618b1cd35 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.12.hellen121vag.337071341" + signature = "rusEFI 2021.06.13.hellen121vag.3707305943" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.hellen121vag.337071341" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.hellen121vag.3707305943" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:34 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:18 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4518,7 +4517,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4532,8 +4531,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index d8f6ac9cab..32a7491d84 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.12.hellen128.4190510319" + signature = "rusEFI 2021.06.13.hellen128.824815573" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.hellen128.4190510319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.hellen128.824815573" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:32 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:14 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4518,7 +4517,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4532,8 +4531,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index b4ab5483f7..7fd202378c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.12.hellen72.2697918336" + signature = "rusEFI 2021.06.13.hellen72.1747010746" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.hellen72.2697918336" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.hellen72.1747010746" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:21 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4518,7 +4517,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4532,8 +4531,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 568d89a93b..b8e695cbb6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.12.hellenNA6.1093144470" + signature = "rusEFI 2021.06.13.hellenNA6.2311568556" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.hellenNA6.1093144470" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.hellenNA6.2311568556" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:23 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4518,7 +4517,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4532,8 +4531,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 51f2a1ac20..73bf145575 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 2021.06.12.hellen_cypress.1279579099" + signature = "rusEFI 2021.06.13.hellen_cypress.2225823969" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.hellen_cypress.1279579099" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.hellen_cypress.2225823969" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Jun 13 12:00:39 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4542,7 +4541,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4556,8 +4555,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 48f67908e3..7a6c2ed9ab 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 2021.06.12.kin.3017875239" + signature = "rusEFI 2021.06.13.kin.2064559133" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.kin.3017875239" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.kin.2064559133" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:57 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jun 13 12:00:37 UTC 2021 pageSize = 19972 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -655,11 +655,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1311,7 +1311,7 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1401,7 +1401,6 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4524,7 +4523,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4538,8 +4537,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index a7b161e7ff..c8724f554b 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 2021.06.12.mre_f4.2364182801" + signature = "rusEFI 2021.06.13.mre_f4.1141187115" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.mre_f4.2364182801" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.mre_f4.1141187115" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:26 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4517,7 +4516,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4531,8 +4530,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 18ae77a733..b2b510f6ab 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 2021.06.12.mre_f7.2364182801" + signature = "rusEFI 2021.06.13.mre_f7.1141187115" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.mre_f7.2364182801" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.mre_f7.1141187115" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:25 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4517,7 +4516,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4531,8 +4530,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 796f3d4d8e..a99b3ad96f 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 2021.06.12.prometheus_405.481167933" + signature = "rusEFI 2021.06.13.prometheus_405.3561076999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.prometheus_405.481167933" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.prometheus_405.3561076999" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:32 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4537,7 +4536,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4551,8 +4550,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index d093ae90e1..22a25d4cc8 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 2021.06.12.prometheus_469.481167933" + signature = "rusEFI 2021.06.13.prometheus_469.3561076999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.prometheus_469.481167933" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.prometheus_469.3561076999" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:30 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4537,7 +4536,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4551,8 +4550,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index b5df106bc5..f011639861 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 2021.06.12.proteus_f4.1737405712" + signature = "rusEFI 2021.06.13.proteus_f4.2942371370" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.proteus_f4.1737405712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.proteus_f4.2942371370" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:55 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:35 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4509,7 +4508,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4523,8 +4522,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index ce1662ad4c..43b1fb65a2 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 2021.06.12.proteus_f7.1737405712" + signature = "rusEFI 2021.06.13.proteus_f7.2942371370" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.proteus_f7.1737405712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.proteus_f7.2942371370" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Sat Jun 12 18:06:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:34 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4509,7 +4508,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4523,8 +4522,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 3fbbe00bbb..55151ba2d2 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.12.subaru_eg33_f7.2741241373" + signature = "rusEFI 2021.06.13.subaru_eg33_f7.1804317991" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.12.subaru_eg33_f7.2741241373" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.13.subaru_eg33_f7.1804317991" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Jun 12 18:07:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:40 UTC 2021 pageSize = 20000 page = 1 @@ -127,7 +127,7 @@ 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 ignitionDwellForCrankingMs = scalar, F32, 100, "ms", 1.0, 0, 0, 200, 1 -crankingChargeAngle = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 +unused104 = scalar, F32, 104, "deg", 1.0, 0, 0, 3000.0, 0 map_samplingAngleBins = array, F32, 108, [8], "", 1.0, 0, 0.0, 18000, 2 map_samplingAngle = array, F32, 140, [8], "deg", 1.0, 0, -720, 720, 2 map_samplingWindowBins = array, F32, 172, [8], "", 1.0, 0, 0.0, 18000, 2 @@ -658,11 +658,11 @@ lps25BaroSensorScl = bits, U08, 1458, [0:7], "NONE", "INVALID", "PA0", "PA1", "P lps25BaroSensorSda = bits, U08, 1459, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 -unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" +unused1464b0 = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled = bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" isVerboseETB = bits, U32, 1464, [3:3], "false", "true" -useConstantDwellDuringCranking = bits, U32, 1464, [4:4], "Angle-based", "Time-based" +unused1464b4 = bits, U32, 1464, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1464, [5:5], "false", "true" silentTriggerError = bits, U32, 1464, [6:6], "false", "true" useLinearCltSensor = bits, U32, 1464, [7:7], "false", "true" @@ -1327,7 +1327,7 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." 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" + ignitionDwellForCrankingMs = "Dwell duration while cranking" clt_bias_resistor = "Pull-up resistor value on your board" iat_bias_resistor = "Pull-up resistor value on your board" hip9011PrescalerAndSDO = "value '6' for 8MHz hw osc\nread hip9011 datasheet for details\ntodo split into two bit fields" @@ -1420,7 +1420,6 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1.0, 0, 0.0, 25500.0, 2 fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling." isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle" isVerboseETB = "Prints ETB details to rusEFI console" - useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode." isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price" silentTriggerError = "Sometimes we have a performance issue while printing error" useFSIO16ForTimingAdjustment = "See fsioTimingAdjustment" @@ -4533,7 +4532,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = crankingIgnition, "Ignition" field = "Timing Advance mode", useSeparateAdvanceForCranking field = "Fixed cranking advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} - field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor @@ -4547,8 +4546,6 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Enable flood clear", isCylinderCleanupEnabled field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled field = "Use Advance Corrections for cranking", useAdvanceCorrectionsForCranking - field = "Dwell Duration Mode", useConstantDwellDuringCranking - field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" 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 96ae2c1b3f..9083d27538 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 Sat Jun 12 18:06:28 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 13 12:00:12 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -300,7 +300,6 @@ public class Fields { public static final int cranking_rpm_offset = 92; public static final int crankingAdvance_offset = 3124; public static final int crankingAdvanceBins_offset = 3108; - public static final int crankingChargeAngle_offset = 104; public static final int crankingCycleBins_offset = 10624; public static final int crankingCycleCoef_offset = 10592; public static final int crankingFuelBins_offset = 10560; @@ -1232,7 +1231,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 = 238553099; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1534,7 +1532,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 2021.06.12.all.238553099"; + public static final String TS_SIGNATURE = "rusEFI 2021.06.13.all.3336026929"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; @@ -1584,6 +1582,7 @@ public class Fields { public static final int twoWireBatchIgnition_offset = 1476; public static final int twoWireBatchInjection_offset = 1476; public static final int uartConsoleSerialSpeed_offset = 2076; + public static final int unused104_offset = 104; public static final int unused1059_offset = 3964; public static final int unused1126_offset = 2116; public static final int unused1127_offset = 2116; @@ -1591,6 +1590,8 @@ public class Fields { public static final int unused1129_offset = 2116; public static final int unused1130_offset = 2116; public static final int unused1366_offset = 2652; + public static final int unused1464b0_offset = 1464; + public static final int unused1464b4_offset = 1464; public static final int unused1476b19_offset = 1476; public static final int unused1476b20_offset = 1476; public static final int unused1476b3_offset = 1476; @@ -1656,7 +1657,6 @@ public class Fields { public static final int unusedBit_492_31_offset = 2116; public static final int unusedBit_492_8_offset = 2116; public static final int unusedBit_492_9_offset = 2116; - public static final int unusedHereWeHave_offset = 1464; public static final int unusedOldBiquad_offset = 2331; public static final int unusedOldIgnitionOffset_offset = 445; public static final int unusedSpiPadding4_offset = 2593; @@ -1664,7 +1664,6 @@ public class Fields { public static final int unusedSpiPadding8_offset = 4010; public static final int useAdvanceCorrectionsForCranking_offset = 1476; public static final int useCicPidForIdle_offset = 76; - public static final int useConstantDwellDuringCranking_offset = 1464; public static final int useETBforIdleControl_offset = 744; public static final int useFixedBaroCorrFromMap_offset = 1476; public static final int useFordRedundantTps_offset = 76; @@ -1782,7 +1781,7 @@ public class Fields { public static final Field CRANKING_RPM = Field.create("CRANKING_RPM", 92, FieldType.INT16); public static final Field PRIMINGSQUIRTDURATIONMS = Field.create("PRIMINGSQUIRTDURATIONMS", 96, FieldType.FLOAT); public static final Field IGNITIONDWELLFORCRANKINGMS = Field.create("IGNITIONDWELLFORCRANKINGMS", 100, FieldType.FLOAT); - public static final Field CRANKINGCHARGEANGLE = Field.create("CRANKINGCHARGEANGLE", 104, FieldType.FLOAT); + public static final Field UNUSED104 = Field.create("UNUSED104", 104, FieldType.FLOAT); public static final Field MAP_SENSOR_LOWVALUE = Field.create("MAP_SENSOR_LOWVALUE", 236, FieldType.FLOAT); public static final Field MAP_SENSOR_HIGHVALUE = Field.create("MAP_SENSOR_HIGHVALUE", 240, FieldType.FLOAT); public static final Field MAP_SENSOR_TYPE = Field.create("MAP_SENSOR_TYPE", 244, FieldType.INT); @@ -2311,11 +2310,11 @@ public class Fields { public static final Field LPS25BAROSENSORSDA = Field.create("LPS25BAROSENSORSDA", 1459, FieldType.INT8, brain_pin_e); public static final Field TPS2SECONDARYMIN = Field.create("TPS2SECONDARYMIN", 1460, FieldType.INT16); public static final Field TPS2SECONDARYMAX = Field.create("TPS2SECONDARYMAX", 1462, FieldType.INT16); - public static final Field UNUSEDHEREWEHAVE = Field.create("UNUSEDHEREWEHAVE", 1464, FieldType.BIT, 0); + public static final Field UNUSED1464B0 = Field.create("UNUSED1464B0", 1464, FieldType.BIT, 0); public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1); public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2); public static final Field ISVERBOSEETB = Field.create("ISVERBOSEETB", 1464, FieldType.BIT, 3); - public static final Field USECONSTANTDWELLDURINGCRANKING = Field.create("USECONSTANTDWELLDURINGCRANKING", 1464, FieldType.BIT, 4); + public static final Field UNUSED1464B4 = Field.create("UNUSED1464B4", 1464, FieldType.BIT, 4); public static final Field ISENGINECHARTENABLED = Field.create("ISENGINECHARTENABLED", 1464, FieldType.BIT, 5); public static final Field SILENTTRIGGERERROR = Field.create("SILENTTRIGGERERROR", 1464, FieldType.BIT, 6); public static final Field USELINEARCLTSENSOR = Field.create("USELINEARCLTSENSOR", 1464, FieldType.BIT, 7); @@ -2895,7 +2894,7 @@ public class Fields { CRANKING_RPM, PRIMINGSQUIRTDURATIONMS, IGNITIONDWELLFORCRANKINGMS, - CRANKINGCHARGEANGLE, + UNUSED104, MAP_SENSOR_LOWVALUE, MAP_SENSOR_HIGHVALUE, MAP_SENSOR_TYPE, @@ -3410,11 +3409,11 @@ public class Fields { LPS25BAROSENSORSDA, TPS2SECONDARYMIN, TPS2SECONDARYMAX, - UNUSEDHEREWEHAVE, + UNUSED1464B0, FUELCLOSEDLOOPCORRECTIONENABLED, ISVERBOSEIAC, ISVERBOSEETB, - USECONSTANTDWELLDURINGCRANKING, + UNUSED1464B4, ISENGINECHARTENABLED, SILENTTRIGGERERROR, USELINEARCLTSENSOR, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index c8a242e2d6..f389e5a84b 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +