diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 8861d104b9..d8902f9da5 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -18,6 +18,24 @@ EXTERN_ENGINE; +void setFrankenso_01_LCD(board_configuration_s *boardConfiguration) { + boardConfiguration->HD44780_rs = GPIOE_7; + boardConfiguration->HD44780_e = GPIOE_9; + boardConfiguration->HD44780_db4 = GPIOE_11; + boardConfiguration->HD44780_db5 = GPIOE_13; + boardConfiguration->HD44780_db6 = GPIOE_15; + boardConfiguration->HD44780_db7 = GPIOB_10; +} + +void disableLCD(board_configuration_s *boardConfiguration) { + boardConfiguration->HD44780_rs = GPIO_UNASSIGNED; + boardConfiguration->HD44780_e = GPIO_UNASSIGNED; + boardConfiguration->HD44780_db4 = GPIO_UNASSIGNED; + boardConfiguration->HD44780_db5 = GPIO_UNASSIGNED; + boardConfiguration->HD44780_db6 = GPIO_UNASSIGNED; + boardConfiguration->HD44780_db7 = GPIO_UNASSIGNED; +} + void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index 19780fd5f9..a495e93043 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -10,5 +10,7 @@ #include "engine.h" void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setFrankenso_01_LCD(board_configuration_s *boardConfiguration); +void disableLCD(board_configuration_s *boardConfiguration); #endif /* CONFIG_ENGINES_CUSTOM_ENGINE_H_ */ diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 737c3e1577..99aae32e47 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -28,8 +28,7 @@ #include "HIP9011.h" #endif -// setFrankenso_01_LCD -#include "honda_accord.h" +#include "custom_engine.h" #define xxxxx 12 diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index 9aa3448fc0..7e5d07808d 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -14,8 +14,7 @@ #include "ego.h" #include "fsio_impl.h" #include "mazda_miata.h" -// this is about LCD method, TODO FIX IT FINALLY -#include "honda_accord.h" +#include "custom_engine.h" static const ignition_table_t racingFestivaIgnitionTable = { /* Generated by TS2C on Mon Feb 08 13:59:57 EST 2016*/ diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp index 58440f7d7c..2d74f4b5f8 100644 --- a/firmware/config/engines/honda_accord.cpp +++ b/firmware/config/engines/honda_accord.cpp @@ -25,15 +25,7 @@ #include "engine_math.h" #include "settings.h" #include "advance_map.h" - -void setFrankenso_01_LCD(board_configuration_s *boardConfiguration) { - boardConfiguration->HD44780_rs = GPIOE_7; - boardConfiguration->HD44780_e = GPIOE_9; - boardConfiguration->HD44780_db4 = GPIOE_11; - boardConfiguration->HD44780_db5 = GPIOE_13; - boardConfiguration->HD44780_db6 = GPIOE_15; - boardConfiguration->HD44780_db7 = GPIOB_10; -} +#include "custom_engine.h" EXTERN_ENGINE; diff --git a/firmware/config/engines/honda_accord.h b/firmware/config/engines/honda_accord.h index 1ee1244a8d..9e86151989 100644 --- a/firmware/config/engines/honda_accord.h +++ b/firmware/config/engines/honda_accord.h @@ -10,7 +10,6 @@ #include "engine.h" -void setFrankenso_01_LCD(board_configuration_s *boardConfiguration); void setHondaAccordConfigurationTwoWires(DECLARE_ENGINE_PARAMETER_F); void setHondaAccordConfigurationThreeWires(DECLARE_ENGINE_PARAMETER_F); void setHondaAccordConfigurationDip(DECLARE_ENGINE_PARAMETER_F); diff --git a/firmware/config/engines/lada_kalina.cpp b/firmware/config/engines/lada_kalina.cpp index f63a0a4336..7fda6cdda9 100644 --- a/firmware/config/engines/lada_kalina.cpp +++ b/firmware/config/engines/lada_kalina.cpp @@ -16,6 +16,7 @@ EXTERN_ENGINE; void setLadaKalina(DECLARE_ENGINE_PARAMETER_F) { setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); + disableLCD(boardConfiguration); boardConfiguration->HD44780_rs = GPIO_UNASSIGNED; boardConfiguration->HD44780_e = GPIO_UNASSIGNED; diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index e4a2f45e16..b0f461df69 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -20,7 +20,7 @@ #include "engine_math.h" #include "advance_map.h" #include "allsensors.h" -#include "honda_accord.h" +#include "custom_engine.h" static const fuel_table_t miata_maf_fuel_table = { {/*0 engineLoad=1.2*//*0 800.0*/1.53, /*1 1213.0*/0.92, /*2 1626.0*/ 0.74, /*3 2040.0*/0.69, /*4 2453.0*/0.69, /*5 2866.0*/0.67, /*6 3280.0*/0.67, /*7 3693.0*/0.67, /*8 4106.0*/ diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp index 02b952c903..ff9c170b6e 100644 --- a/firmware/config/engines/subaru.cpp +++ b/firmware/config/engines/subaru.cpp @@ -9,7 +9,7 @@ */ #include "subaru.h" -#include "honda_accord.h" +#include "custom_engine.h" EXTERN_ENGINE; diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index bfd083095c..aaf68dc2a9 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -230,15 +230,6 @@ void initHardware(Logging *l) { initHistogramsModule(); #endif /* EFI_HISTOGRAMS */ -#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) - /** - * This is so early because we want to init logger - * which would be used while finding trigger synch index - * while reading configuration - */ - initTriggerDecoderLogger(sharedLogger); -#endif - /** * We need the LED_ERROR pin even before we read configuration */ diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 45c5e1985f..9b0f80e709 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -167,12 +167,22 @@ void applyNewConfiguration(void) { void runRusEfi(void) { efiAssertVoid(getRemainingStack(chThdSelf()) > 512, "init s"); initIntermediateLoggingBuffer(); + initErrorHandling(); + +#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) + /** + * This is so early because we want to init logger + * which would be used while finding trigger synch index + * while reading configuration + */ + initTriggerDecoderLogger(&sharedLogger); +#endif /** * First thing is reading configuration from flash memory. * In order to have complete flexibility configuration has to go before anything else. */ -// readConfiguration(&sharedLogger); + readConfiguration(&sharedLogger); msObjectInit(&firmwareErrorMessageStream, errorMessageBuffer, sizeof(errorMessageBuffer), 0); @@ -180,7 +190,6 @@ void runRusEfi(void) { engine->engineConfiguration2 = engineConfiguration2; #endif - initErrorHandling(); prepareVoidConfiguration(&activeConfiguration); diff --git a/java_console/.idea/runConfigurations/Launcher_COM12.xml b/java_console/.idea/runConfigurations/Launcher_COM12.xml index 0e7e24954e..23addaa350 100644 --- a/java_console/.idea/runConfigurations/Launcher_COM12.xml +++ b/java_console/.idea/runConfigurations/Launcher_COM12.xml @@ -1,5 +1,5 @@ - +