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 VVT trigger decoder fix #2887 

TDD is amazing we are done here!
This commit is contained in:
Andrey 2021-07-03 12:43:01 -04:00
parent 4c19e22237
commit c0cbe626b6
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,4 +13,7 @@ void setHellen121nissan(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_NISSAN_VQ; engineConfiguration->trigger.type = TT_NISSAN_VQ;
engineConfiguration->vvtMode[0] = VVT_NISSAN_VQ; engineConfiguration->vvtMode[0] = VVT_NISSAN_VQ;
engineConfiguration->vvtOffsets[0] = NISSAN_VQ_VVT_OFFSET;
engineConfiguration->vvtOffsets[1 * CAMS_PER_BANK] = NISSAN_VQ_VVT_OFFSET - NISSAN_VQ_CAM_OFFSET;
} }

3
firmware/config/engines/nissan_vq.h
View File

@ -9,4 +9,7 @@
#include "engine_configuration.h" #include "engine_configuration.h"
#define NISSAN_VQ_VVT_OFFSET -27.5
#define NISSAN_VQ_CAM_OFFSET 360
void setHellen121nissan(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setHellen121nissan(DECLARE_CONFIG_PARAMETER_SIGNATURE);

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

@ -7,6 +7,7 @@
#include "engine_test_helper.h" #include "engine_test_helper.h"
#include "trigger_nissan.h" #include "trigger_nissan.h"
#include "nissan_vq.h"
class TriggerCallback { class TriggerCallback {
public: public:
@ -71,8 +72,6 @@ TEST(nissan, vq_vvt) {
int cyclesCount = 36; int cyclesCount = 36;
angle_t offsetBetweenCams = 360;
{ {
static TriggerWaveform crank; static TriggerWaveform crank;
initializeNissanVQcrank(&crank); initializeNissanVQcrank(&crank);
@ -84,6 +83,8 @@ TEST(nissan, vq_vvt) {
// crank being FOUR_STROKE_THREE_TIMES_CRANK_SENSOR means 120 degrees cycle duration which does not match cam shaft cycle duration // crank being FOUR_STROKE_THREE_TIMES_CRANK_SENSOR means 120 degrees cycle duration which does not match cam shaft cycle duration
float vvtTimeScale = 1 / 1.5; float vvtTimeScale = 1 / 1.5;
angle_t testVvtOffset = 2;
{ {
static TriggerWaveform vvt; static TriggerWaveform vvt;
initializeNissanVQvvt(&vvt); initializeNissanVQvvt(&vvt);
@ -92,7 +93,7 @@ TEST(nissan, vq_vvt) {
/* timeScale */ vvtTimeScale, /* timeScale */ vvtTimeScale,
cyclesCount / 6, true, cyclesCount / 6, true,
/* vvtBankIndex */ 0, /* vvtBankIndex */ 0,
/* vvtOffset */ 0 /* vvtOffset */ testVvtOffset
PASS_ENGINE_PARAMETER_SUFFIX); PASS_ENGINE_PARAMETER_SUFFIX);
} }
@ -104,7 +105,7 @@ TEST(nissan, vq_vvt) {
/* timeScale */ vvtTimeScale, /* timeScale */ vvtTimeScale,
cyclesCount / 6, true, cyclesCount / 6, true,
/* vvtBankIndex */1, /* vvtBankIndex */1,
/* vvtOffset */ offsetBetweenCams /* vvtOffset */ testVvtOffset + NISSAN_VQ_CAM_OFFSET
PASS_ENGINE_PARAMETER_SUFFIX); PASS_ENGINE_PARAMETER_SUFFIX);
} }
@ -121,10 +122,8 @@ TEST(nissan, vq_vvt) {
ASSERT_TRUE(tc->vvtState[0][0].getShaftSynchronized()); ASSERT_TRUE(tc->vvtState[0][0].getShaftSynchronized());
ASSERT_TRUE(tc->vvtState[1][0].getShaftSynchronized()); ASSERT_TRUE(tc->vvtState[1][0].getShaftSynchronized());
angle_t firstVVTangle = 27.5; ASSERT_NEAR(-testVvtOffset, tc->vvtPosition[0][0], EPS2D);
ASSERT_NEAR(firstVVTangle, tc->vvtPosition[0][0], EPS2D); ASSERT_NEAR(-testVvtOffset, tc->vvtPosition[1][0], EPS2D);
ASSERT_NEAR(firstVVTangle + offsetBetweenCams, tc->vvtPosition[1][0], EPS2D);
// todo EXPECT_EQ(0, eth.recentWarnings()->getCount());
EXPECT_EQ(1, eth.recentWarnings()->getCount());
} }