From d2bbc30133da2048ca53f7a7e59e015da7e00b05 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 8 Apr 2020 22:12:33 -0400 Subject: [PATCH] isCJ125Verbose --- .../algo/engine_configuration_generated_structures.h | 7 ++++--- .../kinetis/config/controllers/algo/rusefi_generated.h | 4 ++-- .../generated/engine_configuration_generated_structures.h | 7 ++++--- firmware/controllers/generated/rusefi_generated.h | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 4 ++-- firmware/tunerstudio/rusefi_frankenso.ini | 4 ++-- firmware/tunerstudio/rusefi_kinetis.ini | 4 ++-- firmware/tunerstudio/rusefi_microrusefi.ini | 4 ++-- firmware/tunerstudio/rusefi_prometheus.ini | 4 ++-- firmware/tunerstudio/rusefi_proteus.ini | 4 ++-- .../models/src/com/rusefi/config/generated/Fields.java | 8 ++++---- 12 files changed, 29 insertions(+), 27 deletions(-) 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 68dbdccca8..02ff9a00fb 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 integration/rusefi_config.txt Wed Apr 08 21:41:35 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Apr 08 21:53:44 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -550,8 +550,9 @@ struct engine_configuration_s { offset 76 bit 8 */ bool isVerboseAuxPid4 : 1; /** + * enable cj125verbose/disable cj125verbose offset 76 bit 9 */ - bool unused76b9 : 1; + bool isCJ125Verbose : 1; /** * Is your UA CJ125 output wired to MCU via resistor divider? offset 76 bit 10 */ @@ -3259,4 +3260,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Apr 08 21:41:35 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Apr 08 21:53:44 EDT 2020 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 bba1048b48..7b382da6fc 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1346,6 +1346,8 @@ #define isBoostControlEnabled_offset_hex 5c4 #define isCJ125Enabled_offset 744 #define isCJ125Enabled_offset_hex 2e8 +#define isCJ125Verbose_offset 76 +#define isCJ125Verbose_offset_hex 4c #define isCylinderCleanupEnabled_offset 1476 #define isCylinderCleanupEnabled_offset_hex 5c4 #define isDoubleSolenoidIdle_offset 76 @@ -2087,8 +2089,6 @@ #define unused1059_offset_hex f7c #define unused1234234_offset 2042 #define unused1234234_offset_hex 7fa -#define unused76b9_offset 76 -#define unused76b9_offset_hex 4c #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_24_offset_hex 5c4 #define unused_1484_bit_25_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 4ecff6024d..ef46429482 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 integration\rusefi_config.txt Wed Apr 08 21:41:20 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:53:29 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -550,8 +550,9 @@ struct engine_configuration_s { offset 76 bit 8 */ bool isVerboseAuxPid4 : 1; /** + * enable cj125verbose/disable cj125verbose offset 76 bit 9 */ - bool unused76b9 : 1; + bool isCJ125Verbose : 1; /** * Is your UA CJ125 output wired to MCU via resistor divider? offset 76 bit 10 */ @@ -3259,4 +3260,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:41:20 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:53:29 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 7b00404a2f..a10e5b50c1 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1346,6 +1346,8 @@ #define isBoostControlEnabled_offset_hex 5c4 #define isCJ125Enabled_offset 744 #define isCJ125Enabled_offset_hex 2e8 +#define isCJ125Verbose_offset 76 +#define isCJ125Verbose_offset_hex 4c #define isCylinderCleanupEnabled_offset 1476 #define isCylinderCleanupEnabled_offset_hex 5c4 #define isDoubleSolenoidIdle_offset 76 @@ -2087,8 +2089,6 @@ #define unused1059_offset_hex f7c #define unused1234234_offset 2042 #define unused1234234_offset_hex 7fa -#define unused76b9_offset 76 -#define unused76b9_offset_hex 4c #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_24_offset_hex 5c4 #define unused_1484_bit_25_offset 1476 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index d6ee8302ed..bcb0669bfb 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -324,7 +324,7 @@ bit activateAuxPid3; bit isVerboseAuxPid3; bit activateAuxPid4; bit isVerboseAuxPid4; -bit unused76b9; +bit isCJ125Verbose;enable cj125verbose/disable cj125verbose bit cj125isUaDivided;+Is your UA CJ125 output wired to MCU via resistor divider? bit cj125isLsu49; bit etb_use_two_wires;+TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode. diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 207cb864f0..9059adf87d 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:41:20 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:53:29 EDT 2020 pageSize = 20000 page = 1 @@ -104,7 +104,7 @@ page = 1 isVerboseAuxPid3 = bits, U32, 76, [6:6], "false", "true" activateAuxPid4 = bits, U32, 76, [7:7], "false", "true" isVerboseAuxPid4 = bits, U32, 76, [8:8], "false", "true" - unused76b9 = bits, U32, 76, [9:9], "false", "true" + isCJ125Verbose = bits, U32, 76, [9:9], "false", "true" cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index a4306534e6..50dfefc443 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:41:26 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:53:35 EDT 2020 pageSize = 20000 page = 1 @@ -104,7 +104,7 @@ page = 1 isVerboseAuxPid3 = bits, U32, 76, [6:6], "false", "true" activateAuxPid4 = bits, U32, 76, [7:7], "false", "true" isVerboseAuxPid4 = bits, U32, 76, [8:8], "false", "true" - unused76b9 = bits, U32, 76, [9:9], "false", "true" + isCJ125Verbose = bits, U32, 76, [9:9], "false", "true" cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 88392f2107..f10b50c1b9 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Apr 08 21:41:35 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Apr 08 21:53:44 EDT 2020 pageSize = 20000 page = 1 @@ -104,7 +104,7 @@ page = 1 isVerboseAuxPid3 = bits, U32, 76, [6:6], "false", "true" activateAuxPid4 = bits, U32, 76, [7:7], "false", "true" isVerboseAuxPid4 = bits, U32, 76, [8:8], "false", "true" - unused76b9 = bits, U32, 76, [9:9], "false", "true" + isCJ125Verbose = bits, U32, 76, [9:9], "false", "true" cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index e1bc02d77d..817fcd26c1 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:41:23 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:53:32 EDT 2020 pageSize = 20000 page = 1 @@ -104,7 +104,7 @@ page = 1 isVerboseAuxPid3 = bits, U32, 76, [6:6], "false", "true" activateAuxPid4 = bits, U32, 76, [7:7], "false", "true" isVerboseAuxPid4 = bits, U32, 76, [8:8], "false", "true" - unused76b9 = bits, U32, 76, [9:9], "false", "true" + isCJ125Verbose = bits, U32, 76, [9:9], "false", "true" cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index f16cabaf26..85db655704 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:41:29 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:53:38 EDT 2020 pageSize = 20000 page = 1 @@ -104,7 +104,7 @@ page = 1 isVerboseAuxPid3 = bits, U32, 76, [6:6], "false", "true" activateAuxPid4 = bits, U32, 76, [7:7], "false", "true" isVerboseAuxPid4 = bits, U32, 76, [8:8], "false", "true" - unused76b9 = bits, U32, 76, [9:9], "false", "true" + isCJ125Verbose = bits, U32, 76, [9:9], "false", "true" cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index bf0b00f44c..81c97af414 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:41:32 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:53:41 EDT 2020 pageSize = 20000 page = 1 @@ -104,7 +104,7 @@ page = 1 isVerboseAuxPid3 = bits, U32, 76, [6:6], "false", "true" activateAuxPid4 = bits, U32, 76, [7:7], "false", "true" isVerboseAuxPid4 = bits, U32, 76, [8:8], "false", "true" - unused76b9 = bits, U32, 76, [9:9], "false", "true" + isCJ125Verbose = bits, U32, 76, [9:9], "false", "true" cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 59452faf18..93259e62b5 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/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 integration\rusefi_config.txt Wed Apr 08 21:41:20 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Apr 08 21:53:29 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -898,6 +898,7 @@ public class Fields { public static final int isAlternatorControlEnabled_offset = 1464; public static final int isBoostControlEnabled_offset = 1476; public static final int isCJ125Enabled_offset = 744; + public static final int isCJ125Verbose_offset = 76; public static final int isCylinderCleanupEnabled_offset = 1476; public static final int isDoubleSolenoidIdle_offset = 76; public static final int isEngineChartEnabled_offset = 1464; @@ -1377,7 +1378,6 @@ public class Fields { public static final int uartConsoleSerialSpeed_offset = 2076; public static final int unused1059_offset = 3964; public static final int unused1234234_offset = 2042; - public static final int unused76b9_offset = 76; public static final int unused_1484_bit_24_offset = 1476; public static final int unused_1484_bit_25_offset = 1476; public static final int unused_1484_bit_26_offset = 1476; @@ -1509,7 +1509,7 @@ public class Fields { public static final Field ISVERBOSEAUXPID3 = Field.create("ISVERBOSEAUXPID3", 76, FieldType.BIT, 6); public static final Field ACTIVATEAUXPID4 = Field.create("ACTIVATEAUXPID4", 76, FieldType.BIT, 7); public static final Field ISVERBOSEAUXPID4 = Field.create("ISVERBOSEAUXPID4", 76, FieldType.BIT, 8); - public static final Field UNUSED76B9 = Field.create("UNUSED76B9", 76, FieldType.BIT, 9); + public static final Field ISCJ125VERBOSE = Field.create("ISCJ125VERBOSE", 76, FieldType.BIT, 9); public static final Field CJ125ISUADIVIDED = Field.create("CJ125ISUADIVIDED", 76, FieldType.BIT, 10); public static final Field CJ125ISLSU49 = Field.create("CJ125ISLSU49", 76, FieldType.BIT, 11); public static final Field ETB_USE_TWO_WIRES = Field.create("ETB_USE_TWO_WIRES", 76, FieldType.BIT, 12); @@ -2424,7 +2424,7 @@ public class Fields { ISVERBOSEAUXPID3, ACTIVATEAUXPID4, ISVERBOSEAUXPID4, - UNUSED76B9, + ISCJ125VERBOSE, CJ125ISUADIVIDED, CJ125ISLSU49, ETB_USE_TWO_WIRES,