From 82551a7211d1429490f20190d1858090fc3c258c Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sun, 2 May 2021 23:46:09 -0400
Subject: [PATCH] h64 progress

---
 firmware/config/engines/mazda_miata_1_6.cpp | 31 +++++++++------------
 firmware/config/engines/mazda_miata_1_6.h   |  1 -
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp
index 44f2ce76bb..46992c5322 100644
--- a/firmware/config/engines/mazda_miata_1_6.cpp
+++ b/firmware/config/engines/mazda_miata_1_6.cpp
@@ -178,21 +178,7 @@ static void miataNAcommonEngineSettings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 
 	engineConfiguration->idle.solenoidFrequency = 160;
 	engineConfiguration->ignitionMode = IM_WASTED_SPARK;
-}
 
-void miataNAcommon(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
-
-	miataNAcommonEngineSettings(PASS_CONFIG_PARAMETER_SIGNATURE);
-
-	engineConfiguration->idle.solenoidPin = GPIOB_9; // this W61 <> W61 jumper, pin 3W
-
-	engineConfiguration->ignitionPins[0] = GPIOE_14; // Frankenso high side - pin 1G
-	engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;
-	engineConfiguration->ignitionPins[2] = GPIOC_7; // Frankenso high side - pin 1H
-	engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED;
-}
-
-static void setMiataNA6_settings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->isFasterEngineSpinUpEnabled = true;
 
 
@@ -250,18 +236,27 @@ static void setMiataNA6_settings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->injectionMode = IM_BATCH;
 }
 
+static void miataNAcommon(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
+
+	engineConfiguration->idle.solenoidPin = GPIOB_9; // this W61 <> W61 jumper, pin 3W
+
+	engineConfiguration->ignitionPins[0] = GPIOE_14; // Frankenso high side - pin 1G
+	engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;
+	engineConfiguration->ignitionPins[2] = GPIOC_7; // Frankenso high side - pin 1H
+	engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED;
+}
+
 /**
  * MIATA_NA6_MAP
  */
 void setMiataNA6_MAP_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
-
 	setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
+	miataNAcommonEngineSettings(PASS_CONFIG_PARAMETER_SIGNATURE);
+
 
 	engineConfiguration->isHip9011Enabled = false;
 
-	setMiataNA6_settings(PASS_CONFIG_PARAMETER_SIGNATURE);
-
 	// Frankenso middle plug 2J, W32 top <> W47 bottom "#5 Green" jumper, not OEM
 	engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
 
@@ -375,7 +370,6 @@ void setMiataNA6_VAF_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
  * set engine_type 66
  */
 void setMiataNA6_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
-	setMiataNA6_settings(PASS_CONFIG_PARAMETER_SIGNATURE);
 	miataNAcommonEngineSettings(PASS_CONFIG_PARAMETER_SIGNATURE);
 
 	engineConfiguration->triggerInputPins[0] = GPIOA_5;
@@ -471,5 +465,6 @@ void setMiata94_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 }
 
 void setHellenNA6(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
+	miataNAcommonEngineSettings(PASS_CONFIG_PARAMETER_SIGNATURE);
 
 }
diff --git a/firmware/config/engines/mazda_miata_1_6.h b/firmware/config/engines/mazda_miata_1_6.h
index 5cf21db60c..8035f8fa84 100644
--- a/firmware/config/engines/mazda_miata_1_6.h
+++ b/firmware/config/engines/mazda_miata_1_6.h
@@ -17,7 +17,6 @@ void setMiataNA6_VAF_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE);
  * set engine_type 41
  */
 void setMiataNA6_MAP_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE);
-void miataNAcommon(DECLARE_CONFIG_PARAMETER_SIGNATURE);
 
 void setMiataNA6_VAF_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE);
 void setMiataNA6_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE);