diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index a586830f84..16297a4cb5 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -13,6 +13,7 @@ void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration) { board_configuration_s * boardConfiguration = &engineConfiguration->bc; setFrankenso_01_LCD(boardConfiguration); + setFrankenso0_1_joystick(engineConfiguration); /** * Frankenso analog #1 PC2 ADC12 diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index c61c8c408b..af2dcadb4b 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -185,6 +185,7 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat board_configuration_s *boardConfiguration) { engineConfiguration->trigger.type = TT_DODGE_NEON_2003; setFrankenso_01_LCD(boardConfiguration); + setFrankenso0_1_joystick(engineConfiguration); // set_global_trigger_offset_angle 46 engineConfiguration->globalTriggerAngleOffset = 46; @@ -384,8 +385,6 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat boardConfiguration->tunerStudioSerialSpeed = 9600; engineConfiguration->algorithm = LM_SPEED_DENSITY; - setFrankenso0_1_joystick(engineConfiguration); - // engineConfiguration->isCanEnabled = true; boardConfiguration->canTxPin = GPIOB_6; boardConfiguration->canRxPin = GPIOB_12; diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 5d074bcb33..4c079c24a3 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -195,6 +195,7 @@ static void common079721_2351(engine_configuration_s *engineConfiguration, board engineConfiguration->mafAdcChannel = EFI_ADC_1; engineConfiguration->tpsAdcChannel = EFI_ADC_3; engineConfiguration->cltAdcChannel = EFI_ADC_11; + } void setMiata1990(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) { @@ -230,11 +231,17 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur engineConfiguration->trigger.type = TT_FORD_ESCORT_GT; common079721_2351(engineConfiguration, boardConfiguration); + setFrankenso_01_LCD(boardConfiguration); + setFrankenso0_1_joystick(engineConfiguration); + engineConfiguration->displacement = 1.839; engineConfiguration->algorithm = LM_MAF; boardConfiguration->tunerStudioSerialSpeed = 9600; + setFuelLoadBin(engineConfiguration, 1.2, 4.4); + setFuelRpmBin(engineConfiguration, 800, 7000); + // boardConfiguration->triggerInputPins[0] = GPIOC_6; // 2G YEL/BLU // boardConfiguration->triggerInputPins[1] = GPIOA_5; // 2E White CKP @@ -288,11 +295,10 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur // Frankenso low out #6: PE4 // Frankenso low out #7: PE0<>PD5 INJ 1&3 // Frankenso low out #8: PE2 INJ - // Frankenso low out #9: PB9 + // Frankenso low out #9: PB9 IDLE // Frankenso low out #10: PE1<>PD3 // Frankenso low out #11: PB8 // Frankenso low out #12: PB7 - boardConfiguration->fanPin = GPIO_UNASSIGNED; boardConfiguration->injectionPins[0] = GPIOD_5; boardConfiguration->injectionPins[1] = GPIOE_2; @@ -302,12 +308,25 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur setDefaultCrankingFuel(engineConfiguration); + boardConfiguration->idleSolenoidFrequency = 300; + boardConfiguration->idleValvePin = GPIOB_9; + boardConfiguration->malfunctionIndicatorPin = GPIOE_5; boardConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT; boardConfiguration->tunerStudioSerialSpeed = 9600; - setFrankenso0_1_joystick(engineConfiguration); + commonFrankensoAnalogInputs(engineConfiguration); + setCommonNTCSensor(&engineConfiguration->clt); + engineConfiguration->clt.bias_resistor = 2700; + setCommonNTCSensor(&engineConfiguration->iat); + engineConfiguration->iat.bias_resistor = 2700; + + engineConfiguration->tpsAdcChannel = EFI_ADC_2; +// engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; + engineConfiguration->mafAdcChannel = EFI_ADC_0; + engineConfiguration->cltAdcChannel = EFI_ADC_12; + engineConfiguration->iatAdcChannel = EFI_ADC_11; } static void setMiata1994_common(engine_configuration_s *engineConfiguration, diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp index d74a8eea57..94ace6bc84 100644 --- a/firmware/config/engines/subaru.cpp +++ b/firmware/config/engines/subaru.cpp @@ -16,5 +16,6 @@ void setSubaru2003Wrx(engine_configuration_s *engineConfiguration) { board_configuration_s * boardConfiguration = &engineConfiguration->bc; setFrankenso_01_LCD(boardConfiguration); + setFrankenso0_1_joystick(engineConfiguration); } diff --git a/java_console/ui/src/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/com/rusefi/ui/RecentCommands.java index 4e2c828c12..a473ae7966 100644 --- a/java_console/ui/src/com/rusefi/ui/RecentCommands.java +++ b/java_console/ui/src/com/rusefi/ui/RecentCommands.java @@ -58,6 +58,8 @@ public class RecentCommands { add("fuelpumpbench"); add("fanbench"); + add("milbench"); + } public void add(String command) {