From beb0dfd6515c649f60554110d28f156e2ab30530 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 6 Dec 2014 10:03:50 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata.cpp | 4 ++-- firmware/config/engines/rover_v8.cpp | 9 +++++++++ firmware/config/engines/rover_v8.h | 1 + firmware/controllers/algo/engine_configuration.cpp | 9 ++------- firmware/controllers/core/le_functions.cpp | 7 +++++++ firmware/controllers/core/le_functions.h | 1 + firmware/rusefi.cpp | 2 +- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 965ea02e62..7c04d8a927 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -15,6 +15,7 @@ #include "engine_math.h" #include "advance_map.h" #include "allsensors.h" +#include "le_functions.h" // setFrankenso_01_LCD #include "honda_accord.h" @@ -368,8 +369,7 @@ void setMiata1994_s(engine_configuration_s *engineConfiguration, board_configura boardConfiguration->injectionPins[2] = GPIOB_8; // injector #3 boardConfiguration->injectionPins[3] = GPIOB_7; // injector #4 - boardConfiguration->fsioPins[0] = GPIOD_11; - strcpy(boardConfiguration->le_formulas[0], "coolant 80 >"); + setFsio(engineConfiguration, 0, GPIOD_11, "coolant 80 >"); } /** diff --git a/firmware/config/engines/rover_v8.cpp b/firmware/config/engines/rover_v8.cpp index 4018596e25..1b57da7692 100644 --- a/firmware/config/engines/rover_v8.cpp +++ b/firmware/config/engines/rover_v8.cpp @@ -14,6 +14,15 @@ #include "main.h" #include "rover_v8.h" +void setFrankenstein_01_LCD(board_configuration_s *boardConfiguration) { + boardConfiguration->HD44780_rs = GPIOE_9; + boardConfiguration->HD44780_e = GPIOE_11; + boardConfiguration->HD44780_db4 = GPIOE_13; + boardConfiguration->HD44780_db5 = GPIOE_15; + boardConfiguration->HD44780_db6 = GPIOB_11; + boardConfiguration->HD44780_db7 = GPIOB_13; +} + void setRoverv8(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) { diff --git a/firmware/config/engines/rover_v8.h b/firmware/config/engines/rover_v8.h index 30a3f6f319..f608c8e4bd 100644 --- a/firmware/config/engines/rover_v8.h +++ b/firmware/config/engines/rover_v8.h @@ -9,6 +9,7 @@ #include "engine_configuration.h" +void setFrankenstein_01_LCD(board_configuration_s *boardConfiguration); void setRoverv8(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration); diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 854dea3b2b..cd9bfe84ce 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -407,12 +407,7 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_ boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; - boardConfiguration->HD44780_rs = GPIOE_9; - boardConfiguration->HD44780_e = GPIOE_11; - boardConfiguration->HD44780_db4 = GPIOE_13; - boardConfiguration->HD44780_db5 = GPIOE_15; - boardConfiguration->HD44780_db6 = GPIOB_11; - boardConfiguration->HD44780_db7 = GPIOB_13; + setFrankenstein_01_LCD(boardConfiguration); boardConfiguration->gps_rx_pin = GPIOB_7; boardConfiguration->gps_tx_pin = GPIOB_6; @@ -460,7 +455,7 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_ boardConfiguration->digitalPotentiometerChipSelect[3] = GPIO_UNASSIGNED; boardConfiguration->is_enabled_spi_1 = false; - boardConfiguration->is_enabled_spi_2 = true; + boardConfiguration->is_enabled_spi_2 = false; boardConfiguration->is_enabled_spi_3 = true; boardConfiguration->isSdCardEnabled = false; diff --git a/firmware/controllers/core/le_functions.cpp b/firmware/controllers/core/le_functions.cpp index 5414f6c430..48455612ba 100644 --- a/firmware/controllers/core/le_functions.cpp +++ b/firmware/controllers/core/le_functions.cpp @@ -56,3 +56,10 @@ float getLEValue(Engine *engine, calc_stack_t *s, le_action_e action) { } } #endif + +void setFsio(engine_configuration_s *engineConfiguration, int index, brain_pin_e pin, const char * exp) { + board_configuration_s *boardConfiguration = &engineConfiguration->bc; + + boardConfiguration->fsioPins[index] = pin; + strcpy(boardConfiguration->le_formulas[index], exp); +} diff --git a/firmware/controllers/core/le_functions.h b/firmware/controllers/core/le_functions.h index 27f57aa4a8..0239d42faa 100644 --- a/firmware/controllers/core/le_functions.h +++ b/firmware/controllers/core/le_functions.h @@ -29,5 +29,6 @@ #define FAN_CONTROL_LOGIC "fan coolant fan_off_setting > & coolant fan_on_setting > OR" float getLEValue(Engine *engine, calc_stack_t *s, le_action_e action); +void setFsio(engine_configuration_s *engineConfiguration, int index, brain_pin_e pin, const char * exp); #endif /* LE_FUNCTIONS_H_ */ diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 45ce59fea8..d27b8d9972 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -265,5 +265,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE == 0) return 1; // this is here to make the compiler happy about the unused array - return 20141205; + return 20141206; }