diff --git a/firmware/config/engines/chevrolet_camaro_4.cpp b/firmware/config/engines/chevrolet_camaro_4.cpp index e7e3790b6b..6fa174a2a9 100644 --- a/firmware/config/engines/chevrolet_camaro_4.cpp +++ b/firmware/config/engines/chevrolet_camaro_4.cpp @@ -10,11 +10,16 @@ #include "chevrolet_camaro_4.h" #include "engine_math.h" +#include "custom_engine.h" + EXTERN_ENGINE ; void setCamaro4(DECLARE_ENGINE_PARAMETER_F) { + setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); + + setAlgorithm(LM_SPEED_DENSITY PASS_ENGINE_PARAMETER); engineConfiguration->specs.displacement = 5.7; @@ -53,6 +58,9 @@ void setCamaro4(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->afr.hwChannel = EFI_ADC_13; + boardConfiguration->idle.solenoidPin = GPIO_UNASSIGNED; + boardConfiguration->fuelPumpPin = GPIO_UNASSIGNED; + boardConfiguration->injectionPins[0] = GPIOE_6; boardConfiguration->injectionPins[1] = GPIOE_5; boardConfiguration->injectionPins[2] = GPIOD_7; diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index c653e71c6d..4b981d3c68 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -36,6 +36,8 @@ void disableLCD(board_configuration_s *boardConfiguration) { boardConfiguration->HD44780_db7 = GPIO_UNASSIGNED; } +// todo: should this be renamed to 'setFrankensoConfiguration'? +// todo: should this be part of more default configurations? void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 717263e258..88a86a5ca8 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -456,7 +456,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->auxPidPins[0] = GPIOD_5; // playing with AUX PID for alternator engineConfiguration->auxPidFrequency[0] = 300; - engineConfiguration->isVerboseAuxPid1 = true; +// engineConfiguration->isVerboseAuxPid1 = true; engineConfiguration->auxPid[0].offset = 10; engineConfiguration->auxPid[0].pFactor = 5; engineConfiguration->auxPid[0].iFactor = 0.1; diff --git a/firmware/config/engines/rover_v8.cpp b/firmware/config/engines/rover_v8.cpp index a2c5a568cd..a3f378e4ec 100644 --- a/firmware/config/engines/rover_v8.cpp +++ b/firmware/config/engines/rover_v8.cpp @@ -33,6 +33,8 @@ void setRoverv8(DECLARE_ENGINE_PARAMETER_F) { setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1; + setFrankenstein_01_LCD(boardConfiguration); + engineConfiguration->specs.displacement = 3.528; engineConfiguration->specs.cylindersCount = 8; engineConfiguration->specs.firingOrder = FO_1_8_4_3_6_5_7_2; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 48bd673d36..1d9aa9170e 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -241,6 +241,8 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) { activeConfiguration->fsioAdc[i] = EFI_ADC_NONE; } + disableLCD(boardConfiguration); + activeConfiguration->camInput = GPIO_UNASSIGNED; boardConfiguration->triggerInputPins[0] = GPIO_UNASSIGNED; boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; @@ -753,7 +755,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; - setFrankenstein_01_LCD(boardConfiguration); strcpy(config->timingMultiplier, "1"); strcpy(config->timingAdditive, "0"); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 8372cde4d5..3b6ae1d356 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -249,5 +249,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20170127; + return 20170128; } diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java index e408529019..018a19fb2c 100644 --- a/java_console/autotest/src/com/rusefi/AutoTest.java +++ b/java_console/autotest/src/com/rusefi/AutoTest.java @@ -34,6 +34,7 @@ public class AutoTest { testBmwE34(); testSachs(); testMitsu(); + testCamaro(); testCitroenBerlingo(); testMazda626(); testFord6(); @@ -44,6 +45,10 @@ public class AutoTest { setEngineType(47); } + private static void testCamaro() { + setEngineType(35); + } + private static void testSachs() { setEngineType(29); String msg = "BMW";