rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nissan 4 cylinder QR trigger wheel #3118

This commit is contained in:
Andrey 2021-08-08 04:45:40 -04:00
parent a043d5d316
commit bbd855d62b
6 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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 Tue Aug 03 05:50:08 EDT 2021
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Aug 08 04:18:47 EDT 2021
// see also gen_config_and_enums.bat
@ -968,6 +968,8 @@ case TT_MIATA_VVT:
return "TT_MIATA_VVT";
case TT_MITSUBISHI:
return "TT_MITSUBISHI";
case TT_NISSAN_QR25:
return "TT_NISSAN_QR25";
case TT_NISSAN_SR20VE:
return "TT_NISSAN_SR20VE";
case TT_NISSAN_SR20VE_360:

1
firmware/controllers/algo/obd_error_codes.h
View File

@ -19,6 +19,7 @@ extern "C"
// Back in the day we wanted enums to be 32 bit integers.
// as of 2020 preference is with ' __attribute__ ((__packed__))' allowing one-byte enums
#define ENUM_16_BITS 60000
#define ENUM_32_BITS 2000000000
typedef enum {

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

@ -405,6 +405,8 @@ typedef enum {
TT_NISSAN_VQ30 = TT_TT_NISSAN_VQ30,
TT_NISSAN_QR25 = TT_TT_NISSAN_QR25,
// 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
@ -412,8 +414,9 @@ 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 = 61, // this is used if we want to iterate over all trigger types
TT_UNUSED = 62, // this is used if we want to iterate over all trigger types
// todo: convert to ENUM_16_BITS? I can see 257 triggers but not 65K triggers
Force_4_bytes_size_trigger_type = ENUM_32_BITS,
} trigger_type_e; // TriggerProcessor.java has this "trigger_type_e" name hard-coded!

11
firmware/controllers/trigger/decoders/trigger_nissan.cpp
View File

@ -143,6 +143,17 @@ void initializeNissanVQ35crank(TriggerWaveform *s) {
}
}
void initializeNissanQR25crank(TriggerWaveform *s) {
s->initialize(FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR);
float currentAngle = 20;
for (int i = 0;i < 16;i++) {
currentAngle += 10;
s->addEventAngle(currentAngle - 5, T_PRIMARY, TV_RISE);
s->addEventAngle(currentAngle, T_PRIMARY, TV_FALL);
}
}
static void addvq30tooth(TriggerWaveform *s, float angle) {
s->addEvent360(angle - 4, T_PRIMARY, TV_RISE);
s->addEvent360(angle, T_PRIMARY, TV_FALL);

1
firmware/controllers/trigger/decoders/trigger_nissan.h
View File

@ -14,5 +14,6 @@ void initializeNissanSR20VE_4_360(TriggerWaveform *s);
void initializeNissanVQvvt(TriggerWaveform *s);
void initializeNissanVQ35crank(TriggerWaveform *s);
void initializeNissanQR25crank(TriggerWaveform *s);
void initializeNissanVQ30cam(TriggerWaveform *s);

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

@ -552,6 +552,7 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e ambiguousOperat
initializeNissanVQvvt(this);
break;
case TT_NISSAN_QR25:
case TT_NISSAN_VQ30:
initializeNissanVQ30cam(this);
break;