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 07:04:18 -04:00
parent 551de3edf0
commit 0df437e749
7 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp
View File

@ -166,11 +166,7 @@ void setBoardDefaultConfiguration(void) {
// Bosch VQ40 VR56 VK56 0280158007 // Bosch VQ40 VR56 VK56 0280158007
engineConfiguration->injector.flow = 296.2; engineConfiguration->injector.flow = 296.2;
engineConfiguration->specs.cylindersCount = 6;
engineConfiguration->specs.firingOrder = FO_1_2_3_4_5_6;
engineConfiguration->specs.displacement = 4;
strcpy(CONFIG(engineMake), ENGINE_MAKE_NISSAN); strcpy(CONFIG(engineMake), ENGINE_MAKE_NISSAN);
strcpy(CONFIG(engineCode), "VQ");
engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; // IM_WASTED_SPARK engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; // IM_WASTED_SPARK
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;

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

@ -8,12 +8,30 @@
#include "nissan_vq.h" #include "nissan_vq.h"
void setHellen121nissanQR(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setHellen121nissanQR(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_NISSAN_QR25;
engineConfiguration->specs.cylindersCount = 4;
engineConfiguration->specs.firingOrder = FO_1_3_4_2;
engineConfiguration->specs.displacement = 2;
strcpy(CONFIG(engineCode), "QR");
engineConfiguration->vvtMode[0] = VVT_NISSAN_VQ;
// we have this here and not in board_configuration.cpp so that unit test would get this value
engineConfiguration->invertCamVVTSignal = true;
engineConfiguration->vvtOffsets[0] = NISSAN_VQ_VVT_OFFSET;
} }
void setHellen121nissanVQ(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setHellen121nissanVQ(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_NISSAN_VQ35; engineConfiguration->trigger.type = TT_NISSAN_VQ35;
engineConfiguration->specs.cylindersCount = 6;
engineConfiguration->specs.firingOrder = FO_1_2_3_4_5_6;
engineConfiguration->specs.displacement = 4;
strcpy(CONFIG(engineCode), "VQ");
engineConfiguration->vvtMode[0] = VVT_NISSAN_VQ; engineConfiguration->vvtMode[0] = VVT_NISSAN_VQ;
// we have this here and not in board_configuration.cpp so that unit test would get this value // we have this here and not in board_configuration.cpp so that unit test would get this value

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

@ -1,6 +1,6 @@
#include "global.h" #include "global.h"
#include "rusefi_enums.h" #include "rusefi_enums.h"
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Aug 08 04:18:47 EDT 2021 // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sun Aug 08 06:27:19 EDT 2021
// see also gen_config_and_enums.bat // see also gen_config_and_enums.bat
@ -414,8 +414,10 @@ case GY6_139QMB:
return "GY6_139QMB"; return "GY6_139QMB";
case HELLEN72_ETB: case HELLEN72_ETB:
return "HELLEN72_ETB"; return "HELLEN72_ETB";
case HELLEN_121_NISSAN: case HELLEN_121_NISSAN_4_CYL:
return "HELLEN_121_NISSAN"; return "HELLEN_121_NISSAN_4_CYL";
case HELLEN_121_NISSAN_6_CYL:
return "HELLEN_121_NISSAN_6_CYL";
case HELLEN_121_VAG: case HELLEN_121_VAG:
return "HELLEN_121_VAG"; return "HELLEN_121_VAG";
case HELLEN_121_VAG_5_CYL: case HELLEN_121_VAG_5_CYL:

5
firmware/controllers/algo/engine_configuration.cpp
View File

@ -945,7 +945,10 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case HELLEN72_ETB: case HELLEN72_ETB:
setHellen72etb(PASS_CONFIG_PARAMETER_SIGNATURE); setHellen72etb(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case HELLEN_121_NISSAN: case HELLEN_121_NISSAN_4_CYL:
setHellen121nissanQR(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case HELLEN_121_NISSAN_6_CYL:
setHellen121nissanVQ(PASS_CONFIG_PARAMETER_SIGNATURE); setHellen121nissanVQ(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case HELLEN_121_VAG_5_CYL: case HELLEN_121_VAG_5_CYL:

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

@ -194,7 +194,7 @@ typedef enum {
SUBARUEG33_DEFAULTS = 70, SUBARUEG33_DEFAULTS = 70,
HELLEN_121_VAG = ET_HELLEN_121_VAG, HELLEN_121_VAG = ET_HELLEN_121_VAG,
HELLEN_121_NISSAN = ET_HELLEN_121_NISSAN, HELLEN_121_NISSAN_6_CYL = ET_HELLEN_121_NISSAN_6_CYL,
HELLEN_55_BMW = ET_HELLEN_55_BMW, HELLEN_55_BMW = ET_HELLEN_55_BMW,
HELLEN_88_BMW = ET_HELLEN_88_BMW, HELLEN_88_BMW = ET_HELLEN_88_BMW,
HELLEN_134_BMW = ET_HELLEN_134_BMW, HELLEN_134_BMW = ET_HELLEN_134_BMW,
@ -208,6 +208,7 @@ typedef enum {
HELLEN_NA94 = ET_HELLEN_NA94, HELLEN_NA94 = ET_HELLEN_NA94,
HELLEN_154_HYUNDAI = ET_HELLEN_154_HYUNDAI, HELLEN_154_HYUNDAI = ET_HELLEN_154_HYUNDAI,
HELLEN_121_NISSAN_4_CYL = ET_HELLEN_121_NISSAN_4_CYL,
/** /**
* this configuration has as few pins configured as possible * this configuration has as few pins configured as possible

2
unit_tests/tests/trigger/test_nissan_vq_vvt.cpp
View File

@ -66,7 +66,7 @@ static void scheduleTriggerEvents(TriggerWaveform *shape,
TEST(nissan, vq_vvt) { TEST(nissan, vq_vvt) {
WITH_ENGINE_TEST_HELPER (HELLEN_121_NISSAN); WITH_ENGINE_TEST_HELPER (HELLEN_121_NISSAN_6_CYL);
engineConfiguration->isIgnitionEnabled = false; engineConfiguration->isIgnitionEnabled = false;
engineConfiguration->isInjectionEnabled = false; engineConfiguration->isInjectionEnabled = false;

2
unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp
View File

@ -13,7 +13,7 @@ TEST(realCrankingVQ40, normalCranking) {
int indeces[] = {0}; int indeces[] = {0};
reader.open("tests/trigger/resources/nissan_vq40_cranking-1.csv", indeces); reader.open("tests/trigger/resources/nissan_vq40_cranking-1.csv", indeces);
WITH_ENGINE_TEST_HELPER (HELLEN_121_NISSAN); WITH_ENGINE_TEST_HELPER (HELLEN_121_NISSAN_6_CYL);
bool hasSeenFirstVvt = false; bool hasSeenFirstVvt = false;