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: enum name clean-up

This commit is contained in:
Andrey 2022-09-01 00:18:06 -04:00
parent 9c2bb7e7e6
commit ea22fcbe95
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/harley.cpp
View File

@ -12,7 +12,7 @@ void proteusHarley() {
// for now we need non wired camInput to keep TS field enable/disable logic happy // for now we need non wired camInput to keep TS field enable/disable logic happy
engineConfiguration->camInputs[0] = PROTEUS_DIGITAL_6; engineConfiguration->camInputs[0] = PROTEUS_DIGITAL_6;
engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN_ANOTHER; engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN;
engineConfiguration->luaOutputPins[0] = PROTEUS_LS_12; engineConfiguration->luaOutputPins[0] = PROTEUS_LS_12;
#if HW_PROTEUS #if HW_PROTEUS

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

@ -740,8 +740,8 @@ case VVT_HONDA_K:
return "VVT_HONDA_K"; return "VVT_HONDA_K";
case VVT_INACTIVE: case VVT_INACTIVE:
return "VVT_INACTIVE"; return "VVT_INACTIVE";
case VVT_MAP_V_TWIN_ANOTHER: case VVT_MAP_V_TWIN:
return "VVT_MAP_V_TWIN_ANOTHER"; return "VVT_MAP_V_TWIN";
case VVT_MAZDA_SKYACTIV: case VVT_MAZDA_SKYACTIV:
return "VVT_MAZDA_SKYACTIV"; return "VVT_MAZDA_SKYACTIV";
case VVT_MIATA_NB: case VVT_MIATA_NB:

2
firmware/controllers/algo/engine.cpp
View File

@ -77,7 +77,7 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) {
case VVT_HONDA_K: case VVT_HONDA_K:
case VVT_FIRST_HALF: case VVT_FIRST_HALF:
case VVT_SECOND_HALF: case VVT_SECOND_HALF:
case VVT_MAP_V_TWIN_ANOTHER: case VVT_MAP_V_TWIN:
return TT_ONE; return TT_ONE;
case VVT_FORD_ST170: case VVT_FORD_ST170:
return TT_FORD_ST170; return TT_FORD_ST170;

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

@ -114,7 +114,7 @@ typedef enum __attribute__ ((__packed__)) {
VVT_MITSUBISHI_3A92 = 12, VVT_MITSUBISHI_3A92 = 12,
VVT_MAP_V_TWIN_ANOTHER = 13, VVT_MAP_V_TWIN = 13,
VVT_MITSUBISHI_6G75 = 14, VVT_MITSUBISHI_6G75 = 14,

2
firmware/controllers/engine_cycle/main_trigger_callback.cpp
View File

@ -342,7 +342,7 @@ bool noFiringUntilVvtSync(vvt_mode_e vvtMode) {
auto operationMode = engine->getOperationMode(); auto operationMode = engine->getOperationMode();
// V-Twin MAP phase sense needs to always wait for sync // V-Twin MAP phase sense needs to always wait for sync
if (vvtMode == VVT_MAP_V_TWIN_ANOTHER) { if (vvtMode == VVT_MAP_V_TWIN) {
return true; return true;
} }

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

@ -119,7 +119,7 @@ static bool vvtWithRealDecoder(vvt_mode_e vvtMode) {
return vvtMode != VVT_INACTIVE return vvtMode != VVT_INACTIVE
&& vvtMode != VVT_2JZ && vvtMode != VVT_2JZ
&& vvtMode != VVT_HONDA_K && vvtMode != VVT_HONDA_K
&& vvtMode != VVT_MAP_V_TWIN_ANOTHER && vvtMode != VVT_MAP_V_TWIN
&& vvtMode != VVT_SECOND_HALF && vvtMode != VVT_SECOND_HALF
&& vvtMode != VVT_FIRST_HALF; && vvtMode != VVT_FIRST_HALF;
} }
@ -161,7 +161,7 @@ static angle_t adjustCrankPhase(int camIndex) {
vvt_mode_e vvtMode = engineConfiguration->vvtMode[camIndex]; vvt_mode_e vvtMode = engineConfiguration->vvtMode[camIndex];
switch (vvtMode) { switch (vvtMode) {
case VVT_FIRST_HALF: case VVT_FIRST_HALF:
case VVT_MAP_V_TWIN_ANOTHER: case VVT_MAP_V_TWIN:
return syncAndReport(tc, getCrankDivider(operationMode), 1); return syncAndReport(tc, getCrankDivider(operationMode), 1);
case VVT_SECOND_HALF: case VVT_SECOND_HALF:
case VVT_NISSAN_VQ: case VVT_NISSAN_VQ:
@ -604,7 +604,7 @@ bool TriggerNoiseFilter::noiseFilter(efitick_t nowNt,
void TriggerCentral::decodeMapCam(efitick_t timestamp, float currentPhase) { void TriggerCentral::decodeMapCam(efitick_t timestamp, float currentPhase) {
#if WITH_TS_STATE #if WITH_TS_STATE
if (engineConfiguration->vvtMode[0] == VVT_MAP_V_TWIN_ANOTHER && if (engineConfiguration->vvtMode[0] == VVT_MAP_V_TWIN &&
Sensor::getOrZero(SensorType::Rpm) < engineConfiguration->cranking.rpm) { Sensor::getOrZero(SensorType::Rpm) < engineConfiguration->cranking.rpm) {
// we are trying to figure out which 360 half of the total 720 degree cycle is which, so we compare those in 360 degree sense. // we are trying to figure out which 360 half of the total 720 degree cycle is which, so we compare those in 360 degree sense.
auto toothAngle360 = currentPhase; auto toothAngle360 = currentPhase;

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

@ -10,7 +10,7 @@ TEST(trigger, map_cam_by_magic_point) {
engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->isFasterEngineSpinUpEnabled = false;
engineConfiguration->camInputs[0] = Gpio::A0; engineConfiguration->camInputs[0] = Gpio::A0;
engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN_ANOTHER; engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN;
eth.engine.periodicFastCallback(); // trigger limp mode eth.engine.periodicFastCallback(); // trigger limp mode
ASSERT_FALSE(eth.engine.limpManager.allowIgnition()); ASSERT_FALSE(eth.engine.limpManager.allowIgnition());
ASSERT_FALSE(eth.engine.limpManager.allowInjection()); ASSERT_FALSE(eth.engine.limpManager.allowInjection());