From 2b657e607e7c7c4bbc0d72cffb52d18ee4271d3f Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 27 May 2019 10:38:06 -0400 Subject: [PATCH] EFI_IDLE_INCREMENTAL_PID_CIC should be a runtime parameter #806 --- .../algo/engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 5 +++-- firmware/tunerstudio/rusefi.input | 1 + java_console/models/src/com/rusefi/config/Fields.java | 6 +++--- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 3400e41457..263fa87765 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 integration\rusefi_config.txt Sun May 26 20:52:16 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 07:56:59 EDT 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -763,7 +763,7 @@ typedef struct { bool useETBforIdleControl : 1; /** offset 144 bit 30 */ - bool unused_board_984_30 : 1; + bool idleIncrementalPidCic : 1; /** offset 144 bit 31 */ bool unused_board_984_31 : 1; @@ -2752,4 +2752,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sun May 26 20:52:16 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 07:56:59 EDT 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 572cb37dc1..7f341cab56 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1024,6 +1024,8 @@ #define idleAdvance_offset_hex 19b0 #define idleAdvanceBins_offset 6544 #define idleAdvanceBins_offset_hex 1990 +#define idleIncrementalPidCic_offset 744 +#define idleIncrementalPidCic_offset_hex 2e8 #define idleMode_offset 1472 #define idleMode_offset_hex 5c0 #define idlePidActivationTime_offset 2612 @@ -1772,8 +1774,6 @@ #define unused_bit_1472_29_offset_hex 5b8 #define unused_bit_1472_30_offset 1464 #define unused_bit_1472_30_offset_hex 5b8 -#define unused_board_984_30_offset 744 -#define unused_board_984_30_offset_hex 2e8 #define unused_board_984_31_offset 744 #define unused_board_984_31_offset_hex 2e8 #define unusedAlignMaf_offset 557 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 9ca34aaf22..512f7d06e2 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -607,7 +607,7 @@ bit is_enabled_spi_2 bit pauseEtbControl bit alignEngineSnifferAtTDC bit useETBforIdleControl - bit unused_board_984_30 + bit idleIncrementalPidCic bit unused_board_984_31 brain_input_pin_e[LOGIC_ANALYZER_CHANNEL_COUNT iterate] logicAnalyzerPins; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 83a72168fd..cef12849ce 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 06:54:36 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 07:56:59 EDT 2019 pageSize = 20000 page = 1 @@ -349,7 +349,7 @@ page = 1 pauseEtbControl = bits, U32, 744, [27:27], "false", "true" alignEngineSnifferAtTDC = bits, U32, 744, [28:28], "false", "true" useETBforIdleControl = bits, U32, 744, [29:29], "false", "true" - unused_board_984_30 = bits, U32, 744, [30:30], "false", "true" + idleIncrementalPidCic = bits, U32, 744, [30:30], "false", "true" unused_board_984_31 = bits, U32, 744, [31:31], "false", "true" logicAnalyzerPins1 = bits, U08, 748, [0:6], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID" logicAnalyzerPins2 = bits, U08, 749, [0:6], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID" @@ -2794,6 +2794,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle field = "Use separate VE Table for idle", useSeparateVeForIdle field = "Use separate IAC Table For Coasting", useIacTableForCoasting, {idleMode == 0} + field = idleIncrementalPidCic, idleIncrementalPidCic field = "TPS deactivation threshold", idlePidDeactivationTpsThreshold panel = idlePidSettings, { idleMode == 0} field = "Extra IAC if Throttle Pressed", iacByTpsTaper; diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 1ea89af209..8be31c0774 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1860,6 +1860,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Use separate Ignition Table for idle", useSeparateAdvanceForIdle field = "Use separate VE Table for idle", useSeparateVeForIdle field = "Use separate IAC Table For Coasting", useIacTableForCoasting, {idleMode == 0} + field = idleIncrementalPidCic, idleIncrementalPidCic field = "TPS deactivation threshold", idlePidDeactivationTpsThreshold panel = idlePidSettings, { idleMode == 0} field = "Extra IAC if Throttle Pressed", iacByTpsTaper; diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 52ec3cd5a5..59ce80af76 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 integration\rusefi_config.txt Mon May 27 06:54:36 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 07:56:59 EDT 2019 public class Fields { public static final int accelerometerSpiDevice_offset = 2736; public static final int acCutoffHighRpm_offset = 1498; @@ -676,6 +676,7 @@ public class Fields { public static final int idleAdvance_offset = 6576; public static final int idleAdvanceBins_offset = 6544; public static final int idleAdvanceBins_offset_hex = 1990; + public static final int idleIncrementalPidCic_offset = 744; public static final int idleMode_offset = 1472; public static final int idlePidActivationTime_offset = 2612; public static final int idlePidDeactivationTpsThreshold_offset = 816; @@ -1140,7 +1141,6 @@ public class Fields { public static final int unused_1484_bit_21_offset = 1476; public static final int unused_bit_1472_29_offset = 1464; public static final int unused_bit_1472_30_offset = 1464; - public static final int unused_board_984_30_offset = 744; public static final int unused_board_984_31_offset = 744; public static final int unusedAlignMaf_offset = 557; public static final int unusedAnotherOne_offset = 744; @@ -1503,7 +1503,7 @@ public class Fields { public static final Field PAUSEETBCONTROL = Field.create("PAUSEETBCONTROL", 744, FieldType.BIT, 27); public static final Field ALIGNENGINESNIFFERATTDC = Field.create("ALIGNENGINESNIFFERATTDC", 744, FieldType.BIT, 28); public static final Field USEETBFORIDLECONTROL = Field.create("USEETBFORIDLECONTROL", 744, FieldType.BIT, 29); - public static final Field UNUSED_BOARD_984_30 = Field.create("UNUSED_BOARD_984_30", 744, FieldType.BIT, 30); + public static final Field IDLEINCREMENTALPIDCIC = Field.create("IDLEINCREMENTALPIDCIC", 744, FieldType.BIT, 30); public static final Field UNUSED_BOARD_984_31 = Field.create("UNUSED_BOARD_984_31", 744, FieldType.BIT, 31); public static final Field LOGICANALYZERPINS1 = Field.create("LOGICANALYZERPINS1", 748, FieldType.INT8, brain_input_pin_e); public static final Field LOGICANALYZERPINS2 = Field.create("LOGICANALYZERPINS2", 749, FieldType.INT8, brain_input_pin_e);