From c1c1e5900684d44ffbd7380f411ffa37030813cc Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 4 Sep 2019 00:19:44 -0400 Subject: [PATCH] Hall mode for TLE88888 - VRSConfig1 VRSM #915 TS settings typo --- .../generated/engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/generated/rusefi_generated.h | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 6 +++--- firmware/tunerstudio/rusefi.input | 2 +- firmware/tunerstudio/rusefi_frankenso.ini | 5 +++-- firmware/tunerstudio/rusefi_microrusefi.ini | 6 +++--- firmware/tunerstudio/rusefi_prometheus.ini | 5 +++-- .../models/src/com/rusefi/config/generated/Fields.java | 8 ++++---- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 50ac141c06..c385d7d89c 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 Tue Sep 03 23:55:35 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 04 00:19:03 EDT 2019 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1089,7 +1089,7 @@ struct engine_configuration_s { bool cj125isUrDivided : 1; /** offset 76 bit 16 */ - bool useTLE888_hall_mode : 1; + bool useTLE8888_hall_mode : 1; /** offset 76 bit 17 */ bool issue_294_17 : 1; @@ -2821,4 +2821,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 Tue Sep 03 23:55:35 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 04 00:19:03 EDT 2019 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index f04001e044..387d7e22aa 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1947,8 +1947,8 @@ #define useSerialPort_offset_hex 2e8 #define useStepperIdle_offset 744 #define useStepperIdle_offset_hex 2e8 -#define useTLE888_hall_mode_offset 76 -#define useTLE888_hall_mode_offset_hex 4c +#define useTLE8888_hall_mode_offset 76 +#define useTLE8888_hall_mode_offset_hex 4c #define useTpicAdvancedMode_offset 744 #define useTpicAdvancedMode_offset_hex 2e8 #define useTPSAdvanceTable_offset 1476 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c2813213f6..16ec8a4e82 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -298,7 +298,7 @@ bit etb1_use_two_wires; bit etb2_use_two_wires; bit showSdCardWarning; bit cj125isUrDivided;looks like 3v range should be enough, divider not needed -bit useTLE888_hall_mode; +bit useTLE8888_hall_mode; bit issue_294_17; bit issue_294_18; bit issue_294_19; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index f7033b3dd6..13cb9a983f 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -82,7 +82,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 Tue Sep 03 23:55:35 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 04 00:19:03 EDT 2019 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - useTLE888_hall_mode = bits, U32, 76, [16:16], "false", "true" + useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" issue_294_17 = bits, U32, 76, [17:17], "false", "true" issue_294_18 = bits, U32, 76, [18:18], "false", "true" issue_294_19 = bits, U32, 76, [19:19], "false", "true" @@ -3162,7 +3162,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tle8888, "TLE8888", yAxis field = "TLE8888 Chip Select", tle8888_cs field = "TLE8888 SPI", tle8888spiDevice - field = "useTLE888_hall_mode", useTLE888_hall_mode + field = "useTLE8888_hall_mode", useTLE8888_hall_mode dialog = connection, "", yAxis field = "STM32 vRef voltage", adcVcc diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 988eed3040..edf260acb4 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2182,7 +2182,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tle8888, "TLE8888", yAxis field = "TLE8888 Chip Select", tle8888_cs field = "TLE8888 SPI", tle8888spiDevice - field = "useTLE888_hall_mode", useTLE888_hall_mode + field = "useTLE8888_hall_mode", useTLE8888_hall_mode dialog = connection, "", yAxis field = "STM32 vRef voltage", adcVcc diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index e3f691f42d..1442f463a9 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -82,7 +82,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 Tue Sep 03 18:36:14 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 04 00:19:08 EDT 2019 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_16 = bits, U32, 76, [16:16], "false", "true" + useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" issue_294_17 = bits, U32, 76, [17:17], "false", "true" issue_294_18 = bits, U32, 76, [18:18], "false", "true" issue_294_19 = bits, U32, 76, [19:19], "false", "true" @@ -3162,6 +3162,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tle8888, "TLE8888", yAxis field = "TLE8888 Chip Select", tle8888_cs field = "TLE8888 SPI", tle8888spiDevice + field = "useTLE8888_hall_mode", useTLE8888_hall_mode dialog = connection, "", yAxis field = "STM32 vRef voltage", adcVcc diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 3e573a3d14..daf604f1bc 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -82,7 +82,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 Tue Sep 03 23:55:49 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 04 00:19:06 EDT 2019 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - useTLE888_hall_mode = bits, U32, 76, [16:16], "false", "true" + useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" issue_294_17 = bits, U32, 76, [17:17], "false", "true" issue_294_18 = bits, U32, 76, [18:18], "false", "true" issue_294_19 = bits, U32, 76, [19:19], "false", "true" @@ -3147,7 +3147,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tle8888, "TLE8888", yAxis field = "TLE8888 Chip Select", tle8888_cs field = "TLE8888 SPI", tle8888spiDevice - field = "useTLE888_hall_mode", useTLE888_hall_mode + field = "useTLE8888_hall_mode", useTLE8888_hall_mode dialog = connection, "", yAxis field = "STM32 vRef voltage", adcVcc diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 1867f783df..260850218d 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -82,7 +82,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 Tue Sep 03 18:36:17 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 04 00:19:11 EDT 2019 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 etb2_use_two_wires = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_16 = bits, U32, 76, [16:16], "false", "true" + useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" issue_294_17 = bits, U32, 76, [17:17], "false", "true" issue_294_18 = bits, U32, 76, [18:18], "false", "true" issue_294_19 = bits, U32, 76, [19:19], "false", "true" @@ -3158,6 +3158,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tle8888, "TLE8888", yAxis field = "TLE8888 Chip Select", tle8888_cs field = "TLE8888 SPI", tle8888spiDevice + field = "useTLE8888_hall_mode", useTLE8888_hall_mode dialog = connection, "", yAxis field = "STM32 vRef voltage", adcVcc 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 f72777ac6b..2d41931fcd 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 Tue Sep 03 23:55:35 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 04 00:19:03 EDT 2019 // by class com.rusefi.output.JavaFieldsConsumer import com.rusefi.config.*; @@ -1256,7 +1256,7 @@ public class Fields { public static final int useSeparateVeForIdle_offset = 1476; public static final int useSerialPort_offset = 744; public static final int useStepperIdle_offset = 744; - public static final int useTLE888_hall_mode_offset = 76; + public static final int useTLE8888_hall_mode_offset = 76; public static final int useTpicAdvancedMode_offset = 744; public static final int useTPSAdvanceTable_offset = 1476; public static final int useTPSBasedVeTable_offset = 744; @@ -1305,7 +1305,7 @@ public class Fields { public static final Field ETB2_USE_TWO_WIRES = Field.create("ETB2_USE_TWO_WIRES", 76, FieldType.BIT, 13); public static final Field SHOWSDCARDWARNING = Field.create("SHOWSDCARDWARNING", 76, FieldType.BIT, 14); public static final Field CJ125ISURDIVIDED = Field.create("CJ125ISURDIVIDED", 76, FieldType.BIT, 15); - public static final Field USETLE888_HALL_MODE = Field.create("USETLE888_HALL_MODE", 76, FieldType.BIT, 16); + public static final Field USETLE8888_HALL_MODE = Field.create("USETLE8888_HALL_MODE", 76, FieldType.BIT, 16); public static final Field ISSUE_294_17 = Field.create("ISSUE_294_17", 76, FieldType.BIT, 17); public static final Field ISSUE_294_18 = Field.create("ISSUE_294_18", 76, FieldType.BIT, 18); public static final Field ISSUE_294_19 = Field.create("ISSUE_294_19", 76, FieldType.BIT, 19); @@ -2089,7 +2089,7 @@ public class Fields { ETB2_USE_TWO_WIRES, SHOWSDCARDWARNING, CJ125ISURDIVIDED, - USETLE888_HALL_MODE, + USETLE8888_HALL_MODE, ISSUE_294_17, ISSUE_294_18, ISSUE_294_19,