From d6027a30d3e9f3d888d03ad1e6c1e015f682042e Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 25 Jan 2015 19:05:25 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata.cpp | 34 ++++++++++++++++++++----- firmware/rusefi.cpp | 2 +- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index d60c2735a1..688ce91c34 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -2,6 +2,8 @@ * @file mazda_miata.cpp * * FORD_ESCORT_GT = 14 + * set_engine_type 14 + * * MIATA_1990 = 19 * MIATA_1994_DEVIATOR = 20 * MIATA_1996 = 21 @@ -126,6 +128,9 @@ static void commonMiataNa(engine_configuration_s *engineConfiguration, board_con engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; engineConfiguration->digitalChartSize = 100; + boardConfiguration->triggerInputPins[0] = GPIOC_6; // 2G YEL/BLU + boardConfiguration->triggerInputPins[1] = GPIOA_5; // 2E White CKP + engineConfiguration->ignitionMode = IM_WASTED_SPARK; setFuelLoadBin(engineConfiguration, 1.2, 4.4); setFuelRpmBin(engineConfiguration, 800, 7000); @@ -225,6 +230,27 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur common079721_2351(engineConfiguration, boardConfiguration); + +// boardConfiguration->triggerInputPins[0] = GPIOC_6; // 2G YEL/BLU +// boardConfiguration->triggerInputPins[1] = GPIOA_5; // 2E White CKP + + // in case of SOHC distributor we only have one signal + boardConfiguration->triggerInputPins[0] = GPIOA_5; // 2E White CKP + boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; + engineConfiguration->needSecondTriggerInput = false; + + + /** + * W53 Frankenso input #3 / PA0 / ADC_0 + */ + engineConfiguration->mafAdcChannel = EFI_ADC_0; + engineConfiguration->tpsAdcChannel = EFI_ADC_3; + /** + * W55 Frankenso input #1 / PC2 / ADC_1 + */ + engineConfiguration->cltAdcChannel = EFI_ADC_1; + + // set_global_trigger_offset_angle 256 engineConfiguration->globalTriggerAngleOffset = 256; // set_ignition_offset 170 @@ -238,14 +264,8 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur boardConfiguration->triggerSimulatorPinModes[0] = OM_OPENDRAIN; boardConfiguration->triggerSimulatorPinModes[1] = OM_OPENDRAIN; - // Frankenstein: high side #1 is PE8 - // Frankenstein: high side #2 is PE10 - // Frankenstein: high side #3 is PE12 - // Frankenstein: high side #4 is PE14 - // Frankenstein: high side #5 is PC9 - // Frankenstein: high side #6 is PC7 - boardConfiguration->ignitionPins[0] = GPIOE_12; // Frankenstein: high side #3 + boardConfiguration->ignitionPins[0] = GPIO_UNASSIGNED; boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; boardConfiguration->ignitionPins[2] = GPIO_UNASSIGNED; boardConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 2b82ae95c5..e3f622efd1 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -260,5 +260,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 20150124; + return 20150125; }