From 11ca049346cb520afffae57f81a5cba7a7bb21c1 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 3 Nov 2016 17:03:11 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata_nb.cpp | 6 +++--- firmware/config/engines/mazda_miata_nb.h | 8 ++++---- firmware/controllers/algo/auto_generated_enums.cpp | 8 ++++---- firmware/controllers/algo/engine_configuration.cpp | 5 +++-- firmware/controllers/algo/rusefi_enums.h | 7 +++++-- firmware/controllers/settings.cpp | 4 ++-- firmware/controllers/trigger/trigger_decoder.cpp | 4 ++-- firmware/controllers/trigger/trigger_mazda.cpp | 2 +- firmware/controllers/trigger/trigger_mazda.h | 2 +- 9 files changed, 25 insertions(+), 21 deletions(-) diff --git a/firmware/config/engines/mazda_miata_nb.cpp b/firmware/config/engines/mazda_miata_nb.cpp index 4764bbbd9e..bd0766e03f 100644 --- a/firmware/config/engines/mazda_miata_nb.cpp +++ b/firmware/config/engines/mazda_miata_nb.cpp @@ -2,7 +2,7 @@ * @file mazda_miata_nb.cpp * * - * MAZDA_MIATA_NB = 9 + * MAZDA_MIATA_NB1 = 9 * set_engine_type 9 * * http://rusefi.com/forum/viewtopic.php?t=467 @@ -17,11 +17,11 @@ EXTERN_ENGINE; -void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { +void setMazdaMiataNb1EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { // set_rpm_hard_limit 3000 engineConfiguration->rpmHardLimit = 3000; // yes, 3k. let's play it safe for now - engineConfiguration->trigger.type = TT_MAZDA_MIATA_NB; + engineConfiguration->trigger.type = TT_MAZDA_MIATA_NB1; engineConfiguration->globalTriggerAngleOffset = 276; diff --git a/firmware/config/engines/mazda_miata_nb.h b/firmware/config/engines/mazda_miata_nb.h index 10c18d3e80..d8f902fad3 100644 --- a/firmware/config/engines/mazda_miata_nb.h +++ b/firmware/config/engines/mazda_miata_nb.h @@ -5,11 +5,11 @@ * @author Andrey Belomutskiy, (c) 2012-2016 */ -#ifndef MAZDA_MIATA_NB_H_ -#define MAZDA_MIATA_NB_H_ +#ifndef MAZDA_MIATA_NB1_H_ +#define MAZDA_MIATA_NB1_H_ #include "engine.h" -void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F); +void setMazdaMiataNb1EngineConfiguration(DECLARE_ENGINE_PARAMETER_F); -#endif /* MAZDA_MIATA_NB_H_ */ +#endif /* MAZDA_MIATA_NB1_H_ */ diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 884020efbf..e346815205 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -92,8 +92,8 @@ case MAZDA_323: return "MAZDA_323"; case MAZDA_626: return "MAZDA_626"; -case MAZDA_MIATA_NB: - return "MAZDA_MIATA_NB"; +case MAZDA_MIATA_NB1: + return "MAZDA_MIATA_NB1"; case MIATA_1990: return "MIATA_1990"; case MIATA_1994_DEVIATOR: @@ -173,8 +173,8 @@ case TT_HONDA_ACCORD_CD_TWO_WIRES: return "TT_HONDA_ACCORD_CD_TWO_WIRES"; case TT_MAZDA_MIATA_NA: return "TT_MAZDA_MIATA_NA"; -case TT_MAZDA_MIATA_NB: - return "TT_MAZDA_MIATA_NB"; +case TT_MAZDA_MIATA_NB1: + return "TT_MAZDA_MIATA_NB1"; case TT_MINI_COOPER_R50: return "TT_MINI_COOPER_R50"; case TT_MITSU: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index f8106e6a9e..aeb2a9f6db 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -823,6 +823,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { } void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_S) { + enginePins.reset(); // that's mostly important for functional tests /** * Let's apply global defaults first */ @@ -904,8 +905,8 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN case HONDA_600: setHonda600(PASS_ENGINE_PARAMETER_F); break; - case MAZDA_MIATA_NB: - setMazdaMiataNbEngineConfiguration(PASS_ENGINE_PARAMETER_F); + case MAZDA_MIATA_NB1: + setMazdaMiataNb1EngineConfiguration(PASS_ENGINE_PARAMETER_F); break; case MAZDA_323: setMazda323EngineConfiguration(engineConfiguration); diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 20a35b0ffa..c29249516d 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -58,7 +58,7 @@ typedef enum { */ GY6_139QMB = 8, - MAZDA_MIATA_NB = 9, + MAZDA_MIATA_NB1 = 9, ROVER_V8 = 10, @@ -150,7 +150,10 @@ typedef enum { TT_FORD_ASPIRE = 1, TT_DODGE_NEON_1995 = 2, TT_MAZDA_MIATA_NA = 3, - TT_MAZDA_MIATA_NB = 4, + /** + * NB1 means non-VVT NB, 99 and 00 1.8 engine + */ + TT_MAZDA_MIATA_NB1 = 4, TT_GM_7X = 5, TT_MINI_COOPER_R50 = 6, TT_MAZDA_SOHC_4 = 7, diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 41fb0fa742..b34678082f 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -143,8 +143,8 @@ const char* getConfigurationName(engine_type_e engineType) { return "Fordi6"; case GY6_139QMB: return "Gy6139"; - case MAZDA_MIATA_NB: - return "MiataNB"; + case MAZDA_MIATA_NB1: + return "MiataNB1"; case MAZDA_323: return "M323"; case SATURN_ION_2004: diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index bb90f79eb5..6a4cd193fa 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -471,8 +471,8 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET initializeMazdaMiataNaShape(triggerShape PASS_ENGINE_PARAMETER); break; - case TT_MAZDA_MIATA_NB: - initializeMazdaMiataNbShape(triggerShape PASS_ENGINE_PARAMETER); + case TT_MAZDA_MIATA_NB1: + initializeMazdaMiataNb1Shape(triggerShape PASS_ENGINE_PARAMETER); break; case TT_MIATA_VVT: diff --git a/firmware/controllers/trigger/trigger_mazda.cpp b/firmware/controllers/trigger/trigger_mazda.cpp index e63ea86a7f..5c095461e9 100644 --- a/firmware/controllers/trigger/trigger_mazda.cpp +++ b/firmware/controllers/trigger/trigger_mazda.cpp @@ -50,7 +50,7 @@ void initializeMazdaMiataNaShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) { s->useOnlyPrimaryForSync = true; } -void initializeMazdaMiataNbShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) { +void initializeMazdaMiataNb1Shape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) { s->initialize(FOUR_STROKE_CAM_SENSOR, true); s->setTriggerSynchronizationGap(0.11f); s->useRiseEdge = false; diff --git a/firmware/controllers/trigger/trigger_mazda.h b/firmware/controllers/trigger/trigger_mazda.h index 154e85b572..8891c244e1 100644 --- a/firmware/controllers/trigger/trigger_mazda.h +++ b/firmware/controllers/trigger/trigger_mazda.h @@ -14,7 +14,7 @@ #define MIATA_NA_GAP 1.4930f void initializeMazdaMiataNaShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); -void initializeMazdaMiataNbShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); +void initializeMazdaMiataNb1Shape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); void configureMazdaProtegeSOHC(TriggerShape *s DECLARE_ENGINE_PARAMETER_S); void configureMazdaProtegeLx(TriggerShape *s DECLARE_ENGINE_PARAMETER_S);