From 650025b2c05628e13d2a605cc91341fd54f7f39d Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 4 Oct 2016 14:00:58 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata_vvt.cpp | 5 +++++ firmware/config/engines/mazda_miata_vvt.h | 4 ++-- firmware/controllers/algo/auto_generated_enums.cpp | 6 +++++- firmware/controllers/algo/engine_configuration.cpp | 1 + firmware/controllers/algo/rusefi_enums.h | 8 ++++++-- firmware/controllers/trigger/trigger_decoder.cpp | 2 ++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 4c6a60fcb2..175e5abb70 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -8,5 +8,10 @@ #include "mazda_miata_vvt.h" +EXTERN_ENGINE; + +void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { + +} diff --git a/firmware/config/engines/mazda_miata_vvt.h b/firmware/config/engines/mazda_miata_vvt.h index 1d1810aa7e..eb5c9032d4 100644 --- a/firmware/config/engines/mazda_miata_vvt.h +++ b/firmware/config/engines/mazda_miata_vvt.h @@ -10,8 +10,8 @@ #ifndef CONFIG_ENGINES_MAZDA_MIATA_VVT_H_ #define CONFIG_ENGINES_MAZDA_MIATA_VVT_H_ +#include "engine.h" - - +void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F); #endif /* CONFIG_ENGINES_MAZDA_MIATA_VVT_H_ */ diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index f4160b56f6..edd3f0749c 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -114,6 +114,8 @@ case SUBARU_2003_WRX: return "SUBARU_2003_WRX"; case TEST_ENGINE: return "TEST_ENGINE"; +case MAZDA_MIATA_2003: + return "miata 2003"; case TEST_ENGINE_VVT: return "TEST_ENGINE_VVT"; case VW_ABA: @@ -132,7 +134,9 @@ case TT_HONDA_CBR_600: case TT_HONDA_CBR_600_CUSTOM: return "TT_HONDA_CBR_600_CUSTOM"; case TT_3_1_CAM: - return "TT_3_1_CAM"; + return "3_1_CAM"; +case TT_MIATA_VVT: + return "MIATA_VVT"; case TT_DODGE_NEON_1995: return "TT_DODGE_NEON_1995"; case TT_GM_LS_24: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 9ad9f343b3..80903ac3b6 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -950,6 +950,7 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN case TEST_ENGINE: setTestEngineConfiguration(PASS_ENGINE_PARAMETER_F); break; + case MAZDA_MIATA_2003: case TEST_ENGINE_VVT: setTestVVTEngineConfiguration(PASS_ENGINE_PARAMETER_F); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 63771f7376..4d00bdbcf8 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -136,7 +136,9 @@ typedef enum { DODGE_NEON_2003_CRANK = 46, - ET_UNUSED = 47, + MAZDA_MIATA_2003 = 47, + + ET_UNUSED = 48, Force_4b_engine_type = ENUM_32_BITS, } engine_type_e; @@ -199,7 +201,9 @@ typedef enum { // crank-based in case your cam is broken TT_DODGE_NEON_2003_CRANK = 32, - TT_UNUSED = 33, // this is used if we want to iterate over all trigger types + TT_MIATA_VVT = 33, + + TT_UNUSED = 34, // this is used if we want to iterate over all trigger types Force_4b_trigger_type = ENUM_32_BITS, } trigger_type_e; diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index 40529c2be7..9201229001 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -474,6 +474,8 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET initializeMazdaMiataNbShape(triggerShape PASS_ENGINE_PARAMETER); break; + case TT_MIATA_VVT: + case TT_DODGE_NEON_1995: configureNeon1995TriggerShape(triggerShape PASS_ENGINE_PARAMETER); break;