FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring: better field name

This commit is contained in:
rusefillc 2022-08-09 20:32:39 -04:00
parent e8b9b0bd11
commit d97bcec161
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -390,7 +390,7 @@ angle_t PrimaryTriggerDecoder::syncEnginePhase(int divider, int remainder, angle
m_hasSynchronizedPhase = true; m_hasSynchronizedPhase = true;
if (totalShift > 0) { if (totalShift > 0) {
vvtSyncCounter++; camResyncCounter++;
} }
return totalShift; return totalShift;

2
firmware/controllers/trigger/trigger_state.txt
View File

@ -7,6 +7,6 @@ struct_no_prefix trigger_state_s
uint8_t triggerStateIndex uint8_t triggerStateIndex
uint8_t vvtCounter uint8_t vvtCounter
uint8_t vvtSyncCounter uint8_t camResyncCounter
uint8_t vvtStateIndex uint8_t vvtStateIndex
end_struct end_struct

2
firmware/controllers/trigger/trigger_state_generated.h
View File

@ -38,7 +38,7 @@ struct trigger_state_s {
/** /**
* offset 22 * offset 22
*/ */
uint8_t vvtSyncCounter = (uint8_t)0; uint8_t camResyncCounter = (uint8_t)0;
/** /**
* offset 23 * offset 23
*/ */

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

@ -25,7 +25,7 @@ TEST(trigger, map_cam_by_magic_point) {
ASSERT_EQ(150, Sensor::getOrZero(SensorType::Rpm)) << "RPM"; ASSERT_EQ(150, Sensor::getOrZero(SensorType::Rpm)) << "RPM";
ASSERT_EQ(1, engine->triggerCentral.mapVvt_map_peak); ASSERT_EQ(1, engine->triggerCentral.mapVvt_map_peak);
ASSERT_EQ(0, engine->triggerCentral.triggerState.vvtSyncCounter); ASSERT_EQ(0, engine->triggerCentral.triggerState.camResyncCounter);
// Nothing should have been scheduled yet // Nothing should have been scheduled yet
ASSERT_EQ(1, engine->executor.size()); ASSERT_EQ(1, engine->executor.size());
@ -36,7 +36,7 @@ TEST(trigger, map_cam_by_magic_point) {
eth.smartFireTriggerEvents2(/*count*/4, /*delayMs*/200); eth.smartFireTriggerEvents2(/*count*/4, /*delayMs*/200);
ASSERT_EQ(2, engine->triggerCentral.mapVvt_map_peak); ASSERT_EQ(2, engine->triggerCentral.mapVvt_map_peak);
ASSERT_EQ(1, engine->triggerCentral.triggerState.vvtSyncCounter); ASSERT_EQ(1, engine->triggerCentral.triggerState.camResyncCounter);
ASSERT_EQ(10, engine->triggerCentral.mapVvt_MAP_AT_CYCLE_COUNT); ASSERT_EQ(10, engine->triggerCentral.mapVvt_MAP_AT_CYCLE_COUNT);
ASSERT_EQ(ClearReason::None, eth.engine.limpManager.allowIgnition().reason); ASSERT_EQ(ClearReason::None, eth.engine.limpManager.allowIgnition().reason);

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

@ -24,7 +24,7 @@ TEST(realCrankingNB2, normalCranking) {
// Check the number of times VVT information was used to adjust crank phase // Check the number of times VVT information was used to adjust crank phase
// This should happen exactly once: once we sync, we shouldn't lose it. // This should happen exactly once: once we sync, we shouldn't lose it.
EXPECT_EQ(engine->triggerCentral.triggerState.vvtSyncCounter, 2); EXPECT_EQ(engine->triggerCentral.triggerState.camResyncCounter, 2);
ASSERT_EQ(942, round(Sensor::getOrZero(SensorType::Rpm))); ASSERT_EQ(942, round(Sensor::getOrZero(SensorType::Rpm)));