From e3b4ba79df8125d5bfe677a4352b8f2d71fb988e Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 28 Mar 2019 22:48:12 -0400 Subject: [PATCH] sync --- .../engine_configuration_generated_structures.h | 16 +++++++++++----- firmware/controllers/algo/rusefi_generated.h | 14 ++++++++------ firmware/tunerstudio/rusefi.ini | 14 ++++++++++---- .../models/src/com/rusefi/config/Fields.java | 14 ++++++++------ 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 72563f023b..277681863a 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Mar 25 20:15:52 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Mar 28 22:47:39 EDT 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -2362,17 +2362,23 @@ typedef struct { */ int16_t idlePidFalloffDeltaRpm; /** + * A delay in cycles between fuel-enrich. portions * offset 4018 */ - int16_t unusedIdleTimingPid; + int16_t tpsAccelFractionPeriod; /** + * A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions * offset 4020 */ - spi_device_e tle8888spiDevice; + float tpsAccelFractionDivisor; /** * offset 4024 */ - int mainUnusedEnd[614]; + spi_device_e tle8888spiDevice; + /** + * offset 4028 + */ + int mainUnusedEnd[613]; /** total size 6480*/ } engine_configuration_s; @@ -2619,4 +2625,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Mar 25 20:15:52 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Mar 28 22:47:39 EDT 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 13d134799c..1b316090f5 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1684,12 +1684,14 @@ #define idleTimingPidDeadZone_offset_hex fae #define idlePidFalloffDeltaRpm_offset 4016 #define idlePidFalloffDeltaRpm_offset_hex fb0 -#define unusedIdleTimingPid_offset 4018 -#define unusedIdleTimingPid_offset_hex fb2 -#define tle8888spiDevice_offset 4020 -#define tle8888spiDevice_offset_hex fb4 -#define mainUnusedEnd_offset 4024 -#define mainUnusedEnd_offset_hex fb8 +#define tpsAccelFractionPeriod_offset 4018 +#define tpsAccelFractionPeriod_offset_hex fb2 +#define tpsAccelFractionDivisor_offset 4020 +#define tpsAccelFractionDivisor_offset_hex fb4 +#define tle8888spiDevice_offset 4024 +#define tle8888spiDevice_offset_hex fb8 +#define mainUnusedEnd_offset 4028 +#define mainUnusedEnd_offset_hex fbc #define cltCrankingCorrBins_offset 6480 #define cltCrankingCorrBins_offset_hex 1950 #define cltCrankingCorr_offset 6512 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 2e53c579f5..70d88d37b8 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -68,7 +68,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 26 12:23:02 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Mar 28 22:47:39 EDT 2019 pageSize = 20000 page = 1 @@ -845,9 +845,10 @@ page = 1 idleTimingPidWorkZone = scalar, S16, 4012, "RPM", 1, 0, 0, 1000, 0 idleTimingPidDeadZone = scalar, S16, 4014, "RPM", 1, 0, 0, 1000, 0 idlePidFalloffDeltaRpm = scalar, S16, 4016, "RPM", 1, 0, 0, 1000, 0 -;no TS info - skipping unusedIdleTimingPid offset 4018 - tle8888spiDevice = bits,U32, 4020, [0:1], "Off", "SPI1", "SPI2", "SPI3" -;no TS info - skipping mainUnusedEnd offset 4024 + tpsAccelFractionPeriod = scalar, S16, 4018, "cycles", 1, 0, 0, 500, 0 + tpsAccelFractionDivisor = scalar, F32, 4020, "coef", 1, 0, 0, 100, 2 + tle8888spiDevice = bits,U32, 4024, [0:1], "Off", "SPI1", "SPI2", "SPI3" +;no TS info - skipping mainUnusedEnd offset 4028 cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2 cltCrankingCorr = array, F32, 6512, [8], "%", 1, 0, 0.0, 500.0, 2 idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0.0, 18000, 2 @@ -974,6 +975,8 @@ page = 1 dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "IAC position during cranking" pidExtraForLowRpm = "Increases PID reaction for RPM