From 9c9dc05b10f95bb165218e3e6533ae50131167c1 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 11 Apr 2019 22:15:06 -0400 Subject: [PATCH] cleanup #4 --- firmware/config/boards/me7_pnp/board_configuration.cpp | 1 - .../config/boards/nucleo_f767/board_configuration.cpp | 1 - .../config/boards/prometheus/board_configuration.cpp | 1 - firmware/console/console_io.h | 2 +- firmware/controllers/algo/engine_configuration.cpp | 1 - .../algo/engine_configuration_generated_structures.h | 9 ++++----- firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/integration/rusefi_config.txt | 6 +++--- firmware/tunerstudio/rusefi.ini | 6 ++++-- firmware/tunerstudio/rusefi.input | 2 ++ java_console/models/src/com/rusefi/config/Fields.java | 6 +++--- 11 files changed, 19 insertions(+), 20 deletions(-) diff --git a/firmware/config/boards/me7_pnp/board_configuration.cpp b/firmware/config/boards/me7_pnp/board_configuration.cpp index e211c88b38..3c3a3e2137 100644 --- a/firmware/config/boards/me7_pnp/board_configuration.cpp +++ b/firmware/config/boards/me7_pnp/board_configuration.cpp @@ -40,7 +40,6 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->runningLedPin = GPIOB_0; //green LED engineConfiguration->warninigLedPin = GPIO_UNASSIGNED; - engineConfiguration->configResetPin = GPIO_UNASSIGNED; #if 0 engineConfiguration->vbattAdcChannel = EFI_ADC_13; engineConfiguration->adcVcc = ADC_VCC; diff --git a/firmware/config/boards/nucleo_f767/board_configuration.cpp b/firmware/config/boards/nucleo_f767/board_configuration.cpp index 0a9458851d..457dfe52b3 100644 --- a/firmware/config/boards/nucleo_f767/board_configuration.cpp +++ b/firmware/config/boards/nucleo_f767/board_configuration.cpp @@ -45,7 +45,6 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->runningLedPin = GPIOB_0; //green LED engineConfiguration->warninigLedPin = GPIO_UNASSIGNED; - engineConfiguration->configResetPin = GPIO_UNASSIGNED; #if 0 engineConfiguration->vbattAdcChannel = EFI_ADC_13; engineConfiguration->adcVcc = ADC_VCC; diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index 4632a58c0c..259eb6962d 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -173,7 +173,6 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->runningLedPin = GPIOA_13; //GPIOA_13; // yellow LED engineConfiguration->fatalErrorPin = GPIOA_13; engineConfiguration->warninigLedPin = GPIO_UNASSIGNED; - engineConfiguration->configResetPin = GPIO_UNASSIGNED; boardConfiguration->triggerInputPins[0] = is469 ? GPIOA_5 : GPIOA_5; boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; diff --git a/firmware/console/console_io.h b/firmware/console/console_io.h index fc613e36ac..375e6e953d 100644 --- a/firmware/console/console_io.h +++ b/firmware/console/console_io.h @@ -25,7 +25,7 @@ typedef void (*CommandHandler)(char *); #include "datalogging.h" #ifdef CONFIG_RESET_SWITCH_PORT -// todo: make this pin configurable? or maybe it should not be configurable? +// this pin is not configurable at runtime so that we have a reliable way to reset configuration #define SHOULD_INGORE_FLASH() (palReadPad(CONFIG_RESET_SWITCH_PORT, CONFIG_RESET_SWITCH_PIN) == 0) #else #define SHOULD_INGORE_FLASH() (false) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index b6b3857315..0ee5fbe73c 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -405,7 +405,6 @@ void setDefaultBasePins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { engineConfiguration->fatalErrorPin = GPIOD_14; #endif /* EFI_FATAL_ERROR_PIN */ engineConfiguration->warninigLedPin = GPIOD_13; - engineConfiguration->configResetPin = GPIOB_1; #if EFI_PROD_CODE || defined(__DOXYGEN__) // call overrided board-specific serial configuration setup, if needed (for custom boards only) // needed also by bootloader code diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 5ca7b3f107..3d5444fffa 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 Thu Apr 04 21:45:00 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Apr 11 21:45:26 EDT 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1818,19 +1818,18 @@ typedef struct { */ int16_t iacByTpsTaper; /** - * RED led on Discovery by default. TODO: start using this property + * RED led on Discovery by default. * offset 2060 */ brain_pin_e fatalErrorPin; /** - * TODO: start using this property * offset 2061 */ brain_pin_e warninigLedPin; /** * offset 2062 */ - brain_pin_e configResetPin; + brain_pin_e unused1234234; /** * offset 2063 */ @@ -2648,4 +2647,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Apr 04 21:45:00 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Apr 11 21:45:26 EDT 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 5389a1619c..066e3ee291 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -366,8 +366,6 @@ #define coastingFuelCutTps_offset_hex c68 #define communicationLedPin_offset 1832 #define communicationLedPin_offset_hex 728 -#define configResetPin_offset 2062 -#define configResetPin_offset_hex 80e #define CONSOLE_DATA_PROTOCOL_TAG " @" #define consoleLoopPeriodMs_offset 716 #define consoleLoopPeriodMs_offset_hex 2cc @@ -1725,6 +1723,8 @@ #define uartConsoleSerialSpeed_offset_hex 830 #define unrealisticRpmThreashold_offset 760 #define unrealisticRpmThreashold_offset_hex 2f8 +#define unused1234234_offset 2062 +#define unused1234234_offset_hex 80e #define unused_1484_bit_20_offset 1476 #define unused_1484_bit_20_offset_hex 5c4 #define unused_1484_bit_21_offset 1476 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index b7782132e0..c3fdae573f 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -826,9 +826,9 @@ custom pin_mode_e 1 bits, U08, @OFFSET@, [0:6], @@pin_mode_e_enum@@ int16_t iacByTpsTaper;Extra IAC, in percent between 0 and 100, tapered between zero and idle deactivation TPS value;"percent", 1, 0, 0, 500, 0 - brain_pin_e fatalErrorPin;RED led on Discovery by default. TODO: start using this property - brain_pin_e warninigLedPin;TODO: start using this property - brain_pin_e configResetPin; + brain_pin_e fatalErrorPin;RED led on Discovery by default. + brain_pin_e warninigLedPin; + brain_pin_e unused1234234; brain_pin_e LIS302DLCsPin; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 5d4cd74536..0e69f6c5d3 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 Mon Apr 08 18:05:57 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Apr 11 22:14:18 EDT 2019 pageSize = 20000 page = 1 @@ -623,7 +623,7 @@ page = 1 iacByTpsTaper = scalar, S16, 2058, "percent", 1, 0, 0, 500, 0 fatalErrorPin = bits, U08, 2060, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" warninigLedPin = bits, U08, 2061, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - configResetPin = bits, U08, 2062, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" + unused1234234 = bits, U08, 2062, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" LIS302DLCsPin = bits, U08, 2063, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" tpsAccelLength = scalar, S32, 2064, "cycles", 1, 0, 1, 200, 0 tpsAccelEnrichmentThreshold = scalar, F32, 2068, "roc", 1, 0, 0, 200, 3 @@ -2412,6 +2412,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = allPins1 field = "TLE8888 CS", tle8888_cs field = "TLE8888 SPI", tle8888spiDevice + field = "warninig Led", warninigLedPin + field = "fatal Error Led", fatalErrorPin field = "MAP ADC input", map_sensor_hwChannel field = "frequencyReportingMapInputPin", frequencyReportingMapInputPin field = "CLT ADC input", clt_adcChannel diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 3be03a0b83..b743b5dc5c 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1504,6 +1504,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = allPins1 field = "TLE8888 CS", tle8888_cs field = "TLE8888 SPI", tle8888spiDevice + field = "warninig Led", warninigLedPin + field = "fatal Error Led", fatalErrorPin field = "MAP ADC input", map_sensor_hwChannel field = "frequencyReportingMapInputPin", frequencyReportingMapInputPin field = "CLT ADC input", clt_adcChannel diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 79868066e6..1035345a3a 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 Mon Apr 08 10:00:09 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Apr 11 21:45:26 EDT 2019 public class Fields { public static final int accelerometerSpiDevice_offset = 2736; public static final int acCutoffHighRpm_offset = 1498; @@ -226,7 +226,6 @@ public class Fields { public static final int coastingFuelCutTps_offset = 3176; public static final int communicationLedPin_offset = 1832; public static final int communicationLedPin_offset_hex = 728; - public static final int configResetPin_offset = 2062; public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; public static final int consoleLoopPeriodMs_offset = 716; public static final int consoleSerialRxPin_offset = 1839; @@ -1113,6 +1112,7 @@ public class Fields { public static final int uartConsoleSerialSpeed_offset = 2096; public static final int uartConsoleSerialSpeed_offset_hex = 830; public static final int unrealisticRpmThreashold_offset = 760; + public static final int unused1234234_offset = 2062; public static final int unused_1484_bit_20_offset = 1476; public static final int unused_1484_bit_21_offset = 1476; public static final int unused_bit_1472_29_offset = 1464; @@ -1734,7 +1734,7 @@ public class Fields { public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 2058, FieldType.INT16); public static final Field FATALERRORPIN = Field.create("FATALERRORPIN", 2060, FieldType.INT8, brain_pin_e); public static final Field WARNINIGLEDPIN = Field.create("WARNINIGLEDPIN", 2061, FieldType.INT8, brain_pin_e); - public static final Field CONFIGRESETPIN = Field.create("CONFIGRESETPIN", 2062, FieldType.INT8, brain_pin_e); + public static final Field UNUSED1234234 = Field.create("UNUSED1234234", 2062, FieldType.INT8, brain_pin_e); public static final Field LIS302DLCSPIN = Field.create("LIS302DLCSPIN", 2063, FieldType.INT8, brain_pin_e); public static final Field TPSACCELLENGTH = Field.create("TPSACCELLENGTH", 2064, FieldType.INT); public static final Field TPSACCELENRICHMENTTHRESHOLD = Field.create("TPSACCELENRICHMENTTHRESHOLD", 2068, FieldType.FLOAT);