From 9b346fc09cac4baea87a4cf6bb8f9348bd7e671d Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 22 Oct 2014 18:02:58 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata.cpp | 43 +++++++++++++------ firmware/config/engines/mazda_miata.h | 3 +- .../controllers/algo/auto_generated_enums.cpp | 6 ++- .../controllers/algo/engine_configuration.cpp | 7 ++- firmware/controllers/algo/enum_strings.cpp | 6 ++- firmware/controllers/algo/rusefi_enums.h | 5 ++- unit_tests/test_trigger_decoder.cpp | 2 +- 7 files changed, 50 insertions(+), 22 deletions(-) diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index d440717ddd..9eccc4ee81 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -3,8 +3,9 @@ * * FORD_ESCORT_GT = 14 * MIATA_1990 = 19 - * MIATA_1994 = 20 + * MIATA_1994_DEVIATOR = 20 * MIATA_1996 = 21 + * MIATA_1994_SPAGS = 24 * * @date Apr 11, 2014 * @author Andrey Belomutskiy, (c) 2012-2014 @@ -211,11 +212,7 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur setDefaultCrankingFuel(engineConfiguration); } -/** - * Frankenso board - * set_engine_type 20 - */ -void setMiata1994(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) { +static void setMiata1994_common(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) { commonMiataNa(engineConfiguration, boardConfiguration); engineConfiguration->displacement = 1.839; @@ -267,10 +264,6 @@ void setMiata1994(engine_configuration_s *engineConfiguration, board_configurati boardConfiguration->fuelPumpPin = GPIOE_4; - boardConfiguration->injectionPins[0] = GPIOD_7; - boardConfiguration->injectionPins[1] = GPIOE_2; - boardConfiguration->injectionPins[2] = GPIOB_8; - boardConfiguration->injectionPins[3] = GPIOB_7; boardConfiguration->injectionPins[4] = GPIO_NONE; boardConfiguration->injectionPins[5] = GPIO_NONE; boardConfiguration->injectionPinMode = OM_DEFAULT; @@ -292,13 +285,39 @@ void setMiata1994(engine_configuration_s *engineConfiguration, board_configurati engineConfiguration->cltAdcChannel = EFI_ADC_12; engineConfiguration->iatAdcChannel = EFI_ADC_11; - /** * VBatt */ engineConfiguration->vbattAdcChannel = EFI_ADC_14; - engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2; +} + +/** + * Frankenso board + * set_engine_type 20 + */ +void setMiata1994_d(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) { + setMiata1994_common(engineConfiguration, boardConfiguration); + engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2; + /** + * This board was avoiding PE0 & PE1 mosfets altogether + */ + boardConfiguration->injectionPins[0] = GPIOD_7; + boardConfiguration->injectionPins[1] = GPIOE_2; + boardConfiguration->injectionPins[2] = GPIOB_8; + boardConfiguration->injectionPins[3] = GPIOB_7; +} + +void setMiata1994_s(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) { + setMiata1994_common(engineConfiguration, boardConfiguration); + engineConfiguration->vbattDividerCoeff = ((float) (10.0 + 33)) / 10 * 2; + /** + * This board has PE0 & PE1 mosfets rewires tp PD3 and PD5 + */ + boardConfiguration->injectionPins[0] = GPIOD_7; + boardConfiguration->injectionPins[1] = GPIOE_2; + boardConfiguration->injectionPins[2] = GPIOB_8; + boardConfiguration->injectionPins[3] = GPIOB_7; } /** diff --git a/firmware/config/engines/mazda_miata.h b/firmware/config/engines/mazda_miata.h index 352a4f976e..12b4a17119 100644 --- a/firmware/config/engines/mazda_miata.h +++ b/firmware/config/engines/mazda_miata.h @@ -16,7 +16,8 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration); void setMiata1990(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration); -void setMiata1994(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration); +void setMiata1994_d(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration); +void setMiata1994_s(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration); void setMiata1996(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration); #endif /* MAZDA_MIATA_H_ */ diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 38ff816a57..55dac8ad36 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -231,8 +231,10 @@ case AUDI_AAN: return "AUDI_AAN"; case MIATA_1996: return "MIATA_1996"; -case MIATA_1994: - return "MIATA_1994"; +case MIATA_1994_DEVIATOR: + return "MIATA_1994d"; +case MIATA_1994_SPAGS: + return "MIATA_1994s"; case FORD_INLINE_6_1995: return "FORD_INLINE_6_1995"; case MIATA_1990: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index afe78ea9b3..ea7ea42d5e 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -478,8 +478,11 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType, engine_co case MIATA_1990: setMiata1990(engineConfiguration, boardConfiguration); break; - case MIATA_1994: - setMiata1994(engineConfiguration, boardConfiguration); + case MIATA_1994_DEVIATOR: + setMiata1994_d(engineConfiguration, boardConfiguration); + break; + case MIATA_1994_SPAGS: + setMiata1994_s(engineConfiguration, boardConfiguration); break; case MIATA_1996: setMiata1996(engineConfiguration, boardConfiguration); diff --git a/firmware/controllers/algo/enum_strings.cpp b/firmware/controllers/algo/enum_strings.cpp index 84676b9caf..dba5704046 100644 --- a/firmware/controllers/algo/enum_strings.cpp +++ b/firmware/controllers/algo/enum_strings.cpp @@ -60,8 +60,10 @@ const char* getConfigurationName(engine_type_e engineType) { return "Mitsu 4G93"; case MIATA_1990: return "Miata 1990"; - case MIATA_1994: - return "Miata 1994"; + case MIATA_1994_DEVIATOR: + return "Miata 1994d"; + case MIATA_1994_SPAGS: + return "Miata 1994s"; case MIATA_1996: return "Miata 1996"; default: diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 347dfade7c..6294cccdb8 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -84,14 +84,15 @@ typedef enum { HONDA_ACCORD_CD_DIP = 18, MIATA_1990 = 19, - MIATA_1994 = 20, + MIATA_1994_DEVIATOR = 20, MIATA_1996 = 21, SUBARU_2003_WRX = 22, DODGE_NEON_2003 = 23, + MIATA_1994_SPAGS = 24, - ET_UNUSED = 24, + ET_UNUSED = 25, Force_4b_engine_type = ENUM_SIZE_HACK, } engine_type_e; diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp index 2617fcd0d7..6699bf81f6 100644 --- a/unit_tests/test_trigger_decoder.cpp +++ b/unit_tests/test_trigger_decoder.cpp @@ -528,7 +528,7 @@ void testTriggerDecoder(void) { testTriggerDecoder2("testMitsu", MITSU_4G93, 3, 0.3750, 0.3889); // testTriggerDecoder2("miata 1990", MIATA_1990, 0, 0.6280, 0.0); - testTriggerDecoder2("miata 1994", MIATA_1994, 11, 0.2917, 0.3716); + testTriggerDecoder2("miata 1994", MIATA_1994_DEVIATOR, 11, 0.2917, 0.3716); testTriggerDecoder2("citroen", CITROEN_TU3JP, 0, 0.4833, 0.0); printGapRatio = true;