From a7df277fca837150f8d7879cee9cb0f55eb0bb7e Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Wed, 29 Jul 2020 14:53:36 -0400
Subject: [PATCH] NA6 progress

---
 firmware/config/engines/mazda_miata_1_6.cpp | 5 +++++
 firmware/config/engines/mazda_miata_1_6.h   | 1 +
 firmware/controllers/algo/rusefi_enums.h    | 5 ++++-
 firmware/integration/rusefi_config.txt      | 3 ++-
 firmware/tunerstudio/rusefi.input           | 7 ++++++-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp
index 8589389cee..ed4dfd376a 100644
--- a/firmware/config/engines/mazda_miata_1_6.cpp
+++ b/firmware/config/engines/mazda_miata_1_6.cpp
@@ -352,3 +352,8 @@ void setMiataNA6_VAF_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->fuelAlgorithm = LM_PLAIN_MAF;
 #endif /* BOARD_TLE8888_COUNT */
 }
+
+void setMiataNA6_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
+#if (BOARD_TLE8888_COUNT > 0)
+#endif /* BOARD_TLE8888_COUNT */
+}
diff --git a/firmware/config/engines/mazda_miata_1_6.h b/firmware/config/engines/mazda_miata_1_6.h
index f040ce25fc..7b6aa76c56 100644
--- a/firmware/config/engines/mazda_miata_1_6.h
+++ b/firmware/config/engines/mazda_miata_1_6.h
@@ -20,4 +20,5 @@ 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);
 
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index dbc8d84940..953b23e058 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -62,7 +62,7 @@ typedef enum {
 
 	MRE_MIATA_NB2_MAP = 11,
 
-	MRE_MIATA_NA6 = ET_MRE_MIATA_NA6,
+	MRE_MIATA_NA6_VAF = ET_MRE_MIATA_NA6_VAF,
 
 	MRE_MIATA_NB2_ETB = 13,
 
@@ -189,6 +189,9 @@ typedef enum {
 	DODGE_RAM = 64,
 	CITROEN_TU3JP = ET_CITROEN_TU3JP,
 
+	MRE_MIATA_NA6_MAP = ET_MRE_MIATA_NA6_MAP,
+
+
 	/**
 	 * this configuration has as few pins configured as possible
 	 */
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 63ba0d0b9c..dab82d4e18 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -1640,12 +1640,13 @@ end_struct
 #define PROTOCOL_COIL1_SHORT_NAME "c1"
 #define PROTOCOL_INJ1_SHORT_NAME "i1"
 
-#define ET_MRE_MIATA_NA6 12
+#define ET_MRE_MIATA_NA6_VAF 12
 #define ET_MRE_MIATA_NB2_MAP 11
 #define ET_MRE_MIATA_NB2_MAF 15
 #define ET_MRE_OLD_TEST_BOARD 30
 #define ET_MRE_NEW_TEST_BOARD 31
 #define ET_MRE_DEFAULTS 60
+#define ET_MRE_MIATA_NA6_MAP 66
 
 #define ET_FRANKENSO_MIATA_NA6 41
 #define ET_FRANKENSO_MIATA_NB2 47
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index ea78d1ba2f..781246a98f 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -1490,7 +1490,10 @@ cmd_dfu         			 = "w\x00\xba\x00\x00"
 cmd_set_engine_type_microRusEFI_Miata_NB2_MAP		= "w\x00\x30@@ET_MRE_MIATA_NB2_MAP_16_hex@@"
 
 ; MRE_MIATA_NA6 12
-cmd_set_engine_type_microRusEFI_Miata_NA6			= "w\x00\x30@@ET_MRE_MIATA_NA6_16_hex@@"
+cmd_set_engine_type_microRusEFI_Miata_NA6_VAF			= "w\x00\x30@@ET_MRE_MIATA_NA6_VAF_16_hex@@"
+
+cmd_set_engine_type_microRusEFI_Miata_NA6_MAP			= "w\x00\x30@@ET_MRE_MIATA_NA6_MAP_16_hex@@"
+
 
 ; MRE_MIATA_NB2_MAF = 15
 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF		= "w\x00\x30@@ET_MRE_MIATA_NB2_MAF_16_hex@@"
@@ -2944,6 +2947,8 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP@@if_show_Frankenso_presets
 		commandButton = "Frankenso Miata NB2 MAP",     cmd_set_engine_type_Frankenso_Miata_NB2@@if_show_Frankenso_presets
 
+		commandButton = "microRusEFI Miata NA6 VAF",   cmd_set_engine_type_microRusEFI_Miata_NA6_VAF@@if_show_microRusEFI_presets
+		commandButton = "microRusEFI Miata NA6 MAP",   cmd_set_engine_type_microRusEFI_Miata_NA6_MAP@@if_show_microRusEFI_presets
 		commandButton = "microRusEfi Miata NB2 MAP",   cmd_set_engine_type_microRusEFI_Miata_NB2_MAP@@if_show_microRusEFI_presets
 		commandButton = "microRusEFI Miata NB2 MAF",   cmd_set_engine_type_microRusEFI_Miata_NB2_MAF@@if_show_microRusEFI_presets
 		commandButton = "microRusEFI Defaults",		   cmd_set_engine_type_microRusEFI_Defaults@@if_show_microRusEFI_presets