Nissan defaults

This commit is contained in:
Andrey 2022-11-02 12:05:51 -04:00
parent 6cd8b241bc
commit ccca90cb55
2 changed files with 12 additions and 8 deletions

View File

@ -125,18 +125,22 @@ TEST(nissan, vq_vvt) {
ASSERT_TRUE(tc->vvtState[0][0].getShaftSynchronized());
scheduling_s *head;
int queueIndex = 0;
while ((head = engine->executor.getHead()) != nullptr) {
eth.setTimeAndInvokeEventsUs(head->momentX);
ASSERT_TRUE(tc->vvtState[0][0].getShaftSynchronized());
// let's celebrate that vvtPosition stays the same
ASSERT_NEAR(-testVvtOffset, tc->vvtPosition[0][0], EPS2D);
ASSERT_NEAR(34, tc->vvtPosition[0][0], EPS2D) << "queueIndex=" << queueIndex;
queueIndex++;
}
ASSERT_TRUE(queueIndex == 422) << "Total queueIndex=" << queueIndex;
ASSERT_TRUE(tc->vvtState[1][0].getShaftSynchronized());
ASSERT_NEAR(-testVvtOffset, tc->vvtPosition[0][0], EPS2D);
ASSERT_NEAR(-testVvtOffset, tc->vvtPosition[1][0], EPS2D);
ASSERT_NEAR(34, tc->vvtPosition[0][0], EPS2D);
ASSERT_NEAR(34, tc->vvtPosition[1][0], EPS2D);
EXPECT_EQ(0, eth.recentWarnings()->getCount());
}

View File

@ -30,22 +30,22 @@ static void test(int engineSyncCam, float camOffsetAdd) {
if (vvt1 != 0) {
if (!hasSeenFirstVvt) {
EXPECT_NEAR(vvt1, -45.56, 1);
EXPECT_NEAR(vvt1, 1.4, /*precision*/1);
hasSeenFirstVvt = true;
}
// cam position should never be reported outside of correct range
EXPECT_TRUE(vvt1 > -48 && vvt1 < -43);
EXPECT_TRUE(vvt1 > -3 && vvt1 < 3);
}
if (vvt2 != 0) {
// cam position should never be reported outside of correct range
EXPECT_TRUE(vvt2 > -48 && vvt2 < -43);
EXPECT_TRUE(vvt2 > -3 && vvt2 < 3);
}
}
EXPECT_NEAR(engine->triggerCentral.getVVTPosition(/*bankIndex*/0, /*camIndex*/0), -45.64, 1e-2);
EXPECT_NEAR(engine->triggerCentral.getVVTPosition(/*bankIndex*/1, /*camIndex*/0), -45.45, 1e-2);
EXPECT_NEAR(engine->triggerCentral.getVVTPosition(/*bankIndex*/0, /*camIndex*/0), 1.351, 1e-2);
EXPECT_NEAR(engine->triggerCentral.getVVTPosition(/*bankIndex*/1, /*camIndex*/0), 1.548, 1e-2);
ASSERT_EQ(101, round(Sensor::getOrZero(SensorType::Rpm)))<< reader.lineIndex();
// TODO: why warnings?