diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md index 02e89186ce..37ae8e38dc 100644 --- a/firmware/CHANGELOG.md +++ b/firmware/CHANGELOG.md @@ -53,6 +53,7 @@ Release template (copy/paste this for new release): - multi-line tooltips in TS #4927 - Negative temperature values for IAT Corr table #4941 - DC wastegate #4965 + - [LSE] RTC (SD log dates) #4556 ## December 2022 Release - "Day 289" diff --git a/firmware/ChibiOS b/firmware/ChibiOS index abd0e469c2..6b154adfaa 160000 --- a/firmware/ChibiOS +++ b/firmware/ChibiOS @@ -1 +1 @@ -Subproject commit abd0e469c2ee6c5b2b521c6a270e51b32454abad +Subproject commit 6b154adfaa56afe7570a19bbce552d2e7ea9b891 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 469e3d3b9b..73e9e97837 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 Mon Feb 06 23:06:36 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Feb 12 21:50:36 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1763,9 +1763,8 @@ struct engine_configuration_s { offset 764 bit 28 */ bool alignEngineSnifferAtTDC : 1 {}; /** - * This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle. offset 764 bit 29 */ - bool useETBforIdleControl : 1 {}; + bool unused764b29 : 1 {}; /** offset 764 bit 30 */ bool idleIncrementalPidCic : 1 {}; @@ -5253,4 +5252,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22432); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 06 23:06:36 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Feb 12 21:50:36 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 63e36bf05c..7a15ce005c 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1045,7 +1045,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 145793383 +#define SIGNATURE_HASH 2748537951 #define specs_s_size 12 #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 @@ -1321,7 +1321,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.02.12.cypress.145793383" +#define TS_SIGNATURE "rusEFI master.2023.02.12.cypress.2748537951" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp b/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp index 7aef7ed92e..33eae04ad3 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-honda-k/board_configuration.cpp @@ -50,7 +50,6 @@ static void setupDefaultSensorInputs() { engineConfiguration->vehicleSpeedSensorInputPin = H144_IN_VSS; engineConfiguration->tps1_1AdcChannel = H144_IN_TPS; - engineConfiguration->useETBforIdleControl = false; engineConfiguration->mafAdcChannel = EFI_ADC_NONE; engineConfiguration->map.sensor.hwChannel = H144_IN_MAP1; diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index 0de7c25354..001f3fc51d 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -127,7 +127,6 @@ void setBoardDefaultConfiguration() { engineConfiguration->fanOnTemperature = 85; engineConfiguration->fanOffTemperature = 81; - engineConfiguration->useETBforIdleControl = true; engineConfiguration->etbIdleThrottleRange = 10; engineConfiguration->cutFuelOnHardLimit = false; engineConfiguration->idlePidRpmUpperLimit = 300; diff --git a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp index 90ac02d8d4..26df191e17 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp @@ -53,7 +53,6 @@ static void setupDefaultSensorInputs() { engineConfiguration->vehicleSpeedSensorInputPin = H144_IN_VSS; setTPS1Inputs(H144_IN_TPS, H144_IN_AUX1); - engineConfiguration->useETBforIdleControl = true; setPPSCalibration(0.73, 4.0, 0.34, 1.86); 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 7105fccdc6..7871b05d3a 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 06 23:06:35 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Feb 12 21:50:35 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1763,9 +1763,8 @@ struct engine_configuration_s { offset 764 bit 28 */ bool alignEngineSnifferAtTDC : 1 {}; /** - * This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle. offset 764 bit 29 */ - bool useETBforIdleControl : 1 {}; + bool unused764b29 : 1 {}; /** offset 764 bit 30 */ bool idleIncrementalPidCic : 1 {}; @@ -5253,4 +5252,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22432); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 06 23:06:35 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Feb 12 21:50:35 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 d84ef7a2e7..e4e5a3963d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1045,7 +1045,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 1617363883 +#define SIGNATURE_HASH 3406102163 #define specs_s_size 12 #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 @@ -1321,7 +1321,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.02.12.kin.1617363883" +#define TS_SIGNATURE "rusEFI master.2023.02.12.kin.3406102163" #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 b6eea3904e..26a0c79a85 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 Mon Feb 06 23:06:37 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 Sun Feb 12 21:50:38 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1763,9 +1763,8 @@ struct engine_configuration_s { offset 764 bit 28 */ bool alignEngineSnifferAtTDC : 1 {}; /** - * This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle. offset 764 bit 29 */ - bool useETBforIdleControl : 1 {}; + bool unused764b29 : 1 {}; /** offset 764 bit 30 */ bool idleIncrementalPidCic : 1 {}; @@ -5253,4 +5252,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22432); // 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 Mon Feb 06 23:06:37 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 Sun Feb 12 21:50:38 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 26addc02bd..1e9cc924a6 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 @@ -995,7 +995,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2070803402 +#define SIGNATURE_HASH 3490582258 #define specs_s_size 12 #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 @@ -1272,7 +1272,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.02.12.subaru_eg33_f7.2070803402" +#define TS_SIGNATURE "rusEFI master.2023.02.12.subaru_eg33_f7.3490582258" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/engines/bmw_m73.cpp b/firmware/config/engines/bmw_m73.cpp index 099539a7df..d2a8b05b7e 100644 --- a/firmware/config/engines/bmw_m73.cpp +++ b/firmware/config/engines/bmw_m73.cpp @@ -279,7 +279,5 @@ void setEngineBMW_M73_Proteus() { // tps and pps setProteusHitachiEtbDefaults(); - - engineConfiguration->useETBforIdleControl = true; } #endif // HW_PROTEUS diff --git a/firmware/config/engines/gm_ls_4.cpp b/firmware/config/engines/gm_ls_4.cpp index 0709affb79..09a5949776 100644 --- a/firmware/config/engines/gm_ls_4.cpp +++ b/firmware/config/engines/gm_ls_4.cpp @@ -24,7 +24,6 @@ void setGmLs4() { engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3; engineConfiguration->specs.displacement = 6.2; - engineConfiguration->useETBforIdleControl = true; engineConfiguration->etbIdleThrottleRange = 15; engineConfiguration->tChargeAirIncrLimit = 5; diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index ef1c6c67bf..eb64736960 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -631,7 +631,6 @@ static void setMiataNB2_MRE_common() { void setMiataNB2_MRE_ETB() { setMiataNB2_MRE_common(); - engineConfiguration->useETBforIdleControl = true; engineConfiguration->throttlePedalUpVoltage = 1; // WAT? that's an interesting value, how come it's above 5v? engineConfiguration->throttlePedalWOTVoltage = 5.47; diff --git a/firmware/config/engines/vw_b6.cpp b/firmware/config/engines/vw_b6.cpp index 348841bc72..94e5984475 100644 --- a/firmware/config/engines/vw_b6.cpp +++ b/firmware/config/engines/vw_b6.cpp @@ -127,7 +127,6 @@ static void commonPassatB6() { engineConfiguration->idle.solenoidPin = Gpio::Unassigned; engineConfiguration->fanPin = Gpio::Unassigned; - engineConfiguration->useETBforIdleControl = true; engineConfiguration->injectionMode = IM_SEQUENTIAL; engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL; } diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index ec9ec33875..03a6e82986 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -306,11 +306,7 @@ expected EtbController::getSetpointEtb() { float rpm = Sensor::getOrZero(SensorType::Rpm); etbCurrentTarget = m_pedalMap->getValue(rpm, sanitizedPedal); - percent_t etbIdlePosition = clampF( - 0, - engineConfiguration->useETBforIdleControl ? m_idlePosition : 0, - 100 - ); + percent_t etbIdlePosition = clampF(0, m_idlePosition, 100); percent_t etbIdleAddition = PERCENT_DIV * engineConfiguration->etbIdleThrottleRange * etbIdlePosition; // Interpolate so that the idle adder just "compresses" the throttle's range upward. @@ -1122,11 +1118,6 @@ void initElectronicThrottle() { } void setEtbIdlePosition(percent_t pos) { - if (!Sensor::hasSensor(SensorType::AcceleratorPedal)) { - firmwareError(CUSTOM_NO_ETB_FOR_IDLE, "ETB idle does not work with unhappy accelerator pedal."); - return; - } - for (int i = 0; i < ETB_COUNT; i++) { if (auto etb = engine->etbControllers[i]) { etb->setIdlePosition(pos); diff --git a/firmware/controllers/actuators/idle_hardware.cpp b/firmware/controllers/actuators/idle_hardware.cpp index 2c838b888a..cf07213e4e 100644 --- a/firmware/controllers/actuators/idle_hardware.cpp +++ b/firmware/controllers/actuators/idle_hardware.cpp @@ -34,12 +34,16 @@ void applyIACposition(percent_t position) { */ float duty = PERCENT_TO_DUTY(position); - if (engineConfiguration->useETBforIdleControl) { #if EFI_ELECTRONIC_THROTTLE_BODY - setEtbIdlePosition(position); + setEtbIdlePosition(position); #endif // EFI_ELECTRONIC_THROTTLE_BODY + +#if EFI_UNIT_TEST + if (false) { +#endif // EFI_UNIT_TEST + #if ! EFI_UNIT_TEST - } else if (engineConfiguration->useStepperIdle) { + if (engineConfiguration->useStepperIdle) { iacMotor.setTargetPosition(duty * engineConfiguration->idleStepperTotalSteps); #endif /* EFI_UNIT_TEST */ } else { @@ -76,7 +80,6 @@ bool isIdleHardwareRestartNeeded() { isConfigurationChanged(idle.stepperStepPin) || isConfigurationChanged(idle.solenoidFrequency) || isConfigurationChanged(useStepperIdle) || - isConfigurationChanged(useETBforIdleControl) || isConfigurationChanged(idle.solenoidPin) || isConfigurationChanged(secondSolenoidPin) || isConfigurationChanged(useRawOutputToDriveIdleStepper) || @@ -138,9 +141,7 @@ void initIdleHardware() { } iacMotor.initialize(hw, engineConfiguration->idleStepperTotalSteps); - } else if (engineConfiguration->useETBforIdleControl || !isBrainPinValid(engineConfiguration->idle.solenoidPin)) { - // here we do nothing for ETB idle and for no idle - } else { + } else if (isBrainPinValid(engineConfiguration->idle.solenoidPin)) { // we are here for single or double solenoid idle /** diff --git a/firmware/controllers/date_stamp.h b/firmware/controllers/date_stamp.h index 8753a44125..06963d1e3e 100644 --- a/firmware/controllers/date_stamp.h +++ b/firmware/controllers/date_stamp.h @@ -1,2 +1,2 @@ #pragma once -#define VCS_DATE 20230212 +#define VCS_DATE 20230213 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index d65799c336..0d77947575 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:19 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:36 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1763,9 +1763,8 @@ struct engine_configuration_s { offset 764 bit 28 */ bool alignEngineSnifferAtTDC : 1 {}; /** - * This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle. offset 764 bit 29 */ - bool useETBforIdleControl : 1 {}; + bool unused764b29 : 1 {}; /** offset 764 bit 30 */ bool idleIncrementalPidCic : 1 {}; @@ -5253,4 +5252,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22432); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:19 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:36 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 8e6ab42f0b..2d5db2c7c2 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1045,7 +1045,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 1627373505 +#define SIGNATURE_HASH 3416015609 #define specs_s_size 12 #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 @@ -1321,7 +1321,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.02.12.f407-discovery.1627373505" +#define TS_SIGNATURE "rusEFI master.2023.02.12.f407-discovery.3416015609" #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 dc7cedf640..43f63a8f65 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 2817860103 -#define TS_SIGNATURE "rusEFI master.2023.02.12.48way.2817860103" +#define SIGNATURE_HASH 211214143 +#define TS_SIGNATURE "rusEFI master.2023.02.12.48way.211214143" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 7ab140aea0..27147a6e6c 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 1417722068 -#define TS_SIGNATURE "rusEFI master.2023.02.12.alphax-2chan.1417722068" +#define SIGNATURE_HASH 4293084652 +#define TS_SIGNATURE "rusEFI master.2023.02.12.alphax-2chan.4293084652" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 0934d9b5da..70ba237c38 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 4158199010 -#define TS_SIGNATURE "rusEFI master.2023.02.12.alphax-4chan.4158199010" +#define SIGNATURE_HASH 1555753434 +#define TS_SIGNATURE "rusEFI master.2023.02.12.alphax-4chan.1555753434" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 67781559f8..5e63d16e9e 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 2731343427 -#define TS_SIGNATURE "rusEFI master.2023.02.12.alphax-8chan.2731343427" +#define SIGNATURE_HASH 162464635 +#define TS_SIGNATURE "rusEFI master.2023.02.12.alphax-8chan.162464635" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index b68d3671fc..cef65fe886 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 343561280 -#define TS_SIGNATURE "rusEFI master.2023.02.12.atlas.343561280" +#define SIGNATURE_HASH 3206130040 +#define TS_SIGNATURE "rusEFI master.2023.02.12.atlas.3206130040" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 6ea6bf6a40..59f5c6af68 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 3674777355 -#define TS_SIGNATURE "rusEFI master.2023.02.12.core8.3674777355" +#define SIGNATURE_HASH 1886083635 +#define TS_SIGNATURE "rusEFI master.2023.02.12.core8.1886083635" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 9aa4bfb3eb..52d02423f2 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 145793383 -#define TS_SIGNATURE "rusEFI master.2023.02.12.cypress.145793383" +#define SIGNATURE_HASH 2748537951 +#define TS_SIGNATURE "rusEFI master.2023.02.12.cypress.2748537951" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index b12222faf2..72aa5b0a84 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 1627373505 -#define TS_SIGNATURE "rusEFI master.2023.02.12.f407-discovery.1627373505" +#define SIGNATURE_HASH 3416015609 +#define TS_SIGNATURE "rusEFI master.2023.02.12.f407-discovery.3416015609" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 083ba3e122..3b3d6229b6 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 145793383 -#define TS_SIGNATURE "rusEFI master.2023.02.12.f429-discovery.145793383" +#define SIGNATURE_HASH 2748537951 +#define TS_SIGNATURE "rusEFI master.2023.02.12.f429-discovery.2748537951" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index f072e007a9..c29e4e7351 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 719471021 -#define TS_SIGNATURE "rusEFI master.2023.02.12.frankenso_na6.719471021" +#define SIGNATURE_HASH 2172763285 +#define TS_SIGNATURE "rusEFI master.2023.02.12.frankenso_na6.2172763285" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index ac35b88b96..29c7f3ef8e 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 800658479 -#define TS_SIGNATURE "rusEFI master.2023.02.12.harley81.800658479" +#define SIGNATURE_HASH 2228939031 +#define TS_SIGNATURE "rusEFI master.2023.02.12.harley81.2228939031" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index bc2c4694e6..1eba29d054 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 2009652192 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen-gm-e67.2009652192" +#define SIGNATURE_HASH 3702204120 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen-gm-e67.3702204120" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 4e2db4fed7..9c1a90abfb 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 3527418325 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen-honda-k.3527418325" +#define SIGNATURE_HASH 2032393453 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen-honda-k.2032393453" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 84aba382cb..6dcada622e 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 3797365222 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen-nb1.3797365222" +#define SIGNATURE_HASH 1228197086 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen-nb1.1228197086" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 6d51cb87ff..aa69a92b78 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 3059164154 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen121nissan.3059164154" +#define SIGNATURE_HASH 490004162 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen121nissan.490004162" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 28e07ebbfb..c7156bf460 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 2266290215 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen121vag.2266290215" +#define SIGNATURE_HASH 746005791 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen121vag.746005791" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 510af48a77..7d5c1ff8da 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 2928100124 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen128.2928100124" +#define SIGNATURE_HASH 98876964 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen128.98876964" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index fa688010a2..1828a1558c 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 4205451246 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen154hyundai.4205451246" +#define SIGNATURE_HASH 1372187350 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen154hyundai.1372187350" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 198aefa1cd..f6bba26c05 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 2610337714 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen72.2610337714" +#define SIGNATURE_HASH 821389962 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen72.821389962" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 98e96e7c38..91259437e4 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 1316962874 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen81.1316962874" +#define SIGNATURE_HASH 3843866370 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen81.3843866370" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index c823ee1366..e9e651df69 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 441812918 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen88bmw.441812918" +#define SIGNATURE_HASH 2973137550 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellen88bmw.2973137550" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index a23d57197b..ddfcb7bf08 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 1628576447 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellenNA6.1628576447" +#define SIGNATURE_HASH 3396462471 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellenNA6.3396462471" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 880a7af291..4b4733e86e 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 163813760 -#define TS_SIGNATURE "rusEFI master.2023.02.12.hellenNA8_96.163813760" +#define SIGNATURE_HASH 2728420536 +#define TS_SIGNATURE "rusEFI master.2023.02.12.hellenNA8_96.2728420536" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index ee16bd3325..df39997f7e 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 1617363883 -#define TS_SIGNATURE "rusEFI master.2023.02.12.kin.1617363883" +#define SIGNATURE_HASH 3406102163 +#define TS_SIGNATURE "rusEFI master.2023.02.12.kin.3406102163" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index e36b692133..0d034d8673 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 3611196508 -#define TS_SIGNATURE "rusEFI master.2023.02.12.m74_9.3611196508" +#define SIGNATURE_HASH 2086502756 +#define TS_SIGNATURE "rusEFI master.2023.02.12.m74_9.2086502756" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5aa99315c5..58ded6cce3 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 1940277862 -#define TS_SIGNATURE "rusEFI master.2023.02.12.mre_f4.1940277862" +#define SIGNATURE_HASH 3636836190 +#define TS_SIGNATURE "rusEFI master.2023.02.12.mre_f4.3636836190" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 9796dead6b..645d7b9a58 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 1940277862 -#define TS_SIGNATURE "rusEFI master.2023.02.12.mre_f7.1940277862" +#define SIGNATURE_HASH 3636836190 +#define TS_SIGNATURE "rusEFI master.2023.02.12.mre_f7.3636836190" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index b2b035b433..33cf3fc63c 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 1482324097 -#define TS_SIGNATURE "rusEFI master.2023.02.12.prometheus_405.1482324097" +#define SIGNATURE_HASH 4080633273 +#define TS_SIGNATURE "rusEFI master.2023.02.12.prometheus_405.4080633273" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 51dafa2537..c2f1fdbd73 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 1482324097 -#define TS_SIGNATURE "rusEFI master.2023.02.12.prometheus_469.1482324097" +#define SIGNATURE_HASH 4080633273 +#define TS_SIGNATURE "rusEFI master.2023.02.12.prometheus_469.4080633273" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index fa6467e898..4344e8a281 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 645347472 -#define TS_SIGNATURE "rusEFI master.2023.02.12.proteus_f4.645347472" +#define SIGNATURE_HASH 2366948776 +#define TS_SIGNATURE "rusEFI master.2023.02.12.proteus_f4.2366948776" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 01f22019ef..20a85f6a8b 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 645347472 -#define TS_SIGNATURE "rusEFI master.2023.02.12.proteus_f7.645347472" +#define SIGNATURE_HASH 2366948776 +#define TS_SIGNATURE "rusEFI master.2023.02.12.proteus_f7.2366948776" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index c78b9b9714..857477bd68 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 645347472 -#define TS_SIGNATURE "rusEFI master.2023.02.12.proteus_h7.645347472" +#define SIGNATURE_HASH 2366948776 +#define TS_SIGNATURE "rusEFI master.2023.02.12.proteus_h7.2366948776" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 7127c707e6..ac85b2d5fb 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 2974779209 -#define TS_SIGNATURE "rusEFI master.2023.02.12.s105.2974779209" +#define SIGNATURE_HASH 439122545 +#define TS_SIGNATURE "rusEFI master.2023.02.12.s105.439122545" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index da36e2f520..072f8fb48d 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 2070803402 -#define TS_SIGNATURE "rusEFI master.2023.02.12.subaru_eg33_f7.2070803402" +#define SIGNATURE_HASH 3490582258 +#define TS_SIGNATURE "rusEFI master.2023.02.12.subaru_eg33_f7.3490582258" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 8cd6cf328e..971273d807 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 2183040325 -#define TS_SIGNATURE "rusEFI master.2023.02.12.tdg-pdm8.2183040325" +#define SIGNATURE_HASH 696086653 +#define TS_SIGNATURE "rusEFI master.2023.02.12.tdg-pdm8.696086653" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index ead2480a80..063b392902 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -317,8 +317,6 @@ float getConfigValueByName(const char *name) { return engineConfiguration->pauseEtbControl; case 1836072195: return engineConfiguration->alignEngineSnifferAtTDC; - case -1854539309: - return engineConfiguration->useETBforIdleControl; case 1064399425: return engineConfiguration->idleIncrementalPidCic; case 259909218: @@ -1835,11 +1833,6 @@ void setConfigValueByName(const char *name, float value) { { engineConfiguration->alignEngineSnifferAtTDC = (int)value; return; - } - case -1854539309: - { - engineConfiguration->useETBforIdleControl = (int)value; - return; } case 1064399425: { diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md index 4d2c39c48a..c2b3ab0011 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -469,9 +469,6 @@ Disable the electronic throttle motor and DC idle motor for testing.\nThis mode ### alignEngineSnifferAtTDC -### useETBforIdleControl -This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle. - ### idleIncrementalPidCic diff --git a/firmware/docs/rusEFI_custom_chibios.md b/firmware/docs/rusEFI_custom_chibios.md index 46e213052c..ba91498e17 100644 --- a/firmware/docs/rusEFI_custom_chibios.md +++ b/firmware/docs/rusEFI_custom_chibios.md @@ -1,10 +1,12 @@ rusEFI is trying to use latest stable ChibiOS with minimal changes -At the moment rusEFI uses https://github.com/rusefi/ChibiOS/tree/stable_18.2.rusefi +At the moment rusEFI uses https://github.com/rusefi/ChibiOS/tree/stable_20.3.x.rusefi rusEFI custom version of ChibiOS has the following changes: -# TODO this document has to be reviewed, seems to NOT be up to date with 18 patch +*) LSE auto-detection/fallback, RUSEFI_STM32_LSE_WAIT_MAX/RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL + +# TODO items below this line need to be reviewed, seems to NOT be up to date with 20.3 patch *) minor OS monitoring and maintainability fixes: chDbgStackOverflowPanic allows to know which thread has stack overflow @@ -12,8 +14,6 @@ rusEFI custom version of ChibiOS has the following changes: *) MMC timeout waitCounter -*) LSE auto-detection, see rusefi_lse_fix.h see LSE_TIMEOUT - *) Support for half/timeout-ISR for UART-DMA in /os/hal/include/uart.h and os/hal/ports/STM32/LLD/USARTv1/uart_lld.* by andreika Weird changes without an explanation: @@ -28,6 +28,5 @@ Weird changes without an explanation: New files: os/common/startup/SIMIA32/compilers/GCC/rules.mk - os/hal/ports/STM32/LLD/RTCv2/rusefi_lse_fix.h os/hal/ports/simulator/posix/* - \ No newline at end of file + diff --git a/firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h b/firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h index 11e71adc4c..ec4882b799 100644 --- a/firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h +++ b/firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h @@ -37,6 +37,10 @@ #define STM32F407_MCUCONF #define STM32F417_MCUCONF +// Allows LSE init to timeout and configure fallback RTC clock source in case +#define RUSEFI_STM32_LSE_WAIT_MAX 1000000 +#define RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL STM32_RTCSEL_LSI + /* * HAL driver system settings. */ @@ -47,11 +51,8 @@ #ifndef STM32_HSE_ENABLED #define STM32_HSE_ENABLED TRUE #endif - -// rusEfi would automatically detect if we have 32768 quartz osc -// todo: apply LSE patch -#define STM32_LSE_ENABLED FALSE - +// see RUSEFI_STM32_LSE_WAIT_MAX +#define STM32_LSE_ENABLED TRUE #define STM32_CLOCK48_REQUIRED TRUE #define STM32_SW STM32_SW_PLL #define STM32_PLLSRC STM32_PLLSRC_HSI @@ -62,11 +63,8 @@ #define STM32_HPRE STM32_HPRE_DIV1 #define STM32_PPRE1 STM32_PPRE1_DIV4 #define STM32_PPRE2 STM32_PPRE2_DIV2 -#if STM32_LSE_ENABLED - #define STM32_RTCSEL STM32_RTCSEL_LSE -#else - #define STM32_RTCSEL STM32_RTCSEL_LSI -#endif +// see RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL +#define STM32_RTCSEL STM32_RTCSEL_LSE #ifndef STM32_RTCPRE_VALUE #define STM32_RTCPRE_VALUE 8 #endif diff --git a/firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h b/firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h index 6a4b5c1b15..006e045344 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h +++ b/firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h @@ -59,6 +59,10 @@ #define STM32F7xx_MCUCONF +// Allows LSE init to timeout and configure fallback RTC clock source in case +#define RUSEFI_STM32_LSE_WAIT_MAX 1000000 +#define RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL STM32_RTCSEL_LSI + /* * HAL driver system settings. */ @@ -69,7 +73,8 @@ #define STM32_HSI_ENABLED TRUE #define STM32_LSI_ENABLED TRUE #define STM32_HSE_ENABLED TRUE -#define STM32_LSE_ENABLED FALSE +// see RUSEFI_STM32_LSE_WAIT_MAX +#define STM32_LSE_ENABLED TRUE #define STM32_CLOCK48_REQUIRED TRUE #define STM32_SW STM32_SW_PLL #define STM32_PLLSRC STM32_PLLSRC_HSI @@ -80,11 +85,8 @@ #define STM32_HPRE STM32_HPRE_DIV1 #define STM32_PPRE1 STM32_PPRE1_DIV4 #define STM32_PPRE2 STM32_PPRE2_DIV2 -#if STM32_LSE_ENABLED - #define STM32_RTCSEL STM32_RTCSEL_LSE -#else - #define STM32_RTCSEL STM32_RTCSEL_LSI -#endif +// see RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL +#define STM32_RTCSEL STM32_RTCSEL_LSE #define STM32_RTCPRE_VALUE 8 #define STM32_MCO1SEL STM32_MCO1SEL_HSI #define STM32_MCO1PRE STM32_MCO1PRE_DIV1 diff --git a/firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h b/firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h index 988edf88d9..b81f5ac2dc 100644 --- a/firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h +++ b/firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h @@ -40,6 +40,10 @@ #define STM32H747_MCUCONF #define STM32H757_MCUCONF +// Allows LSE init to timeout and configure fallback RTC clock source in case +#define RUSEFI_STM32_LSE_WAIT_MAX 1000000 +#define RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL STM32_RTCSEL_LSI_CK + /* * General settings. */ @@ -74,7 +78,8 @@ #define STM32_CSI_ENABLED TRUE #define STM32_HSI48_ENABLED TRUE #define STM32_HSE_ENABLED TRUE -#define STM32_LSE_ENABLED FALSE +// see RUSEFI_STM32_LSE_WAIT_MAX +#define STM32_LSE_ENABLED TRUE #define STM32_HSIDIV STM32_HSIDIV_DIV1 /* @@ -123,7 +128,8 @@ * Reading STM32 Reference Manual is required. */ #define STM32_SW STM32_SW_PLL1_P_CK -#define STM32_RTCSEL STM32_RTCSEL_LSI_CK +// see RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL +#define STM32_RTCSEL STM32_RTCSEL_LSE_CK #define STM32_D1CPRE STM32_D1CPRE_DIV1 #define STM32_D1HPRE STM32_D1HPRE_DIV2 #define STM32_D1PPRE3 STM32_D1PPRE3_DIV2 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 7c7bc28210..71a6e381be 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -782,7 +782,7 @@ bit is_enabled_spi_2 bit is_enabled_spi_4 bit pauseEtbControl;Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle. bit alignEngineSnifferAtTDC - bit useETBforIdleControl;This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle. + bit unused764b29; bit idleIncrementalPidCic bit enableAemXSeries;AEM X-Series or rusEFI Wideband ! 'enableAemXSeries' is the 32nd bit here, you would need another bit region if more bits are desired diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 573c449afd..7ba95c4a25 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.f407-discovery.1627373505" + signature = "rusEFI master.2023.02.12.f407-discovery.3416015609" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.f407-discovery.1627373505" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.f407-discovery.3416015609" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:58 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:34 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6839,8 +6837,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7708,7 +7705,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7915,9 +7911,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 86347f11b1..1a0e023955 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.48way.2817860103" + signature = "rusEFI master.2023.02.12.48way.211214143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.48way.2817860103" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.48way.211214143" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:42 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:12 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",72="Camshaft Input (E6)",47="CrankShaft Input (C13)" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6834,8 +6832,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7701,7 +7698,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7905,9 +7901,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 0f7fb352fb..26a85a4aab 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.alphax-2chan.1417722068" + signature = "rusEFI master.2023.02.12.alphax-2chan.4293084652" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.alphax-2chan.1417722068" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.alphax-2chan.4293084652" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:19 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:39 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",8="C7 - CAM Hall/Digital" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6819,8 +6817,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7680,7 +7677,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7875,9 +7871,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 7cc69d43a0..011c7b09e8 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.alphax-4chan.4158199010" + signature = "rusEFI master.2023.02.12.alphax-4chan.1555753434" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.alphax-4chan.4158199010" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.alphax-4chan.1555753434" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:20 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:41 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",80="C2 - Crank- (hall)",19="C2/C3 Crank Sensor VR",78="C3 - Crank+ (hall)",8="C7 - CAM Hall/Digital",91="E5/E6 Cam Sensor VR",81="E6 - Cam+ (hall)",9="E7 - Flex" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7684,7 +7681,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7879,9 +7875,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 37f280213f..a15280e941 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.alphax-8chan.2731343427" + signature = "rusEFI master.2023.02.12.alphax-8chan.162464635" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.alphax-8chan.2731343427" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.alphax-8chan.162464635" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:21 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:43 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",8="23A - Hall Input 1",80="30A - Hall Input 2",81="31A - Hall Input 3",12="8A - Crank VR",91="9A - Cam VR" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7684,7 +7681,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7879,9 +7875,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 2ce6a815ef..f26fa013b1 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.atlas.343561280" + signature = "rusEFI master.2023.02.12.atlas.3206130040" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.atlas.343561280" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.atlas.3206130040" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:56 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:30 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6830,8 +6828,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7698,7 +7695,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7904,9 +7900,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index b6a8cee0cd..74958bc0ac 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.core8.3674777355" + signature = "rusEFI master.2023.02.12.core8.1886083635" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.core8.3674777355" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.core8.1886083635" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:41 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:10 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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)" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6834,8 +6832,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7701,7 +7698,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7905,9 +7901,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 9b5486e8d3..b1c68dc5aa 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.cypress.145793383" + signature = "rusEFI master.2023.02.12.cypress.2748537951" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.cypress.145793383" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.cypress.2748537951" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:17 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Feb 12 21:50:36 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6838,8 +6836,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7706,7 +7703,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7913,9 +7909,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 9bdc24e023..3df0182ad0 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.f407-discovery.1627373505" + signature = "rusEFI master.2023.02.12.f407-discovery.3416015609" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.f407-discovery.1627373505" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.f407-discovery.3416015609" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:53 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:27 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6839,8 +6837,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7708,7 +7705,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7915,9 +7911,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 50dc185b6e..d9e28e3e3a 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.f429-discovery.145793383" + signature = "rusEFI master.2023.02.12.f429-discovery.2748537951" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.f429-discovery.145793383" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.f429-discovery.2748537951" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:54 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:29 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6838,8 +6836,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7706,7 +7703,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7913,9 +7909,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 0474ef585c..e0ece9b4e6 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.frankenso_na6.719471021" + signature = "rusEFI master.2023.02.12.frankenso_na6.2172763285" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.frankenso_na6.719471021" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.frankenso_na6.2172763285" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:46 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:17 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6838,8 +6836,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7706,7 +7703,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7913,9 +7909,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 28dfd53eb8..76acaba881 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.harley81.800658479" + signature = "rusEFI master.2023.02.12.harley81.2228939031" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.harley81.800658479" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.harley81.2228939031" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:23 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:45 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",88="11 Crank VR-",93="51 - VSS" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6820,8 +6818,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7681,7 +7678,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7877,9 +7873,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index c31534f99b..d073675833 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen-gm-e67.2009652192" + signature = "rusEFI master.2023.02.12.hellen-gm-e67.3702204120" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen-gm-e67.2009652192" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen-gm-e67.3702204120" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:35 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:02 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",88="C2-59 - Cam",86="C2-63 - Crank" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7682,7 +7679,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7877,9 +7873,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 93dfa1abab..b17e658117 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen-honda-k.3527418325" + signature = "rusEFI master.2023.02.12.hellen-honda-k.2032393453" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen-honda-k.3527418325" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen-honda-k.2032393453" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:28 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:51 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",93="A18 - VSS",78="A25 VTT CAM",8="A26 Cam Sync",19="A7 Crankshaft Sensor" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6820,8 +6818,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7678,7 +7675,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7875,9 +7871,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 0013b3f787..da0d4d66f8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen-nb1.3797365222" + signature = "rusEFI master.2023.02.12.hellen-nb1.1228197086" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen-nb1.3797365222" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen-nb1.1228197086" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:34 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:00 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",93="2D - VSS",8="2H - CAM",19="2J - CRANK",78="4B - DIGITAL/FLEX" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7682,7 +7679,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7878,9 +7874,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 2e457407c8..d67370cc41 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen121nissan.3059164154" + signature = "rusEFI master.2023.02.12.hellen121nissan.490004162" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen121nissan.3059164154" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen121nissan.490004162" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:26 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:50 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",19="13 - Crank",8="14 - Cam Left",9="33 - Cam Right" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6820,8 +6818,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7678,7 +7675,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7876,9 +7872,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 11b6d064f8..71847afa36 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen121vag.2266290215" + signature = "rusEFI master.2023.02.12.hellen121vag.746005791" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen121vag.2266290215" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen121vag.746005791" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:25 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:48 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",93="54 - VSS",19="82 - VR",8="86 - CAM1",9="87 - CAM2" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7681,7 +7678,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7881,9 +7877,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 9a43626de8..6064ebee2c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen128.2928100124" + signature = "rusEFI master.2023.02.12.hellen128.98876964" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen128.2928100124" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen128.98876964" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:24 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:46 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6820,8 +6818,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7678,7 +7675,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7876,9 +7872,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index e4da976f05..ccce55ae60 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen154hyundai.4205451246" + signature = "rusEFI master.2023.02.12.hellen154hyundai.1372187350" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen154hyundai.4205451246" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen154hyundai.1372187350" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:29 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:53 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6820,8 +6818,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7678,7 +7675,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7875,9 +7871,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 4b60a415ac..500b6894c4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen72.2610337714" + signature = "rusEFI master.2023.02.12.hellen72.821389962" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen72.2610337714" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen72.821389962" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:31 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:56 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7682,7 +7679,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7878,9 +7874,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 5fe7da88e2..0eee16e2a6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen81.1316962874" + signature = "rusEFI master.2023.02.12.hellen81.3843866370" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen81.1316962874" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen81.3843866370" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:32 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:58 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6821,8 +6819,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7679,7 +7676,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7874,9 +7870,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 09e7c5f20a..e7778df7cc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellen88bmw.441812918" + signature = "rusEFI master.2023.02.12.hellen88bmw.2973137550" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellen88bmw.441812918" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellen88bmw.2973137550" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:30 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:50:55 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",19="16 - CRANK",8="17 - CAM" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6820,8 +6818,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7677,7 +7674,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7872,9 +7868,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index b1b3779bf7..76fa8e6d08 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellenNA6.1628576447" + signature = "rusEFI master.2023.02.12.hellenNA6.3396462471" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellenNA6.1628576447" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellenNA6.3396462471" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:36 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:03 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",93="1M - VSS",85="2L - Flex Fuel",19="3E - CRANK",8="3G - CAM" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7682,7 +7679,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7879,9 +7875,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 7828a16b7c..aeabccfd11 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.hellenNA8_96.163813760" + signature = "rusEFI master.2023.02.12.hellenNA8_96.2728420536" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.hellenNA8_96.163813760" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.hellenNA8_96.2728420536" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:37 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:05 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",93="1M - VSS",19="3F - CRANK",8="3G - CAM",78="4B - DIGITAL/FLEX" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7682,7 +7679,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7877,9 +7873,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index be2688ca3b..ac92b9e2c6 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.kin.1617363883" + signature = "rusEFI master.2023.02.12.kin.3406102163" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.kin.1617363883" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.kin.3406102163" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:16 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Feb 12 21:50:35 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6839,8 +6837,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7707,7 +7704,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7914,9 +7910,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 87fa230149..486f9a6a8b 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.m74_9.3611196508" + signature = "rusEFI master.2023.02.12.m74_9.2086502756" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.m74_9.3611196508" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.m74_9.2086502756" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:43 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:14 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7684,7 +7681,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7879,9 +7875,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 82601f770d..8821701cd7 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.mre_f4.1940277862" + signature = "rusEFI master.2023.02.12.mre_f4.3636836190" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.mre_f4.1940277862" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.mre_f4.3636836190" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:40 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:09 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6822,8 +6820,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7680,7 +7677,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7883,9 +7879,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 090b00645c..b580fa4bd0 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.mre_f7.1940277862" + signature = "rusEFI master.2023.02.12.mre_f7.3636836190" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.mre_f7.1940277862" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.mre_f7.3636836190" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:39 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:07 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6822,8 +6820,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7680,7 +7677,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7883,9 +7879,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 0df5ed8dbe..943446463d 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.prometheus_405.1482324097" + signature = "rusEFI master.2023.02.12.prometheus_405.4080633273" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.prometheus_405.1482324097" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.prometheus_405.4080633273" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:48 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:20 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6832,8 +6830,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7700,7 +7697,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7907,9 +7903,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 93565e02fc..0ea3fe39d1 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.prometheus_469.1482324097" + signature = "rusEFI master.2023.02.12.prometheus_469.4080633273" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.prometheus_469.1482324097" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.prometheus_469.4080633273" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:47 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:18 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6832,8 +6830,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7700,7 +7697,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7907,9 +7903,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index c53bfc99de..b9d8e2141c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.proteus_f4.645347472" + signature = "rusEFI master.2023.02.12.proteus_f4.2366948776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.proteus_f4.645347472" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.proteus_f4.2366948776" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:51 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:23 UTC 2023 pageSize = 26432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 26422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6814,8 +6812,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7669,7 +7666,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7875,9 +7871,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index b2b934eedc..24ab206ca0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.proteus_f7.645347472" + signature = "rusEFI master.2023.02.12.proteus_f7.2366948776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.proteus_f7.645347472" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.proteus_f7.2366948776" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:49 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:22 UTC 2023 pageSize = 26432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 26422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6814,8 +6812,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7669,7 +7666,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7875,9 +7871,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 961e1c14a2..13768f6489 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.proteus_h7.645347472" + signature = "rusEFI master.2023.02.12.proteus_h7.2366948776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.proteus_h7.645347472" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.proteus_h7.2366948776" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:52 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:25 UTC 2023 pageSize = 26432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 26422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6814,8 +6812,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7669,7 +7666,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7875,9 +7871,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 04daf0e850..1654fecb77 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.s105.2974779209" + signature = "rusEFI master.2023.02.12.s105.439122545" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.s105.2974779209" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.s105.439122545" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:45 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:15 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",28="15 - Crank Sensor+",21="59 - Speed in",29="na 79 - CAM in" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6823,8 +6821,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7684,7 +7681,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7879,9 +7875,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index e3e91659e7..6f73fbd1b1 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.subaru_eg33_f7.2070803402" + signature = "rusEFI master.2023.02.12.subaru_eg33_f7.3490582258" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.subaru_eg33_f7.2070803402" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.subaru_eg33_f7.3490582258" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:18 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 Sun Feb 12 21:50:38 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [0:7], 0="NONE",126="A07 - Cam VR+",124="A08 - Crank 1 VR+",75="A08 - Crank 2 VR+",64="B11 - Speed Din" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6832,8 +6830,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7695,7 +7692,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7897,9 +7893,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 065266b99c..ae40a2a0bb 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.12.tdg-pdm8.2183040325" + signature = "rusEFI master.2023.02.12.tdg-pdm8.696086653" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.12.tdg-pdm8.2183040325" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.12.tdg-pdm8.696086653" ; 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 @@ -86,7 +86,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 Sun Feb 12 04:06:57 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:32 UTC 2023 pageSize = 22432 page = 1 @@ -373,7 +373,7 @@ disableEtbWhenEngineStopped = bits, U32, 764, [25:25], "false", "true" is_enabled_spi_4 = bits, U32, 764, [26:26], "false", "true" pauseEtbControl = bits, U32, 764, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 764, [28:28], "false", "true" -useETBforIdleControl = bits, U32, 764, [29:29], "false", "true" +unused764b29 = bits, U32, 764, [29:29], "false", "true" idleIncrementalPidCic = bits, U32, 764, [30:30], "false", "true" enableAemXSeries = bits, U32, 764, [31:31], "false", "true" logicAnalyzerPins1 = bits, U16, 768, [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" @@ -1616,7 +1616,6 @@ veBlends4_blendValues = array, U08, 22422, [8], "%", 0.5, 0, 0, 100, 1 useIacTableForCoasting = "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." disableEtbWhenEngineStopped = "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." pauseEtbControl = "Disable the electronic throttle motor and DC idle motor for testing.\nThis mode is for testing ETB/DC idle position sensors, etc without actually driving the throttle." - useETBforIdleControl = "This setting allows the ETB to act as the idle air control valve and move to regulate the airflow at idle." enableAemXSeries = "AEM X-Series or rusEFI Wideband" logicAnalyzerPins1 = "logicAnalyzerPins 1" logicAnalyzerPins2 = "logicAnalyzerPins 2" @@ -3032,7 +3031,6 @@ esr = scalar, U16, 1312, "", 1, 0 maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == 13 ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -6838,8 +6836,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != 0 } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -7706,7 +7703,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -7913,9 +7909,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 07e15fa9d0..453aab86d6 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -280,7 +280,6 @@ enable2ndByteCanID = false maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == @@TsCalMode_PedalMax@@ ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == @@TsCalMode_PedalMax@@ ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } - requiresPowerCycle = useETBforIdleControl requiresPowerCycle = warningLedPin requiresPowerCycle = runningLedPin requiresPowerCycle = binarySerialTxPin @@ -3141,8 +3140,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle - field = "Use electronic throttle for idle", useETBforIdleControl, { useETBforIdleControl == 1 || throttlePedalPositionAdcChannel != @@ADC_CHANNEL_NONE@@ } - field = "Electronic throttle idle range", etbIdleThrottleRange, { useETBforIdleControl == 1 } + field = "Electronic throttle idle range", etbIdleThrottleRange panel = idleHwType dialog = idlePidSettings, "Closed Loop Idle" @@ -4011,7 +4009,6 @@ dialog = tcuControls, "Transmission Settings" field = "iTermMax", etb_iTermMax dialog = etbIdleDialog, "ETB Idle" - field = "use ETB for idle", useETBforIdleControl field = "ETB idle maximum angle", etbIdleThrottleRange dialog = etbDialogLeft @@ -4250,9 +4247,9 @@ dialog = tcuControls, "Transmission Settings" field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Idle Air Add", ALSIdleAdd, {useETBforIdleControl != 1 && antiLagEnabled == 1} - field = "ETB Air Add", ALSEtbAdd, {useETBforIdleControl == 1 && antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Idle Air Add", ALSIdleAdd, {antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {antiLagEnabled == 1} field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} panel = FuelAdderTableALS panel = IgnRetardTableALS diff --git a/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java b/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java index 063fc83add..c04ebbf6ed 100644 --- a/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java +++ b/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java @@ -73,7 +73,7 @@ public class JniUnitTest { System.out.println("engineLogic.invokeEtbCycle"); engineLogic.invokeEtbCycle(); - assertEquals(120.36, getValue(engineLogic.getOutputs(), Sensor.etb1DutyCycle)); + assertEquals(120.38, getValue(engineLogic.getOutputs(), Sensor.etb1DutyCycle)); } private double getField(EngineLogic engineLogic, Field field) { 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 513ba7b25d..7a398877e5 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 04:07:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Feb 12 21:51:36 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -993,7 +993,6 @@ public class Fields { public static final int sensor_chart_e_SC_RPM_ACCEL = 3; public static final int sensor_chart_e_SC_TRIGGER = 1; public static final int SENT_INPUT_COUNT = 1; - public static final int SIGNATURE_HASH = 1627373505; public static final int specs_s_size = 12; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; @@ -1203,7 +1202,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.02.12.f407-discovery.1627373505"; + public static final String TS_SIGNATURE = "rusEFI master.2023.02.12.f407-discovery.3416015609"; 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 = 1316; @@ -1581,7 +1580,6 @@ public class Fields { public static final Field IS_ENABLED_SPI_4 = Field.create("IS_ENABLED_SPI_4", 764, FieldType.BIT, 26).setBaseOffset(0); public static final Field PAUSEETBCONTROL = Field.create("PAUSEETBCONTROL", 764, FieldType.BIT, 27).setBaseOffset(0); public static final Field ALIGNENGINESNIFFERATTDC = Field.create("ALIGNENGINESNIFFERATTDC", 764, FieldType.BIT, 28).setBaseOffset(0); - public static final Field USEETBFORIDLECONTROL = Field.create("USEETBFORIDLECONTROL", 764, FieldType.BIT, 29).setBaseOffset(0); public static final Field IDLEINCREMENTALPIDCIC = Field.create("IDLEINCREMENTALPIDCIC", 764, FieldType.BIT, 30).setBaseOffset(0); public static final Field ENABLEAEMXSERIES = Field.create("ENABLEAEMXSERIES", 764, FieldType.BIT, 31).setBaseOffset(0); public static final Field LOGICANALYZERPINS1 = Field.create("LOGICANALYZERPINS1", 768, FieldType.INT16, brain_input_pin_e).setScale(1.0).setBaseOffset(0); @@ -3038,7 +3036,6 @@ public class Fields { IS_ENABLED_SPI_4, PAUSEETBCONTROL, ALIGNENGINESNIFFERATTDC, - USEETBFORIDLECONTROL, IDLEINCREMENTALPIDCIC, ENABLEAEMXSERIES, LOGICANALYZERPINS1, diff --git a/unit_tests/tests/actuators/test_etb.cpp b/unit_tests/tests/actuators/test_etb.cpp index 494cc00413..4b8c42264e 100644 --- a/unit_tests/tests/actuators/test_etb.cpp +++ b/unit_tests/tests/actuators/test_etb.cpp @@ -242,7 +242,6 @@ TEST(etb, idlePlumbing) { StrictMock mocks[ETB_COUNT]; EngineTestHelper eth(TEST_ENGINE); - engineConfiguration->useETBforIdleControl = true; Sensor::setMockValue(SensorType::AcceleratorPedal, 50.0f, true); @@ -258,9 +257,6 @@ TEST(etb, idlePlumbing) { TEST(etb, testSetpointOnlyPedal) { EngineTestHelper eth(TEST_ENGINE); - // Don't use ETB for idle, we aren't testing that yet - just pedal table for now - engineConfiguration->useETBforIdleControl = false; - EtbController etb; // Mock pedal map that's just passthru pedal -> target @@ -300,13 +296,6 @@ TEST(etb, testSetpointOnlyPedal) { Sensor::setMockValue(SensorType::AcceleratorPedal, 105, true); EXPECT_EQ(100, etb.getSetpoint().value_or(-1)); - // Check that ETB idle does NOT work - it's disabled - etb.setIdlePosition(50); - Sensor::setMockValue(SensorType::AcceleratorPedal, 0, true); - EXPECT_EQ(1, etb.getSetpoint().value_or(-1)); - Sensor::setMockValue(SensorType::AcceleratorPedal, 20, true); - EXPECT_EQ(20, etb.getSetpoint().value_or(-1)); - // Test invalid pedal position - should give 0 position Sensor::resetMockValue(SensorType::AcceleratorPedal); EXPECT_EQ(1, etb.getSetpoint().value_or(-1)); @@ -327,10 +316,6 @@ TEST(etb, testSetpointOnlyPedal) { TEST(etb, setpointSecondThrottleTrim) { EngineTestHelper eth(TEST_ENGINE); - // Don't use ETB for idle, we aren't testing that yet - just pedal table for now - engineConfiguration->useETBforIdleControl = false; - - // Mock pedal map that's just passthru pedal -> target StrictMock pedalMap; EXPECT_CALL(pedalMap, getValue(_, _)) @@ -359,7 +344,6 @@ TEST(etb, setpointIdle) { EngineTestHelper eth(TEST_ENGINE); // Use ETB for idle, but don't give it any range (yet) - engineConfiguration->useETBforIdleControl = true; engineConfiguration->etbIdleThrottleRange = 0; // Must have TPS & PPS initialized for ETB setup diff --git a/unit_tests/tests/actuators/test_etb_integrated.cpp b/unit_tests/tests/actuators/test_etb_integrated.cpp index e1ba581255..324ea9c3a1 100644 --- a/unit_tests/tests/actuators/test_etb_integrated.cpp +++ b/unit_tests/tests/actuators/test_etb_integrated.cpp @@ -18,6 +18,8 @@ static EtbController * initEtbIntegratedTest() { initTps(); doInitElectronicThrottle(); + engine->etbControllers[0]->setIdlePosition(0); + return (EtbController*)engine->etbControllers[0]; }