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 b17c617612..5c2f953207 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 kineris_gen_config.bat integration/rusefi_config.txt Sun May 10 01:32:43 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun May 10 10:09:06 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -762,12 +762,14 @@ struct engine_configuration_s { */ int16_t tpsMax; /** - * TPS error detection, what TPS % value is unrealistically low + * TPS error detection: what throttle % is unrealistically low? + * Also used for accelerator pedal error detection if so equiped. * offset 84 */ int16_t tpsErrorDetectionTooLow; /** - * TPS error detection, what TPS % value is unrealistically high + * TPS error detection: what throttle % is unrealistically high? + * Also used for accelerator pedal error detection if so equiped. * offset 86 */ int16_t tpsErrorDetectionTooHigh; @@ -1561,7 +1563,11 @@ struct engine_configuration_s { /** * offset 820 */ - float unusedAntilagTimeout; + uint16_t tps1SecondaryMin; + /** + * offset 822 + */ + uint16_t tps1SecondaryMax; /** * offset 824 */ @@ -1799,10 +1805,10 @@ struct engine_configuration_s { bool unusedBit_251_29 : 1; /** offset 976 bit 30 */ - bool unusedBit_282_30 : 1; + bool unusedBit_283_30 : 1; /** offset 976 bit 31 */ - bool unusedBit_282_31 : 1; + bool unusedBit_283_31 : 1; /** * offset 980 */ @@ -1915,7 +1921,15 @@ struct engine_configuration_s { /** * offset 1192 */ - int unusedAtOldBoardConfigurationEnd[68]; + int unusedAtOldBoardConfigurationEnd[67]; + /** + * offset 1460 + */ + uint16_t tps2SecondaryMin; + /** + * offset 1462 + */ + uint16_t tps2SecondaryMax; /** offset 1464 bit 0 */ bool unusedHereWeHave : 1; @@ -3455,4 +3469,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun May 10 01:32:43 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun May 10 10:09:06 EDT 2020 diff --git a/firmware/controllers/algo/launch_control.cpp b/firmware/controllers/algo/launch_control.cpp index 3d3921807d..75cdbc8608 100644 --- a/firmware/controllers/algo/launch_control.cpp +++ b/firmware/controllers/algo/launch_control.cpp @@ -135,7 +135,6 @@ void setDefaultLaunchParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->enableLaunchRetard = true; engineConfiguration->enableLaunchBoost = true; engineConfiguration->launchSmoothRetard = true; //interpolates the advance linear from launchrpm to fully retarded at launchtimingrpmrange - engineConfiguration->unusedAntilagTimeout = 3; engineConfiguration->antiLagRpmTreshold = 3000; } diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index fdcc29b47b..733e12c7f8 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.bat integration\rusefi_config.txt Sun May 10 01:32:34 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 10:08:58 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -762,12 +762,14 @@ struct engine_configuration_s { */ int16_t tpsMax; /** - * TPS error detection, what TPS % value is unrealistically low + * TPS error detection: what throttle % is unrealistically low? + * Also used for accelerator pedal error detection if so equiped. * offset 84 */ int16_t tpsErrorDetectionTooLow; /** - * TPS error detection, what TPS % value is unrealistically high + * TPS error detection: what throttle % is unrealistically high? + * Also used for accelerator pedal error detection if so equiped. * offset 86 */ int16_t tpsErrorDetectionTooHigh; @@ -1561,7 +1563,11 @@ struct engine_configuration_s { /** * offset 820 */ - float unusedAntilagTimeout; + uint16_t tps1SecondaryMin; + /** + * offset 822 + */ + uint16_t tps1SecondaryMax; /** * offset 824 */ @@ -1799,10 +1805,10 @@ struct engine_configuration_s { bool unusedBit_251_29 : 1; /** offset 976 bit 30 */ - bool unusedBit_282_30 : 1; + bool unusedBit_283_30 : 1; /** offset 976 bit 31 */ - bool unusedBit_282_31 : 1; + bool unusedBit_283_31 : 1; /** * offset 980 */ @@ -1915,7 +1921,15 @@ struct engine_configuration_s { /** * offset 1192 */ - int unusedAtOldBoardConfigurationEnd[68]; + int unusedAtOldBoardConfigurationEnd[67]; + /** + * offset 1460 + */ + uint16_t tps2SecondaryMin; + /** + * offset 1462 + */ + uint16_t tps2SecondaryMax; /** offset 1464 bit 0 */ bool unusedHereWeHave : 1; @@ -3455,4 +3469,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 01:32:34 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 10 10:08:58 EDT 2020 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 124368bab4..8f7bcae5ca 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -411,8 +411,8 @@ bit issue_294_31,si_example,nada_example; int16_t tpsMin;Closed throttle. todo: extract these two fields into a structure\nSee also tps1_1AdcChannel\nset tps_min X;"ADC", 1, 0, 0, 1023, 0 int16_t tpsMax;Full throttle. tpsMax value as 10 bit ADC value. Not Voltage!\nSee also tps1_1AdcChannel\nset tps_max X;"ADC", 1, 0, 0, 1023, 0 -int16_t tpsErrorDetectionTooLow;+TPS error detection, what TPS % value is unrealistically low;"%", 1, 0, -40, 200, 0 -int16_t tpsErrorDetectionTooHigh;+TPS error detection, what TPS % value is unrealistically high;"%", 1, 0, -40, 200, 0 +int16_t tpsErrorDetectionTooLow;+TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped.;"%", 1, 0, -10, 0, 0 +int16_t tpsErrorDetectionTooHigh;+TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped.;"%", 1, 0, 100, 110, 0 cranking_parameters_s cranking float primingSquirtDurationMs;;"*C", 1, 0, -40, 200, 1 @@ -748,7 +748,8 @@ custom uart_device_e 1 bits,U32, @OFFSET@, [0:7], "Off", "UART1", "UART2", "UA int mapMinBufferLength;;"count", 1, 0, 0, 24, 0 int16_t idlePidDeactivationTpsThreshold;;"%", 1, 0, 0, 100.0, 0 int16_t stepperParkingExtraSteps;;"%", 1, 0, 0, 3000.0, 0 - float unusedAntilagTimeout; + uint16_t tps1SecondaryMin;;"ADC", 1, 0, 0, 1000, 0 + uint16_t tps1SecondaryMax;;"ADC", 1, 0, 0, 1000, 0 int16_t antiLagRpmTreshold; int16_t startCrankingDuration;Maximum time to crank starter;"Seconds", 1, 0, 0, 30, 0 @@ -884,8 +885,11 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@ vehicle_info_t engineMake;+For example, BMW, GM or Chevrolet\nREQUIRED for rusEFI Online vehicle_info_t engineCode;+For example, LS1 or NB2\nREQUIRED for rusEFI Online vehicle_info_t vehicleName;+For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online - - int[68] unusedAtOldBoardConfigurationEnd; + + int[67] unusedAtOldBoardConfigurationEnd; + + uint16_t tps2SecondaryMin;;"ADC", 1, 0, 0, 1000, 0 + uint16_t tps2SecondaryMax;;"ADC", 1, 0, 0, 1000, 0 bit unusedHereWeHave bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling.