andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kaiju is asking for vq30de trigger wheel decoder #2974

This commit is contained in:
Andrey 2021-07-17 00:27:56 -04:00
parent 547230a356
commit df558303d3
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/nissan_vq.cpp
View File

@ -8,7 +8,7 @@
#include "nissan_vq.h"
void setHellen121nissan(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_NISSAN_VQ;
engineConfiguration->trigger.type = TT_NISSAN_VQ35;
engineConfiguration->vvtMode[0] = VVT_NISSAN_VQ;

12
firmware/controllers/algo/auto_generated_commonenum.cpp
View File

@ -1,6 +1,6 @@
#include "global.h"
#include "rusefi_enums.h"
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Fri Jul 16 04:50:15 UTC 2021
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Jul 17 00:25:01 EDT 2021
// see also gen_config_and_enums.bat
@ -962,8 +962,10 @@ case TT_NISSAN_SR20VE:
return "TT_NISSAN_SR20VE";
case TT_NISSAN_SR20VE_360:
return "TT_NISSAN_SR20VE_360";
case TT_NISSAN_VQ:
return "TT_NISSAN_VQ";
case TT_NISSAN_VQ30:
return "TT_NISSAN_VQ30";
case TT_NISSAN_VQ35:
return "TT_NISSAN_VQ35";
case TT_ONE:
return "TT_ONE";
case TT_ONE_PLUS_ONE:
@ -1002,8 +1004,8 @@ case TT_VVT_JZ:
return "TT_VVT_JZ";
case TT_VVT_MIATA_NB2:
return "TT_VVT_MIATA_NB2";
case TT_VVT_NISSAN_VQ:
return "TT_VVT_NISSAN_VQ";
case TT_VVT_NISSAN_VQ35:
return "TT_VVT_NISSAN_VQ35";
}
return NULL;
}

2
firmware/controllers/algo/engine.cpp
View File

@ -99,7 +99,7 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) {
case VVT_BARRA_3_PLUS_1:
return TT_VVT_BARRA_3_PLUS_1;
case VVT_NISSAN_VQ:
return TT_VVT_NISSAN_VQ;
return TT_VVT_NISSAN_VQ35;
default:
firmwareError(OBD_PCM_Processor_Fault, "getVvtTriggerType for %s", getVvt_mode_e(vvtMode));
return TT_ONE; // we have to return something for the sake of -Werror=return-type

9
firmware/controllers/algo/rusefi_enums.h
View File

@ -395,9 +395,12 @@ typedef enum {
TT_KAWA_KX450F = TT_TT_KAWA_KX450F,
TT_NISSAN_VQ = TT_TT_NISSAN_VQ,
TT_NISSAN_VQ35 = TT_TT_NISSAN_VQ35,
TT_VVT_NISSAN_VQ35 = TT_TT_VVT_NISSAN_VQ35,
TT_NISSAN_VQ30 = TT_TT_NISSAN_VQ30,
TT_VVT_NISSAN_VQ = TT_TT_VVT_NISSAN_VQ,
// do not forget to edit "#define trigger_type_e_enum" line in integration/rusefi_config.txt file to propogate new value to rusefi.ini TS project
// do not forget to invoke "gen_config.bat" once you make changes to integration/rusefi_config.txt
@ -405,7 +408,7 @@ typedef enum {
//
// Another point: once you add a new trigger, run get_trigger_images.bat which would run rusefi_test.exe from unit_tests
//
TT_UNUSED = 60, // this is used if we want to iterate over all trigger types
TT_UNUSED = 61, // this is used if we want to iterate over all trigger types
Force_4_bytes_size_trigger_type = ENUM_32_BITS,
} trigger_type_e; // TriggerProcessor.java has this "trigger_type_e" name hard-coded!

5
firmware/controllers/trigger/decoders/trigger_structure.cpp
View File

@ -541,11 +541,12 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e ambiguousOperat
configureFordAspireTriggerWaveform(this);
break;
case TT_VVT_NISSAN_VQ:
case TT_VVT_NISSAN_VQ35:
initializeNissanVQvvt(this);
break;
case TT_TT_NISSAN_VQ:
case TT_NISSAN_VQ30:
case TT_NISSAN_VQ35:
initializeNissanVQcrank(this);
break;