From 983682d11fa72085302e2de9b4a81edb69c7c575 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 23 Jun 2022 14:30:41 -0400 Subject: [PATCH] miata 96 defaults --- firmware/config/engines/engines.mk | 1 - firmware/config/engines/mazda_miata_1_6.cpp | 3 +- firmware/config/engines/mazda_miata_1_6.h | 2 +- firmware/config/engines/mazda_miata_na8.cpp | 40 ++++++++++--------- firmware/config/engines/mazda_miata_na8.h | 3 +- firmware/config/engines/mazda_miata_nb.cpp | 12 ------ firmware/config/engines/mazda_miata_nb.h | 11 ----- firmware/config/engines/mazda_miata_vvt.h | 1 + .../controllers/algo/engine_configuration.cpp | 7 ++-- 9 files changed, 31 insertions(+), 49 deletions(-) delete mode 100644 firmware/config/engines/mazda_miata_nb.cpp delete mode 100644 firmware/config/engines/mazda_miata_nb.h diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index 80584ac3cd..2c22fd8f71 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -16,7 +16,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/nissan_primera.cpp \ $(PROJECT_DIR)/config/engines/nissan_vq.cpp \ $(PROJECT_DIR)/config/engines/harley.cpp \ - $(PROJECT_DIR)/config/engines/mazda_miata_nb.cpp \ $(PROJECT_DIR)/config/engines/mercedes.cpp \ $(PROJECT_DIR)/config/engines/honda_600.cpp \ $(PROJECT_DIR)/config/engines/honda_k_dbc.cpp \ diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index cea3b34683..ee5bc5c3f9 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -151,8 +151,7 @@ static const uint8_t mapBased16IgnitionTable[16][16] = { }; #endif - -static void miataNAcommonEngineSettings() { +void miataNAcommonEngineSettings() { engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; engineConfiguration->useOnlyRisingEdgeForTrigger = false; engineConfiguration->specs.cylindersCount = 4; diff --git a/firmware/config/engines/mazda_miata_1_6.h b/firmware/config/engines/mazda_miata_1_6.h index 3ed75a5ca3..16c2f27e0b 100644 --- a/firmware/config/engines/mazda_miata_1_6.h +++ b/firmware/config/engines/mazda_miata_1_6.h @@ -25,7 +25,7 @@ void setMiataNA6_MAP_MRE(); * set engine_type 20 */ void setMiata94_MAP_MRE(); - +void miataNAcommonEngineSettings(); /** * set engine_type 34 diff --git a/firmware/config/engines/mazda_miata_na8.cpp b/firmware/config/engines/mazda_miata_na8.cpp index 348f06d6fb..a69839e77d 100644 --- a/firmware/config/engines/mazda_miata_na8.cpp +++ b/firmware/config/engines/mazda_miata_na8.cpp @@ -13,20 +13,7 @@ #include "custom_engine.h" #include "mazda_miata_1_6.h" -/** - * 1994, 1995 NA - * Note that ODB-II car have different wiring! - * - * https://rusefi.com/wiki/index.php?title=Vehicle:Mazda_Miata_1994 - * - * See also setMiataNA_1_6_Configuration - */ -void setMazdaMiataNA8Configuration() { - setMiataNA6_MAP_Frankenso(); - - // blue jumper wire to W45 bottom jumper, not OEM - engineConfiguration->map.sensor.hwChannel = EFI_ADC_7; - +static void commonNA8() { /** * http://miataturbo.wikidot.com/fuel-injectors * 94-97 (tan) - #195500-2180 @@ -37,6 +24,24 @@ void setMazdaMiataNA8Configuration() { strcpy(engineConfiguration->engineMake, ENGINE_MAKE_MAZDA); strcpy(engineConfiguration->engineCode, "NA8"); + engineConfiguration->injectionMode = IM_SEQUENTIAL; +} + +/** + * 1994, 1995 NA + * Note that ODB-II car have different wiring! + * + * https://rusefi.com/wiki/index.php?title=Vehicle:Mazda_Miata_1994 + * + * See also setMiataNA_1_6_Configuration + */ +void setFrankensoMazdaMiataNA8Configuration() { + setMiataNA6_MAP_Frankenso(); + commonNA8(); + + // blue jumper wire to W45 bottom jumper, not OEM + engineConfiguration->map.sensor.hwChannel = EFI_ADC_7; + engineConfiguration->vbattDividerCoeff = 9.75;// ((float) (8.2 + 33)) / 8.2 * 2; @@ -46,8 +51,7 @@ void setMazdaMiataNA8Configuration() { engineConfiguration->injectionPins[2] = Gpio::B8; // #3 pin 3Y engineConfiguration->injectionPins[3] = Gpio::B7; // #4 pin 3Z - engineConfiguration->injectionMode = IM_SEQUENTIAL; +void setHellenMiata96() { + miataNAcommonEngineSettings(); + commonNA8(); } - - - diff --git a/firmware/config/engines/mazda_miata_na8.h b/firmware/config/engines/mazda_miata_na8.h index 8c26fe6daf..4fe1c4a0a6 100644 --- a/firmware/config/engines/mazda_miata_na8.h +++ b/firmware/config/engines/mazda_miata_na8.h @@ -9,4 +9,5 @@ #include "engine_configuration.h" -void setMazdaMiataNA8Configuration(); +void setFrankensoMazdaMiataNA8Configuration(); +void setHellenMiata96(); diff --git a/firmware/config/engines/mazda_miata_nb.cpp b/firmware/config/engines/mazda_miata_nb.cpp deleted file mode 100644 index e8e1b174ec..0000000000 --- a/firmware/config/engines/mazda_miata_nb.cpp +++ /dev/null @@ -1,12 +0,0 @@ -/** - * @file mazda_miata_nb.cpp - * - * - * @date Feb 18, 2014 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#include "pch.h" - -#include "mazda_miata_nb.h" - diff --git a/firmware/config/engines/mazda_miata_nb.h b/firmware/config/engines/mazda_miata_nb.h deleted file mode 100644 index ceba1094ec..0000000000 --- a/firmware/config/engines/mazda_miata_nb.h +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @file mazda_miata_nb.h - * - * @date Feb 18, 2014 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#pragma once - -#include "engine_configuration.h" - diff --git a/firmware/config/engines/mazda_miata_vvt.h b/firmware/config/engines/mazda_miata_vvt.h index dac97ccbbb..23ca7fa6b6 100644 --- a/firmware/config/engines/mazda_miata_vvt.h +++ b/firmware/config/engines/mazda_miata_vvt.h @@ -58,4 +58,5 @@ void setMiataNB2_Hellen72(); void setMiataNB2_Hellen72_36(); + void setHellenNB1(); diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index e15eb2119d..b87be48ed9 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -61,7 +61,6 @@ #include "mazda_miata.h" #include "mazda_miata_1_6.h" #include "mazda_miata_na8.h" -#include "mazda_miata_nb.h" #include "mazda_miata_vvt.h" #include "mazda_626.h" #include "m111.h" @@ -948,8 +947,10 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case HELLEN_NB2_36: setMiataNB2_Hellen72_36(); break; - case HELLEN_NB1: case HELLEN_NA8_96: + setHellenMiata96(); + break; + case HELLEN_NB1: setHellenNB1(); break; case HELLEN_121_NISSAN_4_CYL: @@ -1035,7 +1036,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e setTle8888TestConfiguration(); break; case FRANKENSO_MAZDA_MIATA_NA8: - setMazdaMiataNA8Configuration(); + setFrankensoMazdaMiataNA8Configuration(); break; case MITSU_4G93: setMitsubishiConfiguration();