diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 2170856dcd..e01a33efa2 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/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 Thu May 04 14:58:07 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu May 04 15:05:26 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -726,40 +726,39 @@ struct engine_configuration_s { offset 120 bit 21 */ bool useTLE8888_stepper : 1 {}; /** - * If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS. offset 120 bit 22 */ - bool enableMapEstimationTableFallback : 1 {}; - /** - offset 120 bit 23 */ bool usescriptTableForCanSniffingFiltering : 1 {}; /** * Print incoming and outgoing first bus CAN messages in rusEFI console - offset 120 bit 24 */ + offset 120 bit 23 */ bool verboseCan : 1 {}; /** * Experimental setting that will cause a misfire * DO NOT ENABLE. - offset 120 bit 25 */ + offset 120 bit 24 */ bool artificialTestMisfire : 1 {}; /** * On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor. - offset 120 bit 26 */ + offset 120 bit 25 */ bool useFordRedundantPps : 1 {}; /** + offset 120 bit 26 */ + bool unusedBit_40_26 : 1 {}; + /** offset 120 bit 27 */ - bool unusedBit_41_27 : 1 {}; + bool unusedBit_40_27 : 1 {}; /** offset 120 bit 28 */ - bool unusedBit_41_28 : 1 {}; + bool unusedBit_40_28 : 1 {}; /** offset 120 bit 29 */ - bool unusedBit_41_29 : 1 {}; + bool unusedBit_40_29 : 1 {}; /** offset 120 bit 30 */ - bool unusedBit_41_30 : 1 {}; + bool unusedBit_40_30 : 1 {}; /** offset 120 bit 31 */ - bool unusedBit_41_31 : 1 {}; + bool unusedBit_40_31 : 1 {}; /** * Closed throttle, 1 volt = 200 units. * See also tps1_1AdcChannel @@ -1105,23 +1104,22 @@ struct engine_configuration_s { * offset 476 */ spi_device_e hip9011SpiDevice; - /** - * Single value to be used in event of a failed MAP sensor - * This value is only used for speed density fueling calculations. - kPa - * offset 477 - */ - uint8_t failedMapFallback; /** * Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met. % - * offset 478 + * offset 477 */ uint8_t boostControlSafeDutyCycle; /** - * offset 479 + * offset 478 */ adc_channel_e mafAdcChannel; + /** + * need 4 byte alignment + units + * offset 479 + */ + uint8_t alignmentFill_at_479[1]; /** coef * offset 480 @@ -1574,88 +1572,88 @@ struct engine_configuration_s { offset 728 bit 7 */ bool isVerboseAlternator : 1 {}; /** - * This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed. offset 728 bit 8 */ + bool verboseQuad : 1 {}; + /** + * This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed. + offset 728 bit 9 */ bool useStepperIdle : 1 {}; /** - offset 728 bit 9 */ + offset 728 bit 10 */ bool enabledStep1Limiter : 1 {}; /** - offset 728 bit 10 */ + offset 728 bit 11 */ bool useTpicAdvancedMode : 1 {}; /** - offset 728 bit 11 */ + offset 728 bit 12 */ bool unused760b12 : 1 {}; /** - offset 728 bit 12 */ + offset 728 bit 13 */ bool verboseTLE8888 : 1 {}; /** * CAN broadcast using custom rusEFI protocol * enable can_broadcast/disable can_broadcast - offset 728 bit 13 */ + offset 728 bit 14 */ bool enableVerboseCanTx : 1 {}; /** - offset 728 bit 14 */ + offset 728 bit 15 */ bool etb1configured : 1 {}; /** - offset 728 bit 15 */ + offset 728 bit 16 */ bool etb2configured : 1 {}; /** * Useful for individual intakes - offset 728 bit 16 */ + offset 728 bit 17 */ bool measureMapOnlyInOneCylinder : 1 {}; /** - offset 728 bit 17 */ + offset 728 bit 18 */ bool stepperForceParkingEveryRestart : 1 {}; /** * If enabled, try to fire the engine before a full engine cycle has been completed using RPM estimated from the last 90 degrees of engine rotation. As soon as the trigger syncs plus 90 degrees rotation, fuel and ignition events will occur. If disabled, worst case may require up to 4 full crank rotations before any events are scheduled. - offset 728 bit 18 */ + offset 728 bit 19 */ bool isFasterEngineSpinUpEnabled : 1 {}; /** * This setting disables fuel injection while the engine is in overrun, this is useful as a fuel saving measure and to prevent back firing. - offset 728 bit 19 */ + offset 728 bit 20 */ bool coastingFuelCutEnabled : 1 {}; /** * Override the IAC position during overrun conditions to help reduce engine breaking, this can be helpful for large engines in light weight cars or engines that have trouble returning to idle. - offset 728 bit 20 */ + offset 728 bit 21 */ bool useIacTableForCoasting : 1 {}; /** - offset 728 bit 21 */ + offset 728 bit 22 */ bool useNoiselessTriggerDecoder : 1 {}; /** - offset 728 bit 22 */ + offset 728 bit 23 */ bool useIdleTimingPidControl : 1 {}; /** * Allows disabling the ETB when the engine is stopped. You may not like the power draw or PWM noise from the motor, so this lets you turn it off until it's necessary. - offset 728 bit 23 */ + offset 728 bit 24 */ bool disableEtbWhenEngineStopped : 1 {}; /** - offset 728 bit 24 */ + offset 728 bit 25 */ bool is_enabled_spi_4 : 1 {}; /** * Disable the electronic throttle motor and DC idle motor for testing. * This mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle. - offset 728 bit 25 */ + offset 728 bit 26 */ bool pauseEtbControl : 1 {}; /** - offset 728 bit 26 */ + offset 728 bit 27 */ bool alignEngineSnifferAtTDC : 1 {}; /** - offset 728 bit 27 */ + offset 728 bit 28 */ bool verboseKLine : 1 {}; /** - offset 728 bit 28 */ + offset 728 bit 29 */ bool idleIncrementalPidCic : 1 {}; /** * AEM X-Series or rusEFI Wideband - offset 728 bit 29 */ + offset 728 bit 30 */ bool enableAemXSeries : 1 {}; /** - offset 728 bit 30 */ - bool unusedBit_222_30 : 1 {}; - /** offset 728 bit 31 */ - bool unusedBit_222_31 : 1 {}; + bool unusedBit_223_31 : 1 {}; /** * offset 732 */ @@ -5179,4 +5177,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23176); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu May 04 14:58:07 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu May 04 15:05:26 UTC 2023 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 9422ef0fcd..0b0bc7a2e0 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1073,7 +1073,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 398973697 +#define SIGNATURE_HASH 4108557229 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1364,7 +1364,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.05.04.cypress.398973697" +#define TS_SIGNATURE "rusEFI master.2023.05.04.cypress.4108557229" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 7533cb6c60..da7a817198 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 Thu May 04 14:58:06 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu May 04 15:05:24 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -726,40 +726,39 @@ struct engine_configuration_s { offset 120 bit 21 */ bool useTLE8888_stepper : 1 {}; /** - * If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS. offset 120 bit 22 */ - bool enableMapEstimationTableFallback : 1 {}; - /** - offset 120 bit 23 */ bool usescriptTableForCanSniffingFiltering : 1 {}; /** * Print incoming and outgoing first bus CAN messages in rusEFI console - offset 120 bit 24 */ + offset 120 bit 23 */ bool verboseCan : 1 {}; /** * Experimental setting that will cause a misfire * DO NOT ENABLE. - offset 120 bit 25 */ + offset 120 bit 24 */ bool artificialTestMisfire : 1 {}; /** * On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor. - offset 120 bit 26 */ + offset 120 bit 25 */ bool useFordRedundantPps : 1 {}; /** + offset 120 bit 26 */ + bool unusedBit_40_26 : 1 {}; + /** offset 120 bit 27 */ - bool unusedBit_41_27 : 1 {}; + bool unusedBit_40_27 : 1 {}; /** offset 120 bit 28 */ - bool unusedBit_41_28 : 1 {}; + bool unusedBit_40_28 : 1 {}; /** offset 120 bit 29 */ - bool unusedBit_41_29 : 1 {}; + bool unusedBit_40_29 : 1 {}; /** offset 120 bit 30 */ - bool unusedBit_41_30 : 1 {}; + bool unusedBit_40_30 : 1 {}; /** offset 120 bit 31 */ - bool unusedBit_41_31 : 1 {}; + bool unusedBit_40_31 : 1 {}; /** * Closed throttle, 1 volt = 200 units. * See also tps1_1AdcChannel @@ -1105,23 +1104,22 @@ struct engine_configuration_s { * offset 476 */ spi_device_e hip9011SpiDevice; - /** - * Single value to be used in event of a failed MAP sensor - * This value is only used for speed density fueling calculations. - kPa - * offset 477 - */ - uint8_t failedMapFallback; /** * Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met. % - * offset 478 + * offset 477 */ uint8_t boostControlSafeDutyCycle; /** - * offset 479 + * offset 478 */ adc_channel_e mafAdcChannel; + /** + * need 4 byte alignment + units + * offset 479 + */ + uint8_t alignmentFill_at_479[1]; /** coef * offset 480 @@ -1574,88 +1572,88 @@ struct engine_configuration_s { offset 728 bit 7 */ bool isVerboseAlternator : 1 {}; /** - * This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed. offset 728 bit 8 */ + bool verboseQuad : 1 {}; + /** + * This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed. + offset 728 bit 9 */ bool useStepperIdle : 1 {}; /** - offset 728 bit 9 */ + offset 728 bit 10 */ bool enabledStep1Limiter : 1 {}; /** - offset 728 bit 10 */ + offset 728 bit 11 */ bool useTpicAdvancedMode : 1 {}; /** - offset 728 bit 11 */ + offset 728 bit 12 */ bool unused760b12 : 1 {}; /** - offset 728 bit 12 */ + offset 728 bit 13 */ bool verboseTLE8888 : 1 {}; /** * CAN broadcast using custom rusEFI protocol * enable can_broadcast/disable can_broadcast - offset 728 bit 13 */ + offset 728 bit 14 */ bool enableVerboseCanTx : 1 {}; /** - offset 728 bit 14 */ + offset 728 bit 15 */ bool etb1configured : 1 {}; /** - offset 728 bit 15 */ + offset 728 bit 16 */ bool etb2configured : 1 {}; /** * Useful for individual intakes - offset 728 bit 16 */ + offset 728 bit 17 */ bool measureMapOnlyInOneCylinder : 1 {}; /** - offset 728 bit 17 */ + offset 728 bit 18 */ bool stepperForceParkingEveryRestart : 1 {}; /** * If enabled, try to fire the engine before a full engine cycle has been completed using RPM estimated from the last 90 degrees of engine rotation. As soon as the trigger syncs plus 90 degrees rotation, fuel and ignition events will occur. If disabled, worst case may require up to 4 full crank rotations before any events are scheduled. - offset 728 bit 18 */ + offset 728 bit 19 */ bool isFasterEngineSpinUpEnabled : 1 {}; /** * This setting disables fuel injection while the engine is in overrun, this is useful as a fuel saving measure and to prevent back firing. - offset 728 bit 19 */ + offset 728 bit 20 */ bool coastingFuelCutEnabled : 1 {}; /** * Override the IAC position during overrun conditions to help reduce engine breaking, this can be helpful for large engines in light weight cars or engines that have trouble returning to idle. - offset 728 bit 20 */ + offset 728 bit 21 */ bool useIacTableForCoasting : 1 {}; /** - offset 728 bit 21 */ + offset 728 bit 22 */ bool useNoiselessTriggerDecoder : 1 {}; /** - offset 728 bit 22 */ + offset 728 bit 23 */ bool useIdleTimingPidControl : 1 {}; /** * Allows disabling the ETB when the engine is stopped. You may not like the power draw or PWM noise from the motor, so this lets you turn it off until it's necessary. - offset 728 bit 23 */ + offset 728 bit 24 */ bool disableEtbWhenEngineStopped : 1 {}; /** - offset 728 bit 24 */ + offset 728 bit 25 */ bool is_enabled_spi_4 : 1 {}; /** * Disable the electronic throttle motor and DC idle motor for testing. * This mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle. - offset 728 bit 25 */ + offset 728 bit 26 */ bool pauseEtbControl : 1 {}; /** - offset 728 bit 26 */ + offset 728 bit 27 */ bool alignEngineSnifferAtTDC : 1 {}; /** - offset 728 bit 27 */ + offset 728 bit 28 */ bool verboseKLine : 1 {}; /** - offset 728 bit 28 */ + offset 728 bit 29 */ bool idleIncrementalPidCic : 1 {}; /** * AEM X-Series or rusEFI Wideband - offset 728 bit 29 */ + offset 728 bit 30 */ bool enableAemXSeries : 1 {}; /** - offset 728 bit 30 */ - bool unusedBit_222_30 : 1 {}; - /** offset 728 bit 31 */ - bool unusedBit_222_31 : 1 {}; + bool unusedBit_223_31 : 1 {}; /** * offset 732 */ @@ -5179,4 +5177,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23176); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu May 04 14:58:06 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu May 04 15:05:24 UTC 2023 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 4f36107356..96d123bb8b 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1073,7 +1073,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2131786189 +#define SIGNATURE_HASH 2620668257 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1364,7 +1364,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.05.04.kin.2131786189" +#define TS_SIGNATURE "rusEFI master.2023.05.04.kin.2620668257" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 049825de33..57d85764cb 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_subaru_config.sh integration/rusefi_config.txt Thu May 04 14:58:08 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu May 04 15:05:27 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -726,40 +726,39 @@ struct engine_configuration_s { offset 120 bit 21 */ bool useTLE8888_stepper : 1 {}; /** - * If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS. offset 120 bit 22 */ - bool enableMapEstimationTableFallback : 1 {}; - /** - offset 120 bit 23 */ bool usescriptTableForCanSniffingFiltering : 1 {}; /** * Print incoming and outgoing first bus CAN messages in rusEFI console - offset 120 bit 24 */ + offset 120 bit 23 */ bool verboseCan : 1 {}; /** * Experimental setting that will cause a misfire * DO NOT ENABLE. - offset 120 bit 25 */ + offset 120 bit 24 */ bool artificialTestMisfire : 1 {}; /** * On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor. - offset 120 bit 26 */ + offset 120 bit 25 */ bool useFordRedundantPps : 1 {}; /** + offset 120 bit 26 */ + bool unusedBit_40_26 : 1 {}; + /** offset 120 bit 27 */ - bool unusedBit_41_27 : 1 {}; + bool unusedBit_40_27 : 1 {}; /** offset 120 bit 28 */ - bool unusedBit_41_28 : 1 {}; + bool unusedBit_40_28 : 1 {}; /** offset 120 bit 29 */ - bool unusedBit_41_29 : 1 {}; + bool unusedBit_40_29 : 1 {}; /** offset 120 bit 30 */ - bool unusedBit_41_30 : 1 {}; + bool unusedBit_40_30 : 1 {}; /** offset 120 bit 31 */ - bool unusedBit_41_31 : 1 {}; + bool unusedBit_40_31 : 1 {}; /** * Closed throttle, 1 volt = 200 units. * See also tps1_1AdcChannel @@ -1105,23 +1104,22 @@ struct engine_configuration_s { * offset 476 */ spi_device_e hip9011SpiDevice; - /** - * Single value to be used in event of a failed MAP sensor - * This value is only used for speed density fueling calculations. - kPa - * offset 477 - */ - uint8_t failedMapFallback; /** * Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met. % - * offset 478 + * offset 477 */ uint8_t boostControlSafeDutyCycle; /** - * offset 479 + * offset 478 */ adc_channel_e mafAdcChannel; + /** + * need 4 byte alignment + units + * offset 479 + */ + uint8_t alignmentFill_at_479[1]; /** coef * offset 480 @@ -1574,88 +1572,88 @@ struct engine_configuration_s { offset 728 bit 7 */ bool isVerboseAlternator : 1 {}; /** - * This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed. offset 728 bit 8 */ + bool verboseQuad : 1 {}; + /** + * This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed. + offset 728 bit 9 */ bool useStepperIdle : 1 {}; /** - offset 728 bit 9 */ + offset 728 bit 10 */ bool enabledStep1Limiter : 1 {}; /** - offset 728 bit 10 */ + offset 728 bit 11 */ bool useTpicAdvancedMode : 1 {}; /** - offset 728 bit 11 */ + offset 728 bit 12 */ bool unused760b12 : 1 {}; /** - offset 728 bit 12 */ + offset 728 bit 13 */ bool verboseTLE8888 : 1 {}; /** * CAN broadcast using custom rusEFI protocol * enable can_broadcast/disable can_broadcast - offset 728 bit 13 */ + offset 728 bit 14 */ bool enableVerboseCanTx : 1 {}; /** - offset 728 bit 14 */ + offset 728 bit 15 */ bool etb1configured : 1 {}; /** - offset 728 bit 15 */ + offset 728 bit 16 */ bool etb2configured : 1 {}; /** * Useful for individual intakes - offset 728 bit 16 */ + offset 728 bit 17 */ bool measureMapOnlyInOneCylinder : 1 {}; /** - offset 728 bit 17 */ + offset 728 bit 18 */ bool stepperForceParkingEveryRestart : 1 {}; /** * If enabled, try to fire the engine before a full engine cycle has been completed using RPM estimated from the last 90 degrees of engine rotation. As soon as the trigger syncs plus 90 degrees rotation, fuel and ignition events will occur. If disabled, worst case may require up to 4 full crank rotations before any events are scheduled. - offset 728 bit 18 */ + offset 728 bit 19 */ bool isFasterEngineSpinUpEnabled : 1 {}; /** * This setting disables fuel injection while the engine is in overrun, this is useful as a fuel saving measure and to prevent back firing. - offset 728 bit 19 */ + offset 728 bit 20 */ bool coastingFuelCutEnabled : 1 {}; /** * Override the IAC position during overrun conditions to help reduce engine breaking, this can be helpful for large engines in light weight cars or engines that have trouble returning to idle. - offset 728 bit 20 */ + offset 728 bit 21 */ bool useIacTableForCoasting : 1 {}; /** - offset 728 bit 21 */ + offset 728 bit 22 */ bool useNoiselessTriggerDecoder : 1 {}; /** - offset 728 bit 22 */ + offset 728 bit 23 */ bool useIdleTimingPidControl : 1 {}; /** * Allows disabling the ETB when the engine is stopped. You may not like the power draw or PWM noise from the motor, so this lets you turn it off until it's necessary. - offset 728 bit 23 */ + offset 728 bit 24 */ bool disableEtbWhenEngineStopped : 1 {}; /** - offset 728 bit 24 */ + offset 728 bit 25 */ bool is_enabled_spi_4 : 1 {}; /** * Disable the electronic throttle motor and DC idle motor for testing. * This mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle. - offset 728 bit 25 */ + offset 728 bit 26 */ bool pauseEtbControl : 1 {}; /** - offset 728 bit 26 */ + offset 728 bit 27 */ bool alignEngineSnifferAtTDC : 1 {}; /** - offset 728 bit 27 */ + offset 728 bit 28 */ bool verboseKLine : 1 {}; /** - offset 728 bit 28 */ + offset 728 bit 29 */ bool idleIncrementalPidCic : 1 {}; /** * AEM X-Series or rusEFI Wideband - offset 728 bit 29 */ + offset 728 bit 30 */ bool enableAemXSeries : 1 {}; /** - offset 728 bit 30 */ - bool unusedBit_222_30 : 1 {}; - /** offset 728 bit 31 */ - bool unusedBit_222_31 : 1 {}; + bool unusedBit_223_31 : 1 {}; /** * offset 732 */ @@ -5179,4 +5177,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23176); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu May 04 14:58:08 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu May 04 15:05:27 UTC 2023 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 064506affe..1d95b55d8d 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 @@ -1024,7 +1024,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 277637589 +#define SIGNATURE_HASH 4087884153 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1316,7 +1316,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.05.04.subaru_eg33_f7.277637589" +#define TS_SIGNATURE "rusEFI master.2023.05.04.subaru_eg33_f7.4087884153" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index b0bb7478f0..1576d23c07 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 Thu May 04 14:58:54 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:15 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -726,40 +726,39 @@ struct engine_configuration_s { offset 120 bit 21 */ bool useTLE8888_stepper : 1 {}; /** - * If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS. offset 120 bit 22 */ - bool enableMapEstimationTableFallback : 1 {}; - /** - offset 120 bit 23 */ bool usescriptTableForCanSniffingFiltering : 1 {}; /** * Print incoming and outgoing first bus CAN messages in rusEFI console - offset 120 bit 24 */ + offset 120 bit 23 */ bool verboseCan : 1 {}; /** * Experimental setting that will cause a misfire * DO NOT ENABLE. - offset 120 bit 25 */ + offset 120 bit 24 */ bool artificialTestMisfire : 1 {}; /** * On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor. - offset 120 bit 26 */ + offset 120 bit 25 */ bool useFordRedundantPps : 1 {}; /** + offset 120 bit 26 */ + bool unusedBit_40_26 : 1 {}; + /** offset 120 bit 27 */ - bool unusedBit_41_27 : 1 {}; + bool unusedBit_40_27 : 1 {}; /** offset 120 bit 28 */ - bool unusedBit_41_28 : 1 {}; + bool unusedBit_40_28 : 1 {}; /** offset 120 bit 29 */ - bool unusedBit_41_29 : 1 {}; + bool unusedBit_40_29 : 1 {}; /** offset 120 bit 30 */ - bool unusedBit_41_30 : 1 {}; + bool unusedBit_40_30 : 1 {}; /** offset 120 bit 31 */ - bool unusedBit_41_31 : 1 {}; + bool unusedBit_40_31 : 1 {}; /** * Closed throttle, 1 volt = 200 units. * See also tps1_1AdcChannel @@ -1105,23 +1104,22 @@ struct engine_configuration_s { * offset 476 */ spi_device_e hip9011SpiDevice; - /** - * Single value to be used in event of a failed MAP sensor - * This value is only used for speed density fueling calculations. - kPa - * offset 477 - */ - uint8_t failedMapFallback; /** * Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met. % - * offset 478 + * offset 477 */ uint8_t boostControlSafeDutyCycle; /** - * offset 479 + * offset 478 */ adc_channel_e mafAdcChannel; + /** + * need 4 byte alignment + units + * offset 479 + */ + uint8_t alignmentFill_at_479[1]; /** coef * offset 480 @@ -1574,88 +1572,88 @@ struct engine_configuration_s { offset 728 bit 7 */ bool isVerboseAlternator : 1 {}; /** - * This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed. offset 728 bit 8 */ + bool verboseQuad : 1 {}; + /** + * This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed. + offset 728 bit 9 */ bool useStepperIdle : 1 {}; /** - offset 728 bit 9 */ + offset 728 bit 10 */ bool enabledStep1Limiter : 1 {}; /** - offset 728 bit 10 */ + offset 728 bit 11 */ bool useTpicAdvancedMode : 1 {}; /** - offset 728 bit 11 */ + offset 728 bit 12 */ bool unused760b12 : 1 {}; /** - offset 728 bit 12 */ + offset 728 bit 13 */ bool verboseTLE8888 : 1 {}; /** * CAN broadcast using custom rusEFI protocol * enable can_broadcast/disable can_broadcast - offset 728 bit 13 */ + offset 728 bit 14 */ bool enableVerboseCanTx : 1 {}; /** - offset 728 bit 14 */ + offset 728 bit 15 */ bool etb1configured : 1 {}; /** - offset 728 bit 15 */ + offset 728 bit 16 */ bool etb2configured : 1 {}; /** * Useful for individual intakes - offset 728 bit 16 */ + offset 728 bit 17 */ bool measureMapOnlyInOneCylinder : 1 {}; /** - offset 728 bit 17 */ + offset 728 bit 18 */ bool stepperForceParkingEveryRestart : 1 {}; /** * If enabled, try to fire the engine before a full engine cycle has been completed using RPM estimated from the last 90 degrees of engine rotation. As soon as the trigger syncs plus 90 degrees rotation, fuel and ignition events will occur. If disabled, worst case may require up to 4 full crank rotations before any events are scheduled. - offset 728 bit 18 */ + offset 728 bit 19 */ bool isFasterEngineSpinUpEnabled : 1 {}; /** * This setting disables fuel injection while the engine is in overrun, this is useful as a fuel saving measure and to prevent back firing. - offset 728 bit 19 */ + offset 728 bit 20 */ bool coastingFuelCutEnabled : 1 {}; /** * Override the IAC position during overrun conditions to help reduce engine breaking, this can be helpful for large engines in light weight cars or engines that have trouble returning to idle. - offset 728 bit 20 */ + offset 728 bit 21 */ bool useIacTableForCoasting : 1 {}; /** - offset 728 bit 21 */ + offset 728 bit 22 */ bool useNoiselessTriggerDecoder : 1 {}; /** - offset 728 bit 22 */ + offset 728 bit 23 */ bool useIdleTimingPidControl : 1 {}; /** * Allows disabling the ETB when the engine is stopped. You may not like the power draw or PWM noise from the motor, so this lets you turn it off until it's necessary. - offset 728 bit 23 */ + offset 728 bit 24 */ bool disableEtbWhenEngineStopped : 1 {}; /** - offset 728 bit 24 */ + offset 728 bit 25 */ bool is_enabled_spi_4 : 1 {}; /** * Disable the electronic throttle motor and DC idle motor for testing. * This mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle. - offset 728 bit 25 */ + offset 728 bit 26 */ bool pauseEtbControl : 1 {}; /** - offset 728 bit 26 */ + offset 728 bit 27 */ bool alignEngineSnifferAtTDC : 1 {}; /** - offset 728 bit 27 */ + offset 728 bit 28 */ bool verboseKLine : 1 {}; /** - offset 728 bit 28 */ + offset 728 bit 29 */ bool idleIncrementalPidCic : 1 {}; /** * AEM X-Series or rusEFI Wideband - offset 728 bit 29 */ + offset 728 bit 30 */ bool enableAemXSeries : 1 {}; /** - offset 728 bit 30 */ - bool unusedBit_222_30 : 1 {}; - /** offset 728 bit 31 */ - bool unusedBit_222_31 : 1 {}; + bool unusedBit_223_31 : 1 {}; /** * offset 732 */ @@ -5179,4 +5177,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23176); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:54 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:15 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 2e46d02a13..800c15fd75 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1073,7 +1073,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2139669927 +#define SIGNATURE_HASH 2628551947 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1364,7 +1364,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.05.04.f407-discovery.2139669927" +#define TS_SIGNATURE "rusEFI master.2023.05.04.f407-discovery.2628551947" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 928c84a390..cec2688f22 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1028701018 -#define TS_SIGNATURE "rusEFI master.2023.05.04.48way.1028701018" +#define SIGNATURE_HASH 3732208630 +#define TS_SIGNATURE "rusEFI master.2023.05.04.48way.3732208630" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index bb96570a87..43494cba36 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2181566290 -#define TS_SIGNATURE "rusEFI master.2023.05.04.alphax-2chan.2181566290" +#define SIGNATURE_HASH 1630294014 +#define TS_SIGNATURE "rusEFI master.2023.05.04.alphax-2chan.1630294014" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index d4a23ed110..61e76c8b72 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2114978013 -#define TS_SIGNATURE "rusEFI master.2023.05.04.alphax-4chan.2114978013" +#define SIGNATURE_HASH 2637447281 +#define TS_SIGNATURE "rusEFI master.2023.05.04.alphax-4chan.2637447281" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index e773e7f330..2adf6cf72b 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1878969602 -#define TS_SIGNATURE "rusEFI master.2023.05.04.alphax-8chan.1878969602" +#define SIGNATURE_HASH 2363133358 +#define TS_SIGNATURE "rusEFI master.2023.05.04.alphax-8chan.2363133358" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 6ec09c48b9..9341a47968 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 185413158 -#define TS_SIGNATURE "rusEFI master.2023.05.04.atlas.185413158" +#define SIGNATURE_HASH 3895029386 +#define TS_SIGNATURE "rusEFI master.2023.05.04.atlas.3895029386" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 4a8bcb0b04..1b8c96632d 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1101872726 -#define TS_SIGNATURE "rusEFI master.2023.05.04.core8.1101872726" +#define SIGNATURE_HASH 2726919930 +#define TS_SIGNATURE "rusEFI master.2023.05.04.core8.2726919930" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index e6c14f1fdd..8007d66b11 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 398973697 -#define TS_SIGNATURE "rusEFI master.2023.05.04.cypress.398973697" +#define SIGNATURE_HASH 4108557229 +#define TS_SIGNATURE "rusEFI master.2023.05.04.cypress.4108557229" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 43266be129..0bddc405aa 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2139669927 -#define TS_SIGNATURE "rusEFI master.2023.05.04.f407-discovery.2139669927" +#define SIGNATURE_HASH 2628551947 +#define TS_SIGNATURE "rusEFI master.2023.05.04.f407-discovery.2628551947" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index e2e66631ce..1a1f89b1e2 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 398973697 -#define TS_SIGNATURE "rusEFI master.2023.05.04.f429-discovery.398973697" +#define SIGNATURE_HASH 4108557229 +#define TS_SIGNATURE "rusEFI master.2023.05.04.f429-discovery.4108557229" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 02a906058e..3729b80185 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 898972619 -#define TS_SIGNATURE "rusEFI master.2023.05.04.frankenso_na6.898972619" +#define SIGNATURE_HASH 3601955687 +#define TS_SIGNATURE "rusEFI master.2023.05.04.frankenso_na6.3601955687" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 75fbb89b38..1d3fa3be9f 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1138606877 -#define TS_SIGNATURE "rusEFI master.2023.05.04.harley81.1138606877" +#define SIGNATURE_HASH 2700706737 +#define TS_SIGNATURE "rusEFI master.2023.05.04.harley81.2700706737" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 6707396a12..6ebbf328cb 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3732358856 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen-gm-e67.3732358856" +#define SIGNATURE_HASH 1028851300 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen-gm-e67.1028851300" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 46072792c3..27fc3106d0 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3619411636 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen-honda-k.3619411636" +#define SIGNATURE_HASH 882873880 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen-honda-k.882873880" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 94ffd27e3e..c3e2646dd6 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3239374250 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen-nb1.3239374250" +#define SIGNATURE_HASH 573615366 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen-nb1.573615366" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index ccab9a7641..b7d50d01ab 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3515255343 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen121nissan.3515255343" +#define SIGNATURE_HASH 849529475 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen121nissan.849529475" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index d6f94c9381..38bc701ee7 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3453644276 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen121vag.3453644276" +#define SIGNATURE_HASH 788409688 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen121vag.788409688" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index c5cdbca2c9..b3a0374f96 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3023868295 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen128.3023868295" +#define SIGNATURE_HASH 1461244203 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen128.1461244203" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 9742b3ca71..efea2b2ba5 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4044096197 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen154hyundai.4044096197" +#define SIGNATURE_HASH 304628329 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen154hyundai.304628329" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 3e1cd0bb6f..17548bf39a 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 259470198 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen72.259470198" +#define SIGNATURE_HASH 3964892122 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen72.3964892122" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 750e9ea2fe..6cbf99a607 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 312330735 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen81.312330735" +#define SIGNATURE_HASH 4055468355 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen81.4055468355" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 08b8544b5b..5027e84d33 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2621010984 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen88bmw.2621010984" +#define SIGNATURE_HASH 2132620420 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellen88bmw.2132620420" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 9a5c485a66..fca181c834 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4068792504 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellenNA6.4068792504" +#define SIGNATURE_HASH 295737364 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellenNA6.295737364" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 00759c15af..d59f290422 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2639269484 -#define TS_SIGNATURE "rusEFI master.2023.05.04.hellenNA8_96.2639269484" +#define SIGNATURE_HASH 2121551552 +#define TS_SIGNATURE "rusEFI master.2023.05.04.hellenNA8_96.2121551552" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index c758566b16..d8f06388cb 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 2131786189 -#define TS_SIGNATURE "rusEFI master.2023.05.04.kin.2131786189" +#define SIGNATURE_HASH 2620668257 +#define TS_SIGNATURE "rusEFI master.2023.05.04.kin.2620668257" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 36a0f31ecf..6ad400fb5c 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3360228922 -#define TS_SIGNATURE "rusEFI master.2023.05.04.m74_9.3360228922" +#define SIGNATURE_HASH 728581782 +#define TS_SIGNATURE "rusEFI master.2023.05.04.m74_9.728581782" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index caa9a95af7..c684bba15e 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2586871905 -#define TS_SIGNATURE "rusEFI master.2023.05.04.mre_f4.2586871905" +#define SIGNATURE_HASH 2031405261 +#define TS_SIGNATURE "rusEFI master.2023.05.04.mre_f4.2031405261" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index ea7cb0ffc4..9f9a568f8e 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2586871905 -#define TS_SIGNATURE "rusEFI master.2023.05.04.mre_f7.2586871905" +#define SIGNATURE_HASH 2031405261 +#define TS_SIGNATURE "rusEFI master.2023.05.04.mre_f7.2031405261" diff --git a/firmware/controllers/generated/signature_nucleo_f429.h b/firmware/controllers/generated/signature_nucleo_f429.h index 24948fbf10..8349efb95d 100644 --- a/firmware/controllers/generated/signature_nucleo_f429.h +++ b/firmware/controllers/generated/signature_nucleo_f429.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 398973697 -#define TS_SIGNATURE "rusEFI master.2023.05.04.nucleo_f429.398973697" +#define SIGNATURE_HASH 4108557229 +#define TS_SIGNATURE "rusEFI master.2023.05.04.nucleo_f429.4108557229" diff --git a/firmware/controllers/generated/signature_nucleo_f767.h b/firmware/controllers/generated/signature_nucleo_f767.h index 2972282656..11a286f6c8 100644 --- a/firmware/controllers/generated/signature_nucleo_f767.h +++ b/firmware/controllers/generated/signature_nucleo_f767.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 398973697 -#define TS_SIGNATURE "rusEFI master.2023.05.04.nucleo_f767.398973697" +#define SIGNATURE_HASH 4108557229 +#define TS_SIGNATURE "rusEFI master.2023.05.04.nucleo_f767.4108557229" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 2a9ae6b85a..686d2ee780 100644 --- a/firmware/controllers/generated/signature_nucleo_h743.h +++ b/firmware/controllers/generated/signature_nucleo_h743.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 398973697 -#define TS_SIGNATURE "rusEFI master.2023.05.04.nucleo_h743.398973697" +#define SIGNATURE_HASH 4108557229 +#define TS_SIGNATURE "rusEFI master.2023.05.04.nucleo_h743.4108557229" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 7bf928c0d4..0b60896135 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 659756689 -#define TS_SIGNATURE "rusEFI master.2023.05.04.prometheus_405.659756689" +#define SIGNATURE_HASH 3296155197 +#define TS_SIGNATURE "rusEFI master.2023.05.04.prometheus_405.3296155197" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 95fa501f32..e02273ad3a 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 659756689 -#define TS_SIGNATURE "rusEFI master.2023.05.04.prometheus_469.659756689" +#define SIGNATURE_HASH 3296155197 +#define TS_SIGNATURE "rusEFI master.2023.05.04.prometheus_469.3296155197" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 0fda697cc9..29f64d22e4 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 637501964 -#define TS_SIGNATURE "rusEFI master.2023.05.04.proteus_f4.637501964" +#define SIGNATURE_HASH 3336290976 +#define TS_SIGNATURE "rusEFI master.2023.05.04.proteus_f4.3336290976" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index fc935d6730..da22cb6ea2 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 637501964 -#define TS_SIGNATURE "rusEFI master.2023.05.04.proteus_f7.637501964" +#define SIGNATURE_HASH 3336290976 +#define TS_SIGNATURE "rusEFI master.2023.05.04.proteus_f7.3336290976" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 4c9edffa7a..09320a825c 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 637501964 -#define TS_SIGNATURE "rusEFI master.2023.05.04.proteus_h7.637501964" +#define SIGNATURE_HASH 3336290976 +#define TS_SIGNATURE "rusEFI master.2023.05.04.proteus_h7.3336290976" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 08ffc1d007..f7f6052e5d 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 789262008 -#define TS_SIGNATURE "rusEFI master.2023.05.04.s105.789262008" +#define SIGNATURE_HASH 3425660436 +#define TS_SIGNATURE "rusEFI master.2023.05.04.s105.3425660436" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index f2781c79f4..38b2ee8fb1 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 277637589 -#define TS_SIGNATURE "rusEFI master.2023.05.04.subaru_eg33_f7.277637589" +#define SIGNATURE_HASH 4087884153 +#define TS_SIGNATURE "rusEFI master.2023.05.04.subaru_eg33_f7.4087884153" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 6a5df888e1..ccd096c7e7 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2640967459 -#define TS_SIGNATURE "rusEFI master.2023.05.04.tdg-pdm8.2640967459" +#define SIGNATURE_HASH 2119022479 +#define TS_SIGNATURE "rusEFI master.2023.05.04.tdg-pdm8.2119022479" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 255ef24963..99f670cf05 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -103,9 +103,6 @@ float getConfigValueByName(const char *name) { // useTLE8888_stepper case -647008743: return engineConfiguration->useTLE8888_stepper; -// enableMapEstimationTableFallback - case 1992465535: - return engineConfiguration->enableMapEstimationTableFallback; // usescriptTableForCanSniffingFiltering case 671821024: return engineConfiguration->usescriptTableForCanSniffingFiltering; @@ -280,9 +277,6 @@ float getConfigValueByName(const char *name) { // airByRpmTaper case 2070727975: return engineConfiguration->airByRpmTaper; -// failedMapFallback - case -1730107688: - return engineConfiguration->failedMapFallback; // boostControlSafeDutyCycle case -1965075262: return engineConfiguration->boostControlSafeDutyCycle; @@ -391,6 +385,9 @@ float getConfigValueByName(const char *name) { // isVerboseAlternator case -956913549: return engineConfiguration->isVerboseAlternator; +// verboseQuad + case -1055678778: + return engineConfiguration->verboseQuad; // useStepperIdle case -920116109: return engineConfiguration->useStepperIdle; @@ -1746,11 +1743,6 @@ void setConfigValueByName(const char *name, float value) { { engineConfiguration->useTLE8888_stepper = (int)value; return; - } - case 1992465535: - { - engineConfiguration->enableMapEstimationTableFallback = (int)value; - return; } case 671821024: { @@ -2041,11 +2033,6 @@ void setConfigValueByName(const char *name, float value) { { engineConfiguration->airByRpmTaper = value; return; - } - case -1730107688: - { - engineConfiguration->failedMapFallback = (int)value; - return; } case -1965075262: { @@ -2226,6 +2213,11 @@ void setConfigValueByName(const char *name, float value) { { engineConfiguration->isVerboseAlternator = (int)value; return; + } + case -1055678778: + { + engineConfiguration->verboseQuad = (int)value; + return; } case -920116109: { diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md index 4996e62271..2c47b2fa2f 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -97,9 +97,6 @@ Shall we display real life signal or just the part consumed by trigger decoder.\ ### useTLE8888_stepper -### enableMapEstimationTableFallback -If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS. - ### usescriptTableForCanSniffingFiltering @@ -274,9 +271,6 @@ just a temporary solution ### airByRpmTaper Extra air taper amount -### failedMapFallback -Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations. - ### boostControlSafeDutyCycle Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met. @@ -385,6 +379,9 @@ Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format. ### isVerboseAlternator +### verboseQuad + + ### useStepperIdle This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed. diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index b95f538ffd..cd1481c5c2 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.f407-discovery.2139669927" + signature = "rusEFI master.2023.05.04.f407-discovery.2628551947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.f407-discovery.2139669927" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.f407-discovery.2628551947" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:52 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:14 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7628,15 +7625,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 039a7f74d4..0c909056e4 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.48way.1028701018" + signature = "rusEFI master.2023.05.04.48way.3732208630" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.48way.1028701018" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.48way.3732208630" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:33 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:54 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",10="BARO Pressure Reference Input (B1)",1="Battery Reference Input (A0)",3="CLT Reference Input (A2)",15="Fuel Pressure Reference Input (C4)",4="IAT Reference Input (A3)",9="MAP Pressure Reference Input (B0)",5="O2 Reference Input (A4)",16="Oil Pressure Reference Input (C5)",2="TPS Reference Input (A1)" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",10="BARO Pressure Reference Input (B1)",1="Battery Reference Input (A0)",3="CLT Reference Input (A2)",15="Fuel Pressure Reference Input (C4)",4="IAT Reference Input (A3)",9="MAP Pressure Reference Input (B0)",5="O2 Reference Input (A4)",16="Oil Pressure Reference Input (C5)",2="TPS Reference Input (A1)" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",72="Camshaft Input (E6)",47="CrankShaft Input (C13)" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",72="Camshaft Input (E6)",47="CrankShaft Input (C13)" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",72="Camshaft Input (E6)",47="CrankShaft Input (C13)" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7625,15 +7622,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 311ebf96d1..4ed30fc0dc 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.alphax-2chan.2181566290" + signature = "rusEFI master.2023.05.04.alphax-2chan.1630294014" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.alphax-2chan.2181566290" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.alphax-2chan.1630294014" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:09 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:28 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",6="A2 Battery Sense",12="B2 - MAP",14="B3 - IAT",2="B4 - O2",5="B5 - TPS",13="B7 - CLT",7="C7 - CAM Hall/Digital",3="On-board MAP" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",6="A2 Battery Sense",12="B2 - MAP",14="B3 - IAT",2="B4 - O2",5="B5 - TPS",13="B7 - CLT",7="C7 - CAM Hall/Digital",3="On-board MAP" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",8="C7 - CAM Hall/Digital" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",8="C7 - CAM Hall/Digital" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",8="C7 - CAM Hall/Digital" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7604,15 +7601,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 22c9d5149b..fa9283bba4 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.alphax-4chan.2114978013" + signature = "rusEFI master.2023.05.04.alphax-4chan.2637447281" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.alphax-4chan.2114978013" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.alphax-4chan.2637447281" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:10 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:29 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",12="B2 - MAP",14="B3 - IAT",2="B4 - O2",5="B5 - TPS",13="B7 - CLT",7="C7 - CAM Hall/Digital",9="D4 - TPS2",4="D5 - PPS",21="D5 - PPS rev G",15="F6 - PPS2",6="F7 - Ignition Key Voltage",3="On-board MAP" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",12="B2 - MAP",14="B3 - IAT",2="B4 - O2",5="B5 - TPS",13="B7 - CLT",7="C7 - CAM Hall/Digital",9="D4 - TPS2",4="D5 - PPS",21="D5 - PPS rev G",15="F6 - PPS2",6="F7 - Ignition Key Voltage",3="On-board MAP" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",93="C4 - 2Step/Digital",8="C7 - CAM Hall/Digital",86="E3 - Digital In 3",87="E4 - Digital In 4",91="E5/E6 Cam Sensor VR",81="E6 - Cam+ (hall)",9="E7 - Flex" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",93="C4 - 2Step/Digital",8="C7 - CAM Hall/Digital",86="E3 - Digital In 3",87="E4 - Digital In 4",91="E5/E6 Cam Sensor VR",81="E6 - Cam+ (hall)",9="E7 - Flex" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",93="C4 - 2Step/Digital",8="C7 - CAM Hall/Digital",86="E3 - Digital In 3",87="E4 - Digital In 4",91="E5/E6 Cam Sensor VR",81="E6 - Cam+ (hall)",9="E7 - Flex" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7608,15 +7605,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index f090ed83a5..fbabff684c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.alphax-8chan.1878969602" + signature = "rusEFI master.2023.05.04.alphax-8chan.2363133358" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.alphax-8chan.1878969602" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.alphax-8chan.2363133358" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:11 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:31 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",10="14A - Analog 1",32="14D - AN4",14="15A - IAT",8="15D - AN5",13="16A - CLT",24="16D - AN6",4="17A - PPS",11="22A - Analog 22",5="23C - TPS",9="24C - TPS2",15="31C - PPS2",16="33A - AN3",31="6C - AT3",29="7C - AT4",6="Battery Sense" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",10="14A - Analog 1",32="14D - AN4",14="15A - IAT",8="15D - AN5",13="16A - CLT",24="16D - AN6",4="17A - PPS",11="22A - Analog 22",5="23C - TPS",9="24C - TPS2",15="31C - PPS2",16="33A - AN3",31="6C - AT3",29="7C - AT4",6="Battery Sense" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",66="13C - 2-Step Input",52="17B - Digital In Flex",8="23A - Hall Input 1",80="30A - Hall Input 2",81="31A - Hall Input 3",4="5C - Hall Input 4",12="8A - Crank VR",91="9A - Cam VR" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",66="13C - 2-Step Input",52="17B - Digital In Flex",8="23A - Hall Input 1",80="30A - Hall Input 2",81="31A - Hall Input 3",4="5C - Hall Input 4",12="8A - Crank VR",91="9A - Cam VR" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",66="13C - 2-Step Input",52="17B - Digital In Flex",8="23A - Hall Input 1",80="30A - Hall Input 2",81="31A - Hall Input 3",4="5C - Hall Input 4",12="8A - Crank VR",91="9A - Cam VR" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7608,15 +7605,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index e177189ecf..0024563148 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.atlas.185413158" + signature = "rusEFI master.2023.05.04.atlas.3895029386" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.atlas.185413158" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.atlas.3895029386" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:50 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:11 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7618,15 +7615,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index fe127ed8a0..fdafd9d05e 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.core8.1101872726" + signature = "rusEFI master.2023.05.04.core8.2726919930" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.core8.1101872726" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.core8.2726919930" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:32 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:52 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",2="Analog Inputs 1 (A1)",11="Analog Inputs 10 (C0)",14="Analog Inputs 13 (C3)",15="Analog Inputs 14 (C4)",16="Analog Inputs 15 (C5)",3="Analog Inputs 2 (A2)",4="Analog Inputs 3 (A3)",5="Analog Inputs 4 (A4)",7="Analog Inputs 6 (A6)",8="Analog Inputs 7 (A7)",10="Analog Inputs 9 (B1)",9="On-board BARO (B0)",1="On-board Battery Sense (A0)",6="On-board MAP (A5)",12="Primary On-board O2 (C1)",13="Secondary On-board O2 (C2)" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",2="Analog Inputs 1 (A1)",11="Analog Inputs 10 (C0)",14="Analog Inputs 13 (C3)",15="Analog Inputs 14 (C4)",16="Analog Inputs 15 (C5)",3="Analog Inputs 2 (A2)",4="Analog Inputs 3 (A3)",5="Analog Inputs 4 (A4)",7="Analog Inputs 6 (A6)",8="Analog Inputs 7 (A7)",10="Analog Inputs 9 (B1)",9="On-board BARO (B0)",1="On-board Battery Sense (A0)",6="On-board MAP (A5)",12="Primary On-board O2 (C1)",13="Secondary On-board O2 (C2)" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",87="Digital Input 1 (F5)",86="Digital Input 2 (F4)",85="Digital Input 3 (F3)",84="Digital Input 4 (F2)",83="Digital Input 5 (F1)",82="Digital Input 6 (F0)",72="Digital Input 7 (E6)",47="Digital Input 8 (C13)",68="VR/Hall 1 (E2)",69="VR/Hall 2 (E3)",70="VR/Hall 3 (E4)",71="VR/Hall 4 (E5)" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",87="Digital Input 1 (F5)",86="Digital Input 2 (F4)",85="Digital Input 3 (F3)",84="Digital Input 4 (F2)",83="Digital Input 5 (F1)",82="Digital Input 6 (F0)",72="Digital Input 7 (E6)",47="Digital Input 8 (C13)",68="VR/Hall 1 (E2)",69="VR/Hall 2 (E3)",70="VR/Hall 3 (E4)",71="VR/Hall 4 (E5)" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",87="Digital Input 1 (F5)",86="Digital Input 2 (F4)",85="Digital Input 3 (F3)",84="Digital Input 4 (F2)",83="Digital Input 5 (F1)",82="Digital Input 6 (F0)",72="Digital Input 7 (E6)",47="Digital Input 8 (C13)",68="VR/Hall 1 (E2)",69="VR/Hall 2 (E3)",70="VR/Hall 3 (E4)",71="VR/Hall 4 (E5)" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7625,15 +7622,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 0f33a4f605..2d6b6dd02c 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.cypress.398973697" + signature = "rusEFI master.2023.05.04.cypress.4108557229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.cypress.398973697" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.cypress.4108557229" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu May 04 14:58:07 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu May 04 15:05:26 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7626,15 +7623,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index d3d87bad21..5c6bdfda5b 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.f407-discovery.2139669927" + signature = "rusEFI master.2023.05.04.f407-discovery.2628551947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.f407-discovery.2139669927" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.f407-discovery.2628551947" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:44 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:05 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7628,15 +7625,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 01ca768069..19e694e628 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.f429-discovery.398973697" + signature = "rusEFI master.2023.05.04.f429-discovery.4108557229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.f429-discovery.398973697" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.f429-discovery.4108557229" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:45 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:06 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7626,15 +7623,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 56eee6da3d..e16b264243 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.frankenso_na6.898972619" + signature = "rusEFI master.2023.05.04.frankenso_na6.3601955687" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.frankenso_na6.898972619" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.frankenso_na6.3601955687" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:37 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:57 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",16="Analog 3E",8="Analog 3G",7="Analog 3H",5="Analog 3I",4="Analog 3J",2="Analog 3L",3="Analog 3M",14="Analog 3N",1="Analog 3O",12="Analog 3P",13="Analog 3Q",15="Analog VBatt" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",16="Analog 3E",8="Analog 3G",7="Analog 3H",5="Analog 3I",4="Analog 3J",2="Analog 3L",3="Analog 3M",14="Analog 3N",1="Analog 3O",12="Analog 3P",13="Analog 3Q",15="Analog VBatt" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7626,15 +7623,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 00cce20e03..488fe67e60 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.harley81.1138606877" + signature = "rusEFI master.2023.05.04.harley81.2700706737" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.harley81.1138606877" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.harley81.2700706737" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:13 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:33 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",2="27 - TPS 2",15="32 Oil Pressure",16="34 Kickstand Position Sensor",4="41 - PPS 1",9="42 - PPS 2",13="49 CLT",6="5 Battery Sense",5="52 - TPS 1",11="53 - MAP",12="55 Engine Temperature",14="72 IAT" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",2="27 - TPS 2",15="32 Oil Pressure",16="34 Kickstand Position Sensor",4="41 - PPS 1",9="42 - PPS 2",13="49 CLT",6="5 Battery Sense",5="52 - TPS 1",11="53 - MAP",12="55 Engine Temperature",14="72 IAT" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",88="11 Crank VR-",93="51 - VSS" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",88="11 Crank VR-",93="51 - VSS" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",88="11 Crank VR-",93="51 - VSS" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7605,15 +7602,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 264281a519..4fd46062e2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen-gm-e67.3732358856" + signature = "rusEFI master.2023.05.04.hellen-gm-e67.1028851300" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen-gm-e67.3732358856" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen-gm-e67.1028851300" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:26 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:46 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",6="C1-19 Battery Sense",10="C1-44 Primary Fuel Level",7="C1-45 Secondary Fuel Level",16="C1-46 Vac Sense",4="C1-47 - PPS1",15="C1-49 - PPS2",2="C2-60 - Oil Pressure",5="C2-64 - TPS1",11="C2-65 - Trans Fluids",9="C2-66 - TPS2",13="C3-55 - CLT",14="C3-56 - IAT",8="C3-57 - A/C Pressure",3="C3-58 - Baro",12="C3-59 - MAP" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",6="C1-19 Battery Sense",10="C1-44 Primary Fuel Level",7="C1-45 Secondary Fuel Level",16="C1-46 Vac Sense",4="C1-47 - PPS1",15="C1-49 - PPS2",2="C2-60 - Oil Pressure",5="C2-64 - TPS1",11="C2-65 - Trans Fluids",9="C2-66 - TPS2",13="C3-55 - CLT",14="C3-56 - IAT",8="C3-57 - A/C Pressure",3="C3-58 - Baro",12="C3-59 - MAP" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",88="C2-59 - Cam",86="C2-63 - Crank" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",88="C2-59 - Cam",86="C2-63 - Crank" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",88="C2-59 - Cam",86="C2-63 - Crank" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 99cb56d3f7..b93f9f4f75 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen-honda-k.3619411636" + signature = "rusEFI master.2023.05.04.hellen-honda-k.882873880" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen-honda-k.3619411636" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen-honda-k.882873880" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:18 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:38 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",5="A15 TPS",11="A19 - MAP",14="B17 IAT",13="B8 - CLT",6="E9 Ignition Key Voltage" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",5="A15 TPS",11="A19 - MAP",14="B17 IAT",13="B8 - CLT",6="E9 Ignition Key Voltage" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",93="A18 - VSS",90="A25 VTT CAM",92="A26 Cam Sync",91="A7 Crankshaft Sensor",87="C18 Aux Digital 3",86="C19 Aux Digital 2",85="C21 Aux Digital 1" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",93="A18 - VSS",90="A25 VTT CAM",92="A26 Cam Sync",91="A7 Crankshaft Sensor",87="C18 Aux Digital 3",86="C19 Aux Digital 2",85="C21 Aux Digital 1" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",93="A18 - VSS",90="A25 VTT CAM",92="A26 Cam Sync",91="A7 Crankshaft Sensor",87="C18 Aux Digital 3",86="C19 Aux Digital 2",85="C21 Aux Digital 1" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7603,15 +7600,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 2db8b86ec2..95845e1b4b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen-nb1.3239374250" + signature = "rusEFI master.2023.05.04.hellen-nb1.573615366" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen-nb1.3239374250" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen-nb1.573615366" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:25 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:44 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",6="1B - Battery Sense",4="1G - Steering/RES2",16="1P - AC Switch",9="2A - Pressure Input",14="2B - IAT",1="2C - O2S",13="2E - Coolant",7="2H - CAM",10="2J - CRANK",11="2L - MAF",12="3D - MAP",5="3E - TPS",8="3S - EGR BOOST IN",15="4C - IN TEMP/PPS2",2="TPS1",3="intMAP" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",6="1B - Battery Sense",4="1G - Steering/RES2",16="1P - AC Switch",9="2A - Pressure Input",14="2B - IAT",1="2C - O2S",13="2E - Coolant",7="2H - CAM",10="2J - CRANK",11="2L - MAF",12="3D - MAP",5="3E - TPS",8="3S - EGR BOOST IN",15="4C - IN TEMP/PPS2",2="TPS1",3="intMAP" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",93="2D - VSS",8="2H - CAM",19="2J - CRANK",78="4B - DIGITAL/FLEX" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",93="2D - VSS",8="2H - CAM",19="2J - CRANK",78="4B - DIGITAL/FLEX" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",93="2D - VSS",8="2H - CAM",19="2J - CRANK",78="4B - DIGITAL/FLEX" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 40af7bf9ea..22b33340ec 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen121nissan.3515255343" + signature = "rusEFI master.2023.05.04.hellen121nissan.849529475" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen121nissan.3515255343" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen121nissan.849529475" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:17 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:37 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",4="106 - PPS 1",6="109 Ignition Key Voltage",14="34 - IAT",5="50 - TPS 1",1="51 - MAF",9="69 - TPS 2",13="73 - CLT",15="98 - PPS 2",11="Aux P66",12="Aux P67",3="Aux P68" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",4="106 - PPS 1",6="109 Ignition Key Voltage",14="34 - IAT",5="50 - TPS 1",1="51 - MAF",9="69 - TPS 2",13="73 - CLT",15="98 - PPS 2",11="Aux P66",12="Aux P67",3="Aux P68" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",19="13 - Crank",8="14 - Cam Left",9="33 - Cam Right" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",19="13 - Crank",8="14 - Cam Left",9="33 - Cam Right" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",19="13 - Crank",8="14 - Cam Left",9="33 - Cam Right" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7602,15 +7599,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 97b62defe8..c7e2597408 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen121vag.3453644276" + signature = "rusEFI master.2023.05.04.hellen121vag.788409688" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen121vag.3453644276" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen121vag.788409688" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:16 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:35 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",12="101 - MAP2",6="106 - KNOCK",1="14 - O2",11="29 In Maf",4="34 In PPS1",15="35 In PPS2",9="84 - TPS2",14="85 - IAT",7="86 - CAM1",8="87 - CAM2",5="92 - TPS 1",13="93 - CLT" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",12="101 - MAP2",6="106 - KNOCK",1="14 - O2",11="29 In Maf",4="34 In PPS1",15="35 In PPS2",9="84 - TPS2",14="85 - IAT",7="86 - CAM1",8="87 - CAM2",5="92 - TPS 1",13="93 - CLT" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",93="54 - VSS",19="82 - VR",8="86 - CAM1",9="87 - CAM2" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",93="54 - VSS",19="82 - VR",8="86 - CAM1",9="87 - CAM2" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",93="54 - VSS",19="82 - VR",8="86 - CAM1",9="87 - CAM2" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7605,15 +7602,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 643bd03c6b..bae417c153 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen128.3023868295" + signature = "rusEFI master.2023.05.04.hellen128.1461244203" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen128.3023868295" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen128.1461244203" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:15 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:34 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",6="Battery Sense",4="C24 - PPS1",15="C25 - PPS2",12="E23 - MAP",13="E29 - Coolant Temp",5="E31 - TPS1",9="E34 - TPS2",10="E37 - Crank Input",7="E40 - IN_CAM",14="E45 - IAT",11="E47 - MAF",8="P30_IN_AUX4",2="P32_IN_O2S2",1="P36_IN_O2S",3="P40_IN_MAP3",16="P41_IN_AUX3" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",6="Battery Sense",4="C24 - PPS1",15="C25 - PPS2",12="E23 - MAP",13="E29 - Coolant Temp",5="E31 - TPS1",9="E34 - TPS2",10="E37 - Crank Input",7="E40 - IN_CAM",14="E45 - IAT",11="E47 - MAF",8="P30_IN_AUX4",2="P32_IN_O2S2",1="P36_IN_O2S",3="P40_IN_MAP3",16="P41_IN_AUX3" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",5="C24 - PPS1",38="C25 - PPS2",35="E23 - MAP",36="E29 - Coolant Temp",6="E31 - TPS1",18="E34 - TPS2",19="E37 - Crank Input",8="E40 - IN_CAM",37="E45 - IAT",34="E47 - MAF" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",5="C24 - PPS1",38="C25 - PPS2",35="E23 - MAP",36="E29 - Coolant Temp",6="E31 - TPS1",18="E34 - TPS2",19="E37 - Crank Input",8="E40 - IN_CAM",37="E45 - IAT",34="E47 - MAF" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",5="C24 - PPS1",38="C25 - PPS2",35="E23 - MAP",36="E29 - Coolant Temp",6="E31 - TPS1",18="E34 - TPS2",19="E37 - Crank Input",8="E40 - IN_CAM",37="E45 - IAT",34="E47 - MAF" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7602,15 +7599,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 2449e788b8..089a634db2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen154hyundai.4044096197" + signature = "rusEFI master.2023.05.04.hellen154hyundai.304628329" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen154hyundai.4044096197" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen154hyundai.304628329" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:20 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:39 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",13="CLT",14="IAT",12="K10 Sensor",6="K2 Ignition Key Voltage",1="K21 Ambient Temperature",2="K58 Oil Temp",11="Map Sensor K31",4="PPS 1",15="PPS 2",5="TPS 1",9="TPS 2" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",13="CLT",14="IAT",12="K10 Sensor",6="K2 Ignition Key Voltage",1="K21 Ambient Temperature",2="K58 Oil Temp",11="Map Sensor K31",4="PPS 1",15="PPS 2",5="TPS 1",9="TPS 2" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",9="Cam - K15",8="Cam - K62 rev B",87="Cam - K62 rev C",19="Crank - K17 rev B",86="Crank - K17 rev C",93="K40 VSS" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",9="Cam - K15",8="Cam - K62 rev B",87="Cam - K62 rev C",19="Crank - K17 rev B",86="Crank - K17 rev C",93="K40 VSS" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",9="Cam - K15",8="Cam - K62 rev B",87="Cam - K62 rev C",19="Crank - K17 rev B",86="Crank - K17 rev C",93="K40 VSS" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7602,15 +7599,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index aa11c521ef..f4f0107dab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen72.259470198" + signature = "rusEFI master.2023.05.04.hellen72.3964892122" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen72.259470198" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen72.3964892122" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:22 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:42 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",2="3L - IGN_7 / AFR",7="3V - CAM (A19)",10="3Y - CRANK (A24)",16="4AE - EGR/MAP4 (A22)",9="4F - AC_PRES/AUX1 (A23)",8="4J - VTCS/AUX4 (A20)",14="4N - IAT (A14)",13="4P - CLT (A11)",6="4S/4T - Alternator voltage",12="4U - MAP2/Ign8 (A10)",5="4V - TPS (A17)",11="4X - MAF (A9)",15="5M - PPS2 OR TEMPERATURE SENSOR",1="5N - TPS2",4="5P - PPS1",3="intMAP (A15)" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",2="3L - IGN_7 / AFR",7="3V - CAM (A19)",10="3Y - CRANK (A24)",16="4AE - EGR/MAP4 (A22)",9="4F - AC_PRES/AUX1 (A23)",8="4J - VTCS/AUX4 (A20)",14="4N - IAT (A14)",13="4P - CLT (A11)",6="4S/4T - Alternator voltage",12="4U - MAP2/Ign8 (A10)",5="4V - TPS (A17)",11="4X - MAF (A9)",15="5M - PPS2 OR TEMPERATURE SENSOR",1="5N - TPS2",4="5P - PPS1",3="intMAP (A15)" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",93="3T - VSS (D5)",8="3V - CAM (A19)",19="3Y - CRANK (A24)",80="4H - Neutral",81="5C - Digital Input",78="5I - Digital Input" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",93="3T - VSS (D5)",8="3V - CAM (A19)",19="3Y - CRANK (A24)",80="4H - Neutral",81="5C - Digital Input",78="5I - Digital Input" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",93="3T - VSS (D5)",8="3V - CAM (A19)",19="3Y - CRANK (A24)",80="4H - Neutral",81="5C - Digital Input",78="5I - Digital Input" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index b220c1f00a..e970c3f322 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen81.312330735" + signature = "rusEFI master.2023.05.04.hellen81.4055468355" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen81.312330735" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen81.4055468355" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:23 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:43 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",6="13 - IN_VIGN",10="15 - IN_CRANK (A24)",5="16 - IN_TPS",1="18 - IN_O2S",11="37 - IN_MAP1",12="38 - IN_MAP2",13="39 - IN_CLT",14="40 - IN_IAT",3="41 - IN_MAP3",2="55 - IN_O2S2",9="74 - IN_AUX1",15="75 - IN_AUX2",16="76 - IN_AUX3",8="77 - IN_AUX4",4="78 - IN_PPS",7="79 - IN_CAM" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",6="13 - IN_VIGN",10="15 - IN_CRANK (A24)",5="16 - IN_TPS",1="18 - IN_O2S",11="37 - IN_MAP1",12="38 - IN_MAP2",13="39 - IN_CLT",14="40 - IN_IAT",3="41 - IN_MAP3",2="55 - IN_O2S2",9="74 - IN_AUX1",15="75 - IN_AUX2",16="76 - IN_AUX3",8="77 - IN_AUX4",4="78 - IN_PPS",7="79 - IN_CAM" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",19="15 - IN_CRANK (A24)",93="59 - IN_VSS",18="74 - IN_AUX1",38="75 - IN_AUX2",39="76 - IN_AUX3",9="77 - IN_AUX4",8="79 - IN_CAM" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",19="15 - IN_CRANK (A24)",93="59 - IN_VSS",18="74 - IN_AUX1",38="75 - IN_AUX2",39="76 - IN_AUX3",9="77 - IN_AUX4",8="79 - IN_CAM" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",19="15 - IN_CRANK (A24)",93="59 - IN_VSS",18="74 - IN_AUX1",38="75 - IN_AUX2",39="76 - IN_AUX3",9="77 - IN_AUX4",8="79 - IN_CAM" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7603,15 +7600,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 18066d4ccb..b192e4dd58 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellen88bmw.2621010984" + signature = "rusEFI master.2023.05.04.hellen88bmw.2132620420" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellen88bmw.2621010984" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellen88bmw.2132620420" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:21 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:40 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",10="16 - CRANK",7="17 - CAM",11="41 - MAF",6="56 - Battery Sense",5="73 - TPS",14="77 - IAT",13="78 - CLT",8="Aux BARO",12="Aux MAP",15="Aux PPS2",9="Aux TPS2",16="Aux TPS3",4="PPS1",1="VIN5",2="VIN6" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",10="16 - CRANK",7="17 - CAM",11="41 - MAF",6="56 - Battery Sense",5="73 - TPS",14="77 - IAT",13="78 - CLT",8="Aux BARO",12="Aux MAP",15="Aux PPS2",9="Aux TPS2",16="Aux TPS3",4="PPS1",1="VIN5",2="VIN6" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",19="16 - CRANK",8="17 - CAM" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",19="16 - CRANK",8="17 - CAM" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",19="16 - CRANK",8="17 - CAM" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7601,15 +7598,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 893e68f6f4..fbd744ca6a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellenNA6.4068792504" + signature = "rusEFI master.2023.05.04.hellenNA6.295737364" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellenNA6.4068792504" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellenNA6.295737364" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:27 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:47 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",6="1B - Battery Sense",16="1Q AC Switch",15="1V - Clutch Switch",12="2M - Pressure Sensor",2="2N - Temperature Sensor",1="3N - O2S",11="3O - MAF",14="3P - IAT",13="3Q - CLT",8="4G - PPS2 OR TEMPERATURE SENSOR",9="4H - TPS2",4="4I - PPS1",5="TPS Input",3="intMAP (A15)" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",6="1B - Battery Sense",16="1Q AC Switch",15="1V - Clutch Switch",12="2M - Pressure Sensor",2="2N - Temperature Sensor",1="3N - O2S",11="3O - MAF",14="3P - IAT",13="3Q - CLT",8="4G - PPS2 OR TEMPERATURE SENSOR",9="4H - TPS2",4="4I - PPS1",5="TPS Input",3="intMAP (A15)" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",93="1M - VSS",85="2L - Flex Fuel",19="3E - CRANK",8="3G - CAM" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",93="1M - VSS",85="2L - Flex Fuel",19="3E - CRANK",8="3G - CAM" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",93="1M - VSS",85="2L - Flex Fuel",19="3E - CRANK",8="3G - CAM" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 4765e21e37..019b2b6c79 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.hellenNA8_96.2639269484" + signature = "rusEFI master.2023.05.04.hellenNA8_96.2121551552" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.hellenNA8_96.2639269484" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.hellenNA8_96.2121551552" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:28 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:48 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",16="1K - AC Switch",9="2A - Pressure Input",14="2B - IAT",11="2B - MAF",1="2C - O2S",5="2F - TPS",13="2G - Coolant",6="3B - Battery Sense",10="3F - CRANK",7="3G - CAM",8="3S - EGR BOOST IN",15="4C - IN TEMP/PPS2",4="PPS1",2="TPS1",3="intMAP" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",16="1K - AC Switch",9="2A - Pressure Input",14="2B - IAT",11="2B - MAF",1="2C - O2S",5="2F - TPS",13="2G - Coolant",6="3B - Battery Sense",10="3F - CRANK",7="3G - CAM",8="3S - EGR BOOST IN",15="4C - IN TEMP/PPS2",4="PPS1",2="TPS1",3="intMAP" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",93="1M - VSS",19="3F - CRANK",8="3G - CAM",78="4B - DIGITAL/FLEX" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",93="1M - VSS",19="3F - CRANK",8="3G - CAM",78="4B - DIGITAL/FLEX" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",93="1M - VSS",19="3F - CRANK",8="3G - CAM",78="4B - DIGITAL/FLEX" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 226eb4c69a..6c628504fe 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.kin.2131786189" + signature = "rusEFI master.2023.05.04.kin.2620668257" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.kin.2131786189" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.kin.2620668257" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu May 04 14:58:06 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu May 04 15:05:24 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" logicAnalyzerPins2 = bits, U16, 734, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" logicAnalyzerPins3 = bits, U16, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7627,15 +7624,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 8f2a3d6b99..37eb482eaf 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.m74_9.3360228922" + signature = "rusEFI master.2023.05.04.m74_9.728581782" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.m74_9.3360228922" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.m74_9.728581782" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:35 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:55 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7608,15 +7605,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 44eb585a89..b2bd943b76 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.mre_f4.2586871905" + signature = "rusEFI master.2023.05.04.mre_f4.2031405261" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.mre_f4.2586871905" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.mre_f4.2031405261" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:31 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:51 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",1="18 - AN temp 1",13="19 - AN volt 4",14="20 - AN volt 5",4="22 - AN temp 4",2="23 - AN temp 2",3="24 - AN temp 3",7="26 - AN volt 2",11="27 - AN volt 1",5="28 - AN volt 10, Aux Reuse",16="30 - AN volt 7",8="31 - AN volt 3",15="32 - AN volt 6, Aux Reuse",9="36 - AN volt 8, Aux Reuse",10="40 - AN volt 9, Aux Reuse",12="Battery Sense" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",1="18 - AN temp 1",13="19 - AN volt 4",14="20 - AN volt 5",4="22 - AN temp 4",2="23 - AN temp 2",3="24 - AN temp 3",7="26 - AN volt 2",11="27 - AN volt 1",5="28 - AN volt 10, Aux Reuse",16="30 - AN volt 7",8="31 - AN volt 3",15="32 - AN volt 6, Aux Reuse",9="36 - AN volt 8, Aux Reuse",10="40 - AN volt 9, Aux Reuse",12="Battery Sense" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5151,7 +5148,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 267e44984a..80fe150632 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.mre_f7.2586871905" + signature = "rusEFI master.2023.05.04.mre_f7.2031405261" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.mre_f7.2586871905" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.mre_f7.2031405261" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:30 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:50 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",1="18 - AN temp 1",13="19 - AN volt 4",14="20 - AN volt 5",4="22 - AN temp 4",2="23 - AN temp 2",3="24 - AN temp 3",7="26 - AN volt 2",11="27 - AN volt 1",5="28 - AN volt 10, Aux Reuse",16="30 - AN volt 7",8="31 - AN volt 3",15="32 - AN volt 6, Aux Reuse",9="36 - AN volt 8, Aux Reuse",10="40 - AN volt 9, Aux Reuse",12="Battery Sense" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",1="18 - AN temp 1",13="19 - AN volt 4",14="20 - AN volt 5",4="22 - AN temp 4",2="23 - AN temp 2",3="24 - AN temp 3",7="26 - AN volt 2",11="27 - AN volt 1",5="28 - AN volt 10, Aux Reuse",16="30 - AN volt 7",8="31 - AN volt 3",15="32 - AN volt 6, Aux Reuse",9="36 - AN volt 8, Aux Reuse",10="40 - AN volt 9, Aux Reuse",12="Battery Sense" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",5="22 - AN temp 4",3="23 - AN temp 2",4="24 - AN temp 3",7="25 - Hall Cam",40="45 - VR/Hall Crank" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5151,7 +5148,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini index d1c4d9c817..24130b40ed 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.nucleo_f429.398973697" + signature = "rusEFI master.2023.05.04.nucleo_f429.4108557229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.nucleo_f429.398973697" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.nucleo_f429.4108557229" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:46 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:07 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7626,15 +7623,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini index 93035437e5..6f5b7e94a9 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.nucleo_f767.398973697" + signature = "rusEFI master.2023.05.04.nucleo_f767.4108557229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.nucleo_f767.398973697" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.nucleo_f767.4108557229" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:48 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:09 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7626,15 +7623,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index 38b46eb6e4..76428b5f01 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.nucleo_h743.398973697" + signature = "rusEFI master.2023.05.04.nucleo_h743.4108557229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.nucleo_h743.398973697" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.nucleo_h743.4108557229" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:49 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:10 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7626,15 +7623,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 1095bbec88..0c24aa861c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.prometheus_405.659756689" + signature = "rusEFI master.2023.05.04.prometheus_405.3296155197" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.prometheus_405.659756689" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.prometheus_405.3296155197" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:39 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:00 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7621,15 +7618,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 390bd5416a..776f1ef868 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.prometheus_469.659756689" + signature = "rusEFI master.2023.05.04.prometheus_469.3296155197" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.prometheus_469.659756689" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.prometheus_469.3296155197" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:38 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:59 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7621,15 +7618,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 2d24448b43..4feefe48e8 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.proteus_f4.637501964" + signature = "rusEFI master.2023.05.04.proteus_f4.3336290976" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.proteus_f4.637501964" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.proteus_f4.3336290976" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:42 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:02 UTC 2023 pageSize = 27176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",15="Analog Temp 1",16="Analog Temp 2",9="Analog Temp 3",10="Analog Temp 4",11="Analog Volt 1",6="Analog Volt 10",7="Analog Volt 11",12="Analog Volt 2",13="Analog Volt 3",14="Analog Volt 4",1="Analog Volt 5",2="Analog Volt 6",3="Analog Volt 7",4="Analog Volt 8",5="Analog Volt 9",8="Battery Sense" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",15="Analog Temp 1",16="Analog Temp 2",9="Analog Temp 3",10="Analog Temp 4",11="Analog Volt 1",6="Analog Volt 10",7="Analog Volt 11",12="Analog Volt 2",13="Analog Volt 3",14="Analog Volt 4",1="Analog Volt 5",2="Analog Volt 6",3="Analog Volt 7",4="Analog Volt 8",5="Analog Volt 9",8="Battery Sense" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 27166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 27166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 56ae4f4c38..b25b2dfdd0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.proteus_f7.637501964" + signature = "rusEFI master.2023.05.04.proteus_f7.3336290976" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.proteus_f7.637501964" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.proteus_f7.3336290976" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:41 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:01 UTC 2023 pageSize = 27176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",15="Analog Temp 1",16="Analog Temp 2",9="Analog Temp 3",10="Analog Temp 4",11="Analog Volt 1",6="Analog Volt 10",7="Analog Volt 11",12="Analog Volt 2",13="Analog Volt 3",14="Analog Volt 4",1="Analog Volt 5",2="Analog Volt 6",3="Analog Volt 7",4="Analog Volt 8",5="Analog Volt 9",8="Battery Sense" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",15="Analog Temp 1",16="Analog Temp 2",9="Analog Temp 3",10="Analog Temp 4",11="Analog Volt 1",6="Analog Volt 10",7="Analog Volt 11",12="Analog Volt 2",13="Analog Volt 3",14="Analog Volt 4",1="Analog Volt 5",2="Analog Volt 6",3="Analog Volt 7",4="Analog Volt 8",5="Analog Volt 9",8="Battery Sense" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 27166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 27166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index c4dcf37427..d92f13ed32 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.proteus_h7.637501964" + signature = "rusEFI master.2023.05.04.proteus_h7.3336290976" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.proteus_h7.637501964" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.proteus_h7.3336290976" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:43 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:04 UTC 2023 pageSize = 27176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",15="Analog Temp 1",16="Analog Temp 2",9="Analog Temp 3",10="Analog Temp 4",11="Analog Volt 1",6="Analog Volt 10",7="Analog Volt 11",12="Analog Volt 2",13="Analog Volt 3",14="Analog Volt 4",1="Analog Volt 5",2="Analog Volt 6",3="Analog Volt 7",4="Analog Volt 8",5="Analog Volt 9",8="Battery Sense" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",15="Analog Temp 1",16="Analog Temp 2",9="Analog Temp 3",10="Analog Temp 4",11="Analog Volt 1",6="Analog Volt 10",7="Analog Volt 11",12="Analog Volt 2",13="Analog Volt 3",14="Analog Volt 4",1="Analog Volt 5",2="Analog Volt 6",3="Analog Volt 7",4="Analog Volt 8",5="Analog Volt 9",8="Battery Sense" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",40="Digital 1",77="Digital 2",78="Digital 3",80="Digital 4",79="Digital 5",81="Digital 6",73="VR 1",74="VR 2" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 27166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 27166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7606,15 +7603,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 9b893c59ed..729f86a2c3 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.s105.789262008" + signature = "rusEFI master.2023.05.04.s105.3425660436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.s105.789262008" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.s105.3425660436" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:36 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:05:56 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",9="13 - Ignition switch in (15)",2="16 - TPS",8="18 - AFR 1",3="19 - Knock",4="39 - CLT",15="40 - IAT",10="44 - +12 sense (MR)",1="56 - MAP",12="na 37 - MAF",7="opt 21 - AC Press",6="opt 55 - AFR 2" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",9="13 - Ignition switch in (15)",2="16 - TPS",8="18 - AFR 1",3="19 - Knock",4="39 - CLT",15="40 - IAT",10="44 - +12 sense (MR)",1="56 - MAP",12="na 37 - MAF",7="opt 21 - AC Press",6="opt 55 - AFR 2" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",28="15 - Crank Sensor+",21="59 - Speed in",29="na 79 - CAM in" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",28="15 - Crank Sensor+",21="59 - Speed in",29="na 79 - CAM in" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",28="15 - Crank Sensor+",21="59 - Speed in",29="na 79 - CAM in" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7608,15 +7605,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 671c40d97d..dfa2b9c088 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.subaru_eg33_f7.277637589" + signature = "rusEFI master.2023.05.04.subaru_eg33_f7.4087884153" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.subaru_eg33_f7.277637589" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.subaru_eg33_f7.4087884153" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu May 04 14:58:08 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu May 04 15:05:27 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",7="A02 - VBat",15="A03 - Coolant t Ain",10="A04 - EGR t Ain",16="A06 - Oxyg 1 Ain",9="A06 - Oxyg 2 Ain",12="A18 - AUX0 Ain",1="AUX0_18 - MAP Ain",6="AUX0_19 - IAT Ain",13="B02 - TPS Ain",4="B05 - MAF Ain" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",7="A02 - VBat",15="A03 - Coolant t Ain",10="A04 - EGR t Ain",16="A06 - Oxyg 1 Ain",9="A06 - Oxyg 2 Ain",12="A18 - AUX0 Ain",1="AUX0_18 - MAP Ain",6="AUX0_19 - IAT Ain",13="B02 - TPS Ain",4="B05 - MAF Ain" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [0:7], 0="NONE",126="A07 - Cam VR+",124="A08 - Crank 1 VR+",75="A08 - Crank 2 VR+",64="B11 - Speed Din" logicAnalyzerPins2 = bits, U16, 734, [0:7], 0="NONE",126="A07 - Cam VR+",124="A08 - Crank 1 VR+",75="A08 - Crank 2 VR+",64="B11 - Speed Din" logicAnalyzerPins3 = bits, U16, 736, [0:7], 0="NONE",126="A07 - Cam VR+",124="A08 - Crank 1 VR+",75="A08 - Crank 2 VR+",64="B11 - Speed Din" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7619,15 +7616,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index e5907dfc0e..615d5a3048 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.05.04.tdg-pdm8.2640967459" + signature = "rusEFI master.2023.05.04.tdg-pdm8.2119022479" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.05.04.tdg-pdm8.2640967459" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.05.04.tdg-pdm8.2119022479" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 14:58:51 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:12 UTC 2023 pageSize = 23176 page = 1 @@ -128,11 +128,10 @@ antiLagEnabled = bits, U32, 120, [18:18], "false", "true" useRunningMathForCranking = bits, U32, 120, [19:19], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 120, [20:20], "false", "true" useTLE8888_stepper = bits, U32, 120, [21:21], "false", "true" -enableMapEstimationTableFallback = bits, U32, 120, [22:22], "false", "true" -usescriptTableForCanSniffingFiltering = bits, U32, 120, [23:23], "false", "true" -verboseCan = bits, U32, 120, [24:24], "Do not print", "Print all" -artificialTestMisfire = bits, U32, 120, [25:25], "No thank you", "Danger Mode" -useFordRedundantPps = bits, U32, 120, [26:26], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 120, [22:22], "false", "true" +verboseCan = bits, U32, 120, [23:23], "Do not print", "Print all" +artificialTestMisfire = bits, U32, 120, [24:24], "No thank you", "Danger Mode" +useFordRedundantPps = bits, U32, 120, [25:25], "false", "true" tpsMin = scalar, S16, 124, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 126, "ADC", 1, 0, 0, 1023, 0 tpsErrorDetectionTooLow = scalar, S16, 128, "%", 1, 0, -10, 0, 0 @@ -210,9 +209,8 @@ trigger_customTotalToothCount = scalar, S32, 464, "number", 1, 0, 1, 300, 0 trigger_customSkippedToothCount = scalar, S32, 468, "number", 1, 0, 0, 300, 0 airByRpmTaper = scalar, F32, 472, "%", 1, 0, 0, 50, 1 hip9011SpiDevice = bits, U08, 476, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4" -failedMapFallback = scalar, U08, 477, "kPa", 1, 0, 0, 100, 0 -boostControlSafeDutyCycle = scalar, U08, 478, "%", 1, 0, 0, 100, 0 -mafAdcChannel = bits, U08, 479, [0:5], 0="NONE",5="Battery Sense",11="Sense 1",12="Sense 2",13="Sense 3",14="Sense 4",15="Sense 5",16="Sense 6",9="Sense 7",10="Sense 8" +boostControlSafeDutyCycle = scalar, U08, 477, "%", 1, 0, 0, 100, 0 +mafAdcChannel = bits, U08, 478, [0:5], 0="NONE",5="Battery Sense",11="Sense 1",12="Sense 2",13="Sense 3",14="Sense 4",15="Sense 5",16="Sense 6",9="Sense 7",10="Sense 8" globalFuelCorrection = scalar, F32, 480, "coef", 1, 0, 0, 1000, 2 adcVcc = scalar, F32, 484, "volts", 1, 0, 0, 6, 3 mapCamDetectionAnglePosition = scalar, F32, 488, "Deg", 1, 0, 0, 360, 0 @@ -338,28 +336,29 @@ rusefiVerbose29b = bits, U32, 728, [4:4], "11 bit", "29 bit" unusedIsEngineControlEnabled = bits, U32, 728, [5:5], "false", "true" isHip9011Enabled = bits, U32, 728, [6:6], "false", "true" isVerboseAlternator = bits, U32, 728, [7:7], "false", "true" -useStepperIdle = bits, U32, 728, [8:8], "false", "true" -enabledStep1Limiter = bits, U32, 728, [9:9], "false", "true" -useTpicAdvancedMode = bits, U32, 728, [10:10], "false", "true" -unused760b12 = bits, U32, 728, [11:11], "false", "true" -verboseTLE8888 = bits, U32, 728, [12:12], "false", "true" -enableVerboseCanTx = bits, U32, 728, [13:13], "false", "true" -etb1configured = bits, U32, 728, [14:14], "false", "true" -etb2configured = bits, U32, 728, [15:15], "false", "true" -measureMapOnlyInOneCylinder = bits, U32, 728, [16:16], "false", "true" -stepperForceParkingEveryRestart = bits, U32, 728, [17:17], "false", "true" -isFasterEngineSpinUpEnabled = bits, U32, 728, [18:18], "false", "true" -coastingFuelCutEnabled = bits, U32, 728, [19:19], "false", "true" -useIacTableForCoasting = bits, U32, 728, [20:20], "false", "true" -useNoiselessTriggerDecoder = bits, U32, 728, [21:21], "false", "true" -useIdleTimingPidControl = bits, U32, 728, [22:22], "false", "true" -disableEtbWhenEngineStopped = bits, U32, 728, [23:23], "false", "true" -is_enabled_spi_4 = bits, U32, 728, [24:24], "false", "true" -pauseEtbControl = bits, U32, 728, [25:25], "false", "true" -alignEngineSnifferAtTDC = bits, U32, 728, [26:26], "false", "true" -verboseKLine = bits, U32, 728, [27:27], "false", "true" -idleIncrementalPidCic = bits, U32, 728, [28:28], "false", "true" -enableAemXSeries = bits, U32, 728, [29:29], "false", "true" +verboseQuad = bits, U32, 728, [8:8], "false", "true" +useStepperIdle = bits, U32, 728, [9:9], "false", "true" +enabledStep1Limiter = bits, U32, 728, [10:10], "false", "true" +useTpicAdvancedMode = bits, U32, 728, [11:11], "false", "true" +unused760b12 = bits, U32, 728, [12:12], "false", "true" +verboseTLE8888 = bits, U32, 728, [13:13], "false", "true" +enableVerboseCanTx = bits, U32, 728, [14:14], "false", "true" +etb1configured = bits, U32, 728, [15:15], "false", "true" +etb2configured = bits, U32, 728, [16:16], "false", "true" +measureMapOnlyInOneCylinder = bits, U32, 728, [17:17], "false", "true" +stepperForceParkingEveryRestart = bits, U32, 728, [18:18], "false", "true" +isFasterEngineSpinUpEnabled = bits, U32, 728, [19:19], "false", "true" +coastingFuelCutEnabled = bits, U32, 728, [20:20], "false", "true" +useIacTableForCoasting = bits, U32, 728, [21:21], "false", "true" +useNoiselessTriggerDecoder = bits, U32, 728, [22:22], "false", "true" +useIdleTimingPidControl = bits, U32, 728, [23:23], "false", "true" +disableEtbWhenEngineStopped = bits, U32, 728, [24:24], "false", "true" +is_enabled_spi_4 = bits, U32, 728, [25:25], "false", "true" +pauseEtbControl = bits, U32, 728, [26:26], "false", "true" +alignEngineSnifferAtTDC = bits, U32, 728, [27:27], "false", "true" +verboseKLine = bits, U32, 728, [28:28], "false", "true" +idleIncrementalPidCic = bits, U32, 728, [29:29], "false", "true" +enableAemXSeries = bits, U32, 728, [30:30], "false", "true" logicAnalyzerPins1 = bits, U16, 732, [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" logicAnalyzerPins2 = bits, U16, 734, [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" logicAnalyzerPins3 = bits, U16, 736, [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" @@ -1485,7 +1484,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 doNotFilterTriggerEdgeNoise = "Detect double trigger edges" useRunningMathForCranking = "For cranking either use the specified fixed base fuel mass, or use the normal running math (VE table)." displayLogicLevelsInEngineSniffer = "Shall we display real life signal or just the part consumed by trigger decoder.\nApplies to both trigger and cam/vvt input.\n\nenable logic_level_trigger" - enableMapEstimationTableFallback = "If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS." verboseCan = "Print incoming and outgoing first bus CAN messages in rusEFI console" artificialTestMisfire = "Experimental setting that will cause a misfire\nDO NOT ENABLE." useFordRedundantPps = "On some Ford and Toyota vehicles one of the pedal sensors is not linear on the full range, i.e. in the specific range of the positions we effectively have only one sensor." @@ -1540,7 +1538,6 @@ boostClosedLoopBlends2_blendValues = array, U08, 23166, [8], "%", 0.5, 0, 0, 100 trailingSparkAngle = "just a temporary solution" trigger_type = "https://github.com/rusefi/rusefi/wiki/All-Supported-Triggers\nset trigger_type X" airByRpmTaper = "Extra air taper amount" - failedMapFallback = "Single value to be used in event of a failed MAP sensor \nThis value is only used for speed density fueling calculations." boostControlSafeDutyCycle = "Duty cycle to use in case of a sensor failure. This duty cycle should produce the minimum possible amount of boost. This duty is also used in case any of the minimum RPM/TPS/MAP conditions are not met." camInputs1 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 1" camInputs2 = "Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts. 2" @@ -5150,7 +5147,7 @@ menuDialog = main subMenu = tChargeSettings, "Charge temperature estimation", 0, {isInjectionEnabled == 1} subMenu = baroCorrTbl, "Barometric pressure correction", 0, {isInjectionEnabled == 1 && fuelAlgorithm == 0} - subMenu = mapEstimateTableTbl, "MAP estimate table", 0, { enableMapEstimationTableFallback } + subMenu = mapEstimateTableTbl, "MAP estimate table" subMenu = std_separator # Fuel model @@ -7626,15 +7623,10 @@ dialog = sent_stateDialog, "sent_state" field = "Soft limiter start", etbRevLimitStart field = "Soft limiter range", etbRevLimitRange - dialog = fallbacks, "Fallbacks" - field = "Use MAP estimation table as fallback", enableMapEstimationTableFallback - field = "Failed MAP sensor fallback", failedMapFallback, { !enableMapEstimationTableFallback } - dialog = limitsAndFallbackLeft panel = limitsSettings panel = softRpmLimitSettings, West, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && !useCltBasedRpmLimit } panel = etbLimits - panel = fallbacks dialog = limitsAndFallbackCenter, "CLT-based RPM Limit" panel = cltRevLimitCurve 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 fb5f23667f..7a743ed628 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 Thu May 04 14:58:54 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 04 15:06:15 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1015,7 +1015,6 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; - public static final int SIGNATURE_HASH = 2139669927; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; public static final int spi_device_e_SPI_DEVICE_3 = 3; @@ -1239,7 +1238,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2023.05.04.f407-discovery.2139669927"; + public static final String TS_SIGNATURE = "rusEFI master.2023.05.04.f407-discovery.2628551947"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1424; @@ -1340,11 +1339,10 @@ public class Fields { public static final Field USERUNNINGMATHFORCRANKING = Field.create("USERUNNINGMATHFORCRANKING", 120, FieldType.BIT, 19).setBaseOffset(0); public static final Field DISPLAYLOGICLEVELSINENGINESNIFFER = Field.create("DISPLAYLOGICLEVELSINENGINESNIFFER", 120, FieldType.BIT, 20).setBaseOffset(0); public static final Field USETLE8888_STEPPER = Field.create("USETLE8888_STEPPER", 120, FieldType.BIT, 21).setBaseOffset(0); - public static final Field ENABLEMAPESTIMATIONTABLEFALLBACK = Field.create("ENABLEMAPESTIMATIONTABLEFALLBACK", 120, FieldType.BIT, 22).setBaseOffset(0); - public static final Field USESCRIPTTABLEFORCANSNIFFINGFILTERING = Field.create("USESCRIPTTABLEFORCANSNIFFINGFILTERING", 120, FieldType.BIT, 23).setBaseOffset(0); - public static final Field VERBOSECAN = Field.create("VERBOSECAN", 120, FieldType.BIT, 24).setBaseOffset(0); - public static final Field ARTIFICIALTESTMISFIRE = Field.create("ARTIFICIALTESTMISFIRE", 120, FieldType.BIT, 25).setBaseOffset(0); - public static final Field USEFORDREDUNDANTPPS = Field.create("USEFORDREDUNDANTPPS", 120, FieldType.BIT, 26).setBaseOffset(0); + public static final Field USESCRIPTTABLEFORCANSNIFFINGFILTERING = Field.create("USESCRIPTTABLEFORCANSNIFFINGFILTERING", 120, FieldType.BIT, 22).setBaseOffset(0); + public static final Field VERBOSECAN = Field.create("VERBOSECAN", 120, FieldType.BIT, 23).setBaseOffset(0); + public static final Field ARTIFICIALTESTMISFIRE = Field.create("ARTIFICIALTESTMISFIRE", 120, FieldType.BIT, 24).setBaseOffset(0); + public static final Field USEFORDREDUNDANTPPS = Field.create("USEFORDREDUNDANTPPS", 120, FieldType.BIT, 25).setBaseOffset(0); public static final Field TPSMIN = Field.create("TPSMIN", 124, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field TPSMAX = Field.create("TPSMAX", 126, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field TPSERRORDETECTIONTOOLOW = Field.create("TPSERRORDETECTIONTOOLOW", 128, FieldType.INT16).setScale(1.0).setBaseOffset(0); @@ -1436,9 +1434,9 @@ public class Fields { public static final Field TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT = Field.create("TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT", 468, FieldType.INT).setScale(1.0).setBaseOffset(0); public static final Field AIRBYRPMTAPER = Field.create("AIRBYRPMTAPER", 472, FieldType.FLOAT).setBaseOffset(0); public static final Field HIP9011SPIDEVICE = Field.create("HIP9011SPIDEVICE", 476, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field FAILEDMAPFALLBACK = Field.create("FAILEDMAPFALLBACK", 477, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field BOOSTCONTROLSAFEDUTYCYCLE = Field.create("BOOSTCONTROLSAFEDUTYCYCLE", 478, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field MAFADCCHANNEL = Field.create("MAFADCCHANNEL", 479, FieldType.INT8, adc_channel_e).setScale(1.0).setBaseOffset(0); + public static final Field BOOSTCONTROLSAFEDUTYCYCLE = Field.create("BOOSTCONTROLSAFEDUTYCYCLE", 477, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field MAFADCCHANNEL = Field.create("MAFADCCHANNEL", 478, FieldType.INT8, adc_channel_e).setScale(1.0).setBaseOffset(0); + public static final Field ALIGNMENTFILL_AT_479 = Field.create("ALIGNMENTFILL_AT_479", 479, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field GLOBALFUELCORRECTION = Field.create("GLOBALFUELCORRECTION", 480, FieldType.FLOAT).setBaseOffset(0); public static final Field ADCVCC = Field.create("ADCVCC", 484, FieldType.FLOAT).setBaseOffset(0); public static final Field MAPCAMDETECTIONANGLEPOSITION = Field.create("MAPCAMDETECTIONANGLEPOSITION", 488, FieldType.FLOAT).setBaseOffset(0); @@ -1583,27 +1581,28 @@ public class Fields { public static final Field RUSEFIVERBOSE29B = Field.create("RUSEFIVERBOSE29B", 728, FieldType.BIT, 4).setBaseOffset(0); public static final Field ISHIP9011ENABLED = Field.create("ISHIP9011ENABLED", 728, FieldType.BIT, 6).setBaseOffset(0); public static final Field ISVERBOSEALTERNATOR = Field.create("ISVERBOSEALTERNATOR", 728, FieldType.BIT, 7).setBaseOffset(0); - public static final Field USESTEPPERIDLE = Field.create("USESTEPPERIDLE", 728, FieldType.BIT, 8).setBaseOffset(0); - public static final Field ENABLEDSTEP1LIMITER = Field.create("ENABLEDSTEP1LIMITER", 728, FieldType.BIT, 9).setBaseOffset(0); - public static final Field USETPICADVANCEDMODE = Field.create("USETPICADVANCEDMODE", 728, FieldType.BIT, 10).setBaseOffset(0); - public static final Field VERBOSETLE8888 = Field.create("VERBOSETLE8888", 728, FieldType.BIT, 12).setBaseOffset(0); - public static final Field ENABLEVERBOSECANTX = Field.create("ENABLEVERBOSECANTX", 728, FieldType.BIT, 13).setBaseOffset(0); - public static final Field ETB1CONFIGURED = Field.create("ETB1CONFIGURED", 728, FieldType.BIT, 14).setBaseOffset(0); - public static final Field ETB2CONFIGURED = Field.create("ETB2CONFIGURED", 728, FieldType.BIT, 15).setBaseOffset(0); - public static final Field MEASUREMAPONLYINONECYLINDER = Field.create("MEASUREMAPONLYINONECYLINDER", 728, FieldType.BIT, 16).setBaseOffset(0); - public static final Field STEPPERFORCEPARKINGEVERYRESTART = Field.create("STEPPERFORCEPARKINGEVERYRESTART", 728, FieldType.BIT, 17).setBaseOffset(0); - public static final Field ISFASTERENGINESPINUPENABLED = Field.create("ISFASTERENGINESPINUPENABLED", 728, FieldType.BIT, 18).setBaseOffset(0); - public static final Field COASTINGFUELCUTENABLED = Field.create("COASTINGFUELCUTENABLED", 728, FieldType.BIT, 19).setBaseOffset(0); - public static final Field USEIACTABLEFORCOASTING = Field.create("USEIACTABLEFORCOASTING", 728, FieldType.BIT, 20).setBaseOffset(0); - public static final Field USENOISELESSTRIGGERDECODER = Field.create("USENOISELESSTRIGGERDECODER", 728, FieldType.BIT, 21).setBaseOffset(0); - public static final Field USEIDLETIMINGPIDCONTROL = Field.create("USEIDLETIMINGPIDCONTROL", 728, FieldType.BIT, 22).setBaseOffset(0); - public static final Field DISABLEETBWHENENGINESTOPPED = Field.create("DISABLEETBWHENENGINESTOPPED", 728, FieldType.BIT, 23).setBaseOffset(0); - public static final Field IS_ENABLED_SPI_4 = Field.create("IS_ENABLED_SPI_4", 728, FieldType.BIT, 24).setBaseOffset(0); - public static final Field PAUSEETBCONTROL = Field.create("PAUSEETBCONTROL", 728, FieldType.BIT, 25).setBaseOffset(0); - public static final Field ALIGNENGINESNIFFERATTDC = Field.create("ALIGNENGINESNIFFERATTDC", 728, FieldType.BIT, 26).setBaseOffset(0); - public static final Field VERBOSEKLINE = Field.create("VERBOSEKLINE", 728, FieldType.BIT, 27).setBaseOffset(0); - public static final Field IDLEINCREMENTALPIDCIC = Field.create("IDLEINCREMENTALPIDCIC", 728, FieldType.BIT, 28).setBaseOffset(0); - public static final Field ENABLEAEMXSERIES = Field.create("ENABLEAEMXSERIES", 728, FieldType.BIT, 29).setBaseOffset(0); + public static final Field VERBOSEQUAD = Field.create("VERBOSEQUAD", 728, FieldType.BIT, 8).setBaseOffset(0); + public static final Field USESTEPPERIDLE = Field.create("USESTEPPERIDLE", 728, FieldType.BIT, 9).setBaseOffset(0); + public static final Field ENABLEDSTEP1LIMITER = Field.create("ENABLEDSTEP1LIMITER", 728, FieldType.BIT, 10).setBaseOffset(0); + public static final Field USETPICADVANCEDMODE = Field.create("USETPICADVANCEDMODE", 728, FieldType.BIT, 11).setBaseOffset(0); + public static final Field VERBOSETLE8888 = Field.create("VERBOSETLE8888", 728, FieldType.BIT, 13).setBaseOffset(0); + public static final Field ENABLEVERBOSECANTX = Field.create("ENABLEVERBOSECANTX", 728, FieldType.BIT, 14).setBaseOffset(0); + public static final Field ETB1CONFIGURED = Field.create("ETB1CONFIGURED", 728, FieldType.BIT, 15).setBaseOffset(0); + public static final Field ETB2CONFIGURED = Field.create("ETB2CONFIGURED", 728, FieldType.BIT, 16).setBaseOffset(0); + public static final Field MEASUREMAPONLYINONECYLINDER = Field.create("MEASUREMAPONLYINONECYLINDER", 728, FieldType.BIT, 17).setBaseOffset(0); + public static final Field STEPPERFORCEPARKINGEVERYRESTART = Field.create("STEPPERFORCEPARKINGEVERYRESTART", 728, FieldType.BIT, 18).setBaseOffset(0); + public static final Field ISFASTERENGINESPINUPENABLED = Field.create("ISFASTERENGINESPINUPENABLED", 728, FieldType.BIT, 19).setBaseOffset(0); + public static final Field COASTINGFUELCUTENABLED = Field.create("COASTINGFUELCUTENABLED", 728, FieldType.BIT, 20).setBaseOffset(0); + public static final Field USEIACTABLEFORCOASTING = Field.create("USEIACTABLEFORCOASTING", 728, FieldType.BIT, 21).setBaseOffset(0); + public static final Field USENOISELESSTRIGGERDECODER = Field.create("USENOISELESSTRIGGERDECODER", 728, FieldType.BIT, 22).setBaseOffset(0); + public static final Field USEIDLETIMINGPIDCONTROL = Field.create("USEIDLETIMINGPIDCONTROL", 728, FieldType.BIT, 23).setBaseOffset(0); + public static final Field DISABLEETBWHENENGINESTOPPED = Field.create("DISABLEETBWHENENGINESTOPPED", 728, FieldType.BIT, 24).setBaseOffset(0); + public static final Field IS_ENABLED_SPI_4 = Field.create("IS_ENABLED_SPI_4", 728, FieldType.BIT, 25).setBaseOffset(0); + public static final Field PAUSEETBCONTROL = Field.create("PAUSEETBCONTROL", 728, FieldType.BIT, 26).setBaseOffset(0); + public static final Field ALIGNENGINESNIFFERATTDC = Field.create("ALIGNENGINESNIFFERATTDC", 728, FieldType.BIT, 27).setBaseOffset(0); + public static final Field VERBOSEKLINE = Field.create("VERBOSEKLINE", 728, FieldType.BIT, 28).setBaseOffset(0); + public static final Field IDLEINCREMENTALPIDCIC = Field.create("IDLEINCREMENTALPIDCIC", 728, FieldType.BIT, 29).setBaseOffset(0); + public static final Field ENABLEAEMXSERIES = Field.create("ENABLEAEMXSERIES", 728, FieldType.BIT, 30).setBaseOffset(0); public static final Field LOGICANALYZERPINS1 = Field.create("LOGICANALYZERPINS1", 732, FieldType.INT16, brain_input_pin_e).setScale(1.0).setBaseOffset(0); public static final Field LOGICANALYZERPINS2 = Field.create("LOGICANALYZERPINS2", 734, FieldType.INT16, brain_input_pin_e).setScale(1.0).setBaseOffset(0); public static final Field LOGICANALYZERPINS3 = Field.create("LOGICANALYZERPINS3", 736, FieldType.INT16, brain_input_pin_e).setScale(1.0).setBaseOffset(0); @@ -2832,7 +2831,6 @@ public class Fields { USERUNNINGMATHFORCRANKING, DISPLAYLOGICLEVELSINENGINESNIFFER, USETLE8888_STEPPER, - ENABLEMAPESTIMATIONTABLEFALLBACK, USESCRIPTTABLEFORCANSNIFFINGFILTERING, VERBOSECAN, ARTIFICIALTESTMISFIRE, @@ -2924,9 +2922,9 @@ public class Fields { TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT, AIRBYRPMTAPER, HIP9011SPIDEVICE, - FAILEDMAPFALLBACK, BOOSTCONTROLSAFEDUTYCYCLE, MAFADCCHANNEL, + ALIGNMENTFILL_AT_479, GLOBALFUELCORRECTION, ADCVCC, MAPCAMDETECTIONANGLEPOSITION, @@ -3064,6 +3062,7 @@ public class Fields { RUSEFIVERBOSE29B, ISHIP9011ENABLED, ISVERBOSEALTERNATOR, + VERBOSEQUAD, USESTEPPERIDLE, ENABLEDSTEP1LIMITER, USETPICADVANCEDMODE,