diff --git a/firmware/config/engines/nissan_vq.cpp b/firmware/config/engines/nissan_vq.cpp index 8494f8369c..1aa8bb43b4 100644 --- a/firmware/config/engines/nissan_vq.cpp +++ b/firmware/config/engines/nissan_vq.cpp @@ -7,7 +7,11 @@ #include "nissan_vq.h" -void setHellen121nissan(DECLARE_CONFIG_PARAMETER_SIGNATURE) { +void setHellen121nissanQR(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + +} + +void setHellen121nissanVQ(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->trigger.type = TT_NISSAN_VQ35; engineConfiguration->vvtMode[0] = VVT_NISSAN_VQ; diff --git a/firmware/config/engines/nissan_vq.h b/firmware/config/engines/nissan_vq.h index 906232382d..8a9ec24d50 100644 --- a/firmware/config/engines/nissan_vq.h +++ b/firmware/config/engines/nissan_vq.h @@ -12,4 +12,5 @@ #define NISSAN_VQ_VVT_OFFSET -610 #define NISSAN_VQ_CAM_OFFSET -360 -void setHellen121nissan(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setHellen121nissanVQ(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setHellen121nissanQR(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index b6e4847b38..050a8d849d 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -946,7 +946,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e setHellen72etb(PASS_CONFIG_PARAMETER_SIGNATURE); break; case HELLEN_121_NISSAN: - setHellen121nissan(PASS_CONFIG_PARAMETER_SIGNATURE); + setHellen121nissanVQ(PASS_CONFIG_PARAMETER_SIGNATURE); break; case HELLEN_121_VAG_5_CYL: setHellen121Vag_5_cyl(PASS_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/trigger/decoders/trigger_nissan.cpp b/firmware/controllers/trigger/decoders/trigger_nissan.cpp index 0c6be6f4a0..0b7845fc71 100644 --- a/firmware/controllers/trigger/decoders/trigger_nissan.cpp +++ b/firmware/controllers/trigger/decoders/trigger_nissan.cpp @@ -148,7 +148,7 @@ void initializeNissanQR25crank(TriggerWaveform *s) { s->setTriggerSynchronizationGap(0.33); s->setSecondTriggerSynchronizationGap(3); - s->tdcPosition = 675; + s->tdcPosition = 585; float currentAngle = 20; for (int i = 0;i < 16;i++) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index fcfd322902..52f2e12335 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -508,6 +508,7 @@ end_struct #define ET_HELLEN_121_VAG 71 #define ET_HELLEN_121_NISSAN 72 +#define ET_HELLEN_121_NISSAN_6_CYL 72 #define ET_HELLEN_55_BMW 73 #define ET_HELLEN_88_BMW 74 #define ET_HELLEN_134_BMW 75 @@ -523,6 +524,7 @@ end_struct #define ET_HELLEN_121_VAG_8_CYL 81 #define ET_HELLEN_154_HYUNDAI 82 #define ET_HELLEN_NB1 83 +#define ET_HELLEN_121_NISSAN_4_CYL 84 #define ET_PROTEUS_ANALOG_PWM_TEST 106 #define ET_TEST_ROTARY 107