From a878acf0473987b64dc07cf13e87db642bd47eae Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 22 Mar 2017 22:50:16 -0400 Subject: [PATCH] nissan 360/4 --- firmware/config/engines/nissan_primera.h | 1 + firmware/controllers/algo/auto_generated_enums.cpp | 2 ++ firmware/controllers/algo/rusefi_enums.h | 4 +++- firmware/controllers/trigger/trigger_decoder.cpp | 1 + firmware/tunerstudio/rusefi.ini | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/firmware/config/engines/nissan_primera.h b/firmware/config/engines/nissan_primera.h index a20b2e4f83..c4cb4cb71c 100644 --- a/firmware/config/engines/nissan_primera.h +++ b/firmware/config/engines/nissan_primera.h @@ -16,6 +16,7 @@ void setNissanPrimeraEngineConfiguration(engine_configuration_s *engineConfiguration); +void setNissanPrimera360_4EngineConfiguration(engine_configuration_s *engineConfiguration); #endif /* EFI_SUPPORT_NISSAN_PRIMERA */ #endif /* NISSAN_PRIMERA_H_ */ diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index e0ebe7b043..4e2d343797 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -215,6 +215,8 @@ case TT_2JZ_3_34: return "TT_2JZ_3_34"; case TT_ROVER_K: return "TT_ROVER_K"; +case TT_TEMP_WIP: + return "TT_TEMP_WIP"; } return NULL; } diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index b7169d2d99..381b2d0b5c 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -244,7 +244,9 @@ typedef enum { TT_JEEP_18_2_2_2 = 37, - TT_UNUSED = 38, // this is used if we want to iterate over all trigger types + TT_TEMP_WIP = 38, + + TT_UNUSED = 39, // 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 b4f28dfcec..83ff377305 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -634,6 +634,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET break; case TT_NISSAN_SR20VE: + case TT_TEMP_WIP: initializeNissanSR20VE(this PASS_ENGINE_PARAMETER); break; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 7e7e7cdc97..a095d1b421 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -155,7 +155,7 @@ page = 1 tpsAdcChannel = bits, U32, 524, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" ;skipping overrideCrankingIgnition offset 528 sensorChartFrequency = scalar, S32, 532, "index", 1, 0, 0, 300, 0 ; size 4 - trigger_type = bits, U32, 536, [0:5], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "trg38", "trg39", "INVALID" + trigger_type = bits, U32, 536, [0:5], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "trg39", "trg40", "trg41", "trg42", "INVALID" trigger_unusedCustomIsSynchronizationNeeded= bits, U32, 540, [0:0], "false", "true" trigger_unusedCustomNeedSecondTriggerInput= bits, U32, 540, [1:1], "false", "true" trigger_useOnlyFirstChannel= bits, U32, 540, [2:2], "false", "true"