diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index a344e9f31e..68c087f2ef 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 Sat May 27 23:14:55 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:31:01 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -652,7 +652,11 @@ typedef struct { /** * offset 580 */ - int unusedHere; + int16_t idlePidDeactivationTpsThreshold; + /** + * offset 582 + */ + int16_t unusedHere; /** * offset 584 */ @@ -2125,4 +2129,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:14:55 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:31:01 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 565c7be251..f2bc98cccf 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -681,8 +681,10 @@ #define alternatorPidMin_offset_hex 4b0 #define alternatorPidMax_offset 1202 #define alternatorPidMax_offset_hex 4b2 -#define unusedHere_offset 1204 -#define unusedHere_offset_hex 4b4 +#define idlePidDeactivationTpsThreshold_offset 1204 +#define idlePidDeactivationTpsThreshold_offset_hex 4b4 +#define unusedHere_offset 1206 +#define unusedHere_offset_hex 4b6 #define nb2ratioFrom_offset 1208 #define nb2ratioFrom_offset_hex 4b8 #define nb2ratioTo_offset 1212 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 08f6d6fc2a..c76a73cc91 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -526,7 +526,8 @@ custom uart_device_e 4 bits,U32, @OFFSET@, [0:1], "Off", "UART1", "UART2", "UA uart_device_e consoleUartDevice; int16_t alternatorPidMin;;"v", 1, 0, 0, 3000.0, 3 int16_t alternatorPidMax;;"v", 1, 0, 0, 3000.0, 3 - int unusedHere; + int16_t idlePidDeactivationTpsThreshold;;"%", 1, 0, 0, 100.0, 0 + int16_t unusedHere; float nb2ratioFrom;;"value", 1, 0, 0, 1000, 5 float nb2ratioTo;;"value", 1, 0, 0, 1000, 5 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 3a52721062..1df0c4ff7b 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,7 +45,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 Sat May 27 23:14:55 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:31:01 EDT 2017 pageSize = 16376 page = 1 @@ -346,7 +346,8 @@ page = 1 consoleUartDevice = bits,U32, 1196, [0:1], "Off", "UART1", "UART2", "UART3" alternatorPidMin = scalar, S16, 1200, "v", 1, 0, 0, 3000.0, 3 alternatorPidMax = scalar, S16, 1202, "v", 1, 0, 0, 3000.0, 3 -;skipping unusedHere offset 1204 + idlePidDeactivationTpsThreshold = scalar, S16, 1204, "%", 1, 0, 0, 100.0, 0 +;skipping unusedHere offset 1206 nb2ratioFrom = scalar, F32, 1208, "value", 1, 0, 0, 1000, 5 nb2ratioTo = scalar, F32, 1212, "value", 1, 0, 0, 1000, 5 triggerErrorPin = bits, U32, 1216, [0:6], "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", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1966,6 +1967,9 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "idle I", idleRpmPid_iFactor, { idleMode == 0} field = "idle D", idleRpmPid_dFactor, { idleMode == 0} field = "idle offset", idleRpmPid_offset, { idleMode == 0} + field = "pid min", idleValvePidMin, { idleMode == 0} + field = "pid max", idleValvePidMax, { idleMode == 0} + field = "pid TPS deactivation", idlePidDeactivationTpsThreshold, { idleMode == 0} field = "verbose", isVerboseIAC slider = "Manual Idle Position", manIdlePosition, horizontal field = "" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 5d239a7e8e..d92b33320e 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1221,6 +1221,9 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "idle I", idleRpmPid_iFactor, { idleMode == 0} field = "idle D", idleRpmPid_dFactor, { idleMode == 0} field = "idle offset", idleRpmPid_offset, { idleMode == 0} + field = "pid min", idleValvePidMin, { idleMode == 0} + field = "pid max", idleValvePidMax, { idleMode == 0} + field = "pid TPS deactivation", idlePidDeactivationTpsThreshold, { idleMode == 0} field = "verbose", isVerboseIAC slider = "Manual Idle Position", manIdlePosition, horizontal field = "" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index e0b90f38ee..504174c2f8 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:14:55 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:31:01 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -512,7 +512,8 @@ public class Fields { public static final int consoleUartDevice_offset = 1196; public static final int alternatorPidMin_offset = 1200; public static final int alternatorPidMax_offset = 1202; - public static final int unusedHere_offset = 1204; + public static final int idlePidDeactivationTpsThreshold_offset = 1204; + public static final int unusedHere_offset = 1206; public static final int nb2ratioFrom_offset = 1208; public static final int nb2ratioTo_offset = 1212; public static final int triggerErrorPin_offset = 1216; @@ -1364,7 +1365,8 @@ public class Fields { public static final Field CONSOLEUARTDEVICE = Field.create("CONSOLEUARTDEVICE", 1196, FieldType.INT); public static final Field ALTERNATORPIDMIN = Field.create("ALTERNATORPIDMIN", 1200, FieldType.INT); public static final Field ALTERNATORPIDMAX = Field.create("ALTERNATORPIDMAX", 1202, FieldType.INT); - public static final Field UNUSEDHERE = Field.create("UNUSEDHERE", 1204, FieldType.INT); + public static final Field IDLEPIDDEACTIVATIONTPSTHRESHOLD = Field.create("IDLEPIDDEACTIVATIONTPSTHRESHOLD", 1204, FieldType.INT); + public static final Field UNUSEDHERE = Field.create("UNUSEDHERE", 1206, FieldType.INT); public static final Field NB2RATIOFROM = Field.create("NB2RATIOFROM", 1208, FieldType.FLOAT); public static final Field NB2RATIOTO = Field.create("NB2RATIOTO", 1212, FieldType.FLOAT); public static final Field TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 1216, FieldType.INT, brain_pin_e);