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

fix vvt indication (#2926) 

* wrap logic

* rename gauges

* names and ranges

* binary log

* we actually don't need that warning

* values auto wrap

* values auto wrap

* bye warnings

* comparison
This commit is contained in:
Matthew Kennedy 2021-07-12 13:29:07 -07:00 committed by GitHub
parent cd909f0eec
commit aef0732509
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firmware/controllers/trigger/trigger_central.cpp
View File

@ -265,12 +265,17 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt, int index DECL
tc->vvtSyncTimeNt[bankIndex][camIndex] = nowNt;
// we do NOT clamp VVT position into the [0, engineCycle) range - we expect vvtOffset to be configured so that
// it's not necessary
tc->vvtPosition[bankIndex][camIndex] = engineConfiguration->vvtOffsets[bankIndex * CAMS_PER_BANK + camIndex] - currentPosition;
if (tc->vvtPosition[bankIndex][camIndex] < -ENGINE(engineCycle) / 2 || tc->vvtPosition[bankIndex][camIndex] > ENGINE(engineCycle) / 2) {
warning(CUSTOM_ERR_VVT_OUT_OF_RANGE, "Please adjust vvtOffset since position %f", tc->vvtPosition);
auto vvtPosition = engineConfiguration->vvtOffsets[bankIndex * CAMS_PER_BANK + camIndex] - currentPosition;
// Wrap VVT position in to the range [-360, 360)
while (vvtPosition < -360) {
vvtPosition += 720;
}
while (vvtPosition >= 360) {
vvtPosition -= 720;
}
tc->vvtPosition[bankIndex][camIndex] = vvtPosition;
if (index != 0) {
// at the moment we use only primary VVT to sync crank phase

4
unit_tests/tests/trigger/test_cam_vvt_input.cpp
View File

@ -120,7 +120,7 @@ TEST(trigger, testCamInput) {
ASSERT_NEAR(360 - 181, engine->triggerCentral.getVVTPosition(0, 0), EPS3D);
}
TEST(sensors, testNB2CamInput) {
TEST(trigger, testNB2CamInput) {
WITH_ENGINE_TEST_HELPER(MAZDA_MIATA_2003);
// this crank trigger would be easier to test, crank shape is less important for this test
@ -167,7 +167,7 @@ TEST(sensors, testNB2CamInput) {
// this third important front would give us first comparison between two real gaps
hwHandleVvtCamSignal(TV_RISE, getTimeNowNt(), 0 PASS_ENGINE_PARAMETER_SUFFIX);
ASSERT_NEAR(-67.6 - 720 - 720, engine->triggerCentral.getVVTPosition(0, 0), EPS3D);
ASSERT_NEAR(-67.6, engine->triggerCentral.getVVTPosition(0, 0), EPS3D);
// actually position based on VVT!
ASSERT_EQ(totalRevolutionCountBeforeVvtSync + 2, engine->triggerCentral.triggerState.getTotalRevolutionCounter());

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

@ -132,6 +132,5 @@ TEST(nissan, vq_vvt) {
ASSERT_NEAR(-testVvtOffset, tc->vvtPosition[0][0], EPS2D);
ASSERT_NEAR(-testVvtOffset, tc->vvtPosition[1][0], EPS2D);
// todo: reducing warning here is a separate story
EXPECT_EQ(1, eth.recentWarnings()->getCount());
EXPECT_EQ(0, eth.recentWarnings()->getCount());
}

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

@ -87,7 +87,7 @@ TEST(trigger, testQuadCam) {
// this third important front would give us first comparison between two real gaps
hwHandleVvtCamSignal(TV_RISE, getTimeNowNt(), secondCamSecondBank PASS_ENGINE_PARAMETER_SUFFIX);
ASSERT_NEAR(-2571.4, engine->triggerCentral.getVVTPosition(secondBank, secondCam), EPS3D);
ASSERT_NEAR(308.6, engine->triggerCentral.getVVTPosition(secondBank, secondCam), EPS3D);
// actually position based on VVT!
ASSERT_EQ(totalRevolutionCountBeforeVvtSync, engine->triggerCentral.triggerState.getTotalRevolutionCounter());