auto-sync

This commit is contained in:
rusEfi 2017-01-28 15:05:25 -05:00
parent c86e06fe8f
commit 6e341bbc62
7 changed files with 21 additions and 3 deletions

View File

@ -10,11 +10,16 @@
#include "chevrolet_camaro_4.h" #include "chevrolet_camaro_4.h"
#include "engine_math.h" #include "engine_math.h"
#include "custom_engine.h"
EXTERN_ENGINE EXTERN_ENGINE
; ;
void setCamaro4(DECLARE_ENGINE_PARAMETER_F) { void setCamaro4(DECLARE_ENGINE_PARAMETER_F) {
setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F);
setAlgorithm(LM_SPEED_DENSITY PASS_ENGINE_PARAMETER); setAlgorithm(LM_SPEED_DENSITY PASS_ENGINE_PARAMETER);
engineConfiguration->specs.displacement = 5.7; engineConfiguration->specs.displacement = 5.7;
@ -53,6 +58,9 @@ void setCamaro4(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->afr.hwChannel = EFI_ADC_13; engineConfiguration->afr.hwChannel = EFI_ADC_13;
boardConfiguration->idle.solenoidPin = GPIO_UNASSIGNED;
boardConfiguration->fuelPumpPin = GPIO_UNASSIGNED;
boardConfiguration->injectionPins[0] = GPIOE_6; boardConfiguration->injectionPins[0] = GPIOE_6;
boardConfiguration->injectionPins[1] = GPIOE_5; boardConfiguration->injectionPins[1] = GPIOE_5;
boardConfiguration->injectionPins[2] = GPIOD_7; boardConfiguration->injectionPins[2] = GPIOD_7;

View File

@ -36,6 +36,8 @@ void disableLCD(board_configuration_s *boardConfiguration) {
boardConfiguration->HD44780_db7 = GPIO_UNASSIGNED; 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) { void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; engineConfiguration->trigger.type = TT_ONE_PLUS_ONE;

View File

@ -456,7 +456,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->auxPidPins[0] = GPIOD_5; // playing with AUX PID for alternator engineConfiguration->auxPidPins[0] = GPIOD_5; // playing with AUX PID for alternator
engineConfiguration->auxPidFrequency[0] = 300; engineConfiguration->auxPidFrequency[0] = 300;
engineConfiguration->isVerboseAuxPid1 = true; // engineConfiguration->isVerboseAuxPid1 = true;
engineConfiguration->auxPid[0].offset = 10; engineConfiguration->auxPid[0].offset = 10;
engineConfiguration->auxPid[0].pFactor = 5; engineConfiguration->auxPid[0].pFactor = 5;
engineConfiguration->auxPid[0].iFactor = 0.1; engineConfiguration->auxPid[0].iFactor = 0.1;

View File

@ -33,6 +33,8 @@ void setRoverv8(DECLARE_ENGINE_PARAMETER_F) {
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1; engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1;
setFrankenstein_01_LCD(boardConfiguration);
engineConfiguration->specs.displacement = 3.528; engineConfiguration->specs.displacement = 3.528;
engineConfiguration->specs.cylindersCount = 8; engineConfiguration->specs.cylindersCount = 8;
engineConfiguration->specs.firingOrder = FO_1_8_4_3_6_5_7_2; engineConfiguration->specs.firingOrder = FO_1_8_4_3_6_5_7_2;

View File

@ -241,6 +241,8 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) {
activeConfiguration->fsioAdc[i] = EFI_ADC_NONE; activeConfiguration->fsioAdc[i] = EFI_ADC_NONE;
} }
disableLCD(boardConfiguration);
activeConfiguration->camInput = GPIO_UNASSIGNED; activeConfiguration->camInput = GPIO_UNASSIGNED;
boardConfiguration->triggerInputPins[0] = GPIO_UNASSIGNED; boardConfiguration->triggerInputPins[0] = GPIO_UNASSIGNED;
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;
@ -753,7 +755,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT;
boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; boardConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT;
setFrankenstein_01_LCD(boardConfiguration);
strcpy(config->timingMultiplier, "1"); strcpy(config->timingMultiplier, "1");
strcpy(config->timingAdditive, "0"); strcpy(config->timingAdditive, "0");

View File

@ -249,5 +249,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20170127; return 20170128;
} }

View File

@ -34,6 +34,7 @@ public class AutoTest {
testBmwE34(); testBmwE34();
testSachs(); testSachs();
testMitsu(); testMitsu();
testCamaro();
testCitroenBerlingo(); testCitroenBerlingo();
testMazda626(); testMazda626();
testFord6(); testFord6();
@ -44,6 +45,10 @@ public class AutoTest {
setEngineType(47); setEngineType(47);
} }
private static void testCamaro() {
setEngineType(35);
}
private static void testSachs() { private static void testSachs() {
setEngineType(29); setEngineType(29);
String msg = "BMW"; String msg = "BMW";