Clean-up all the 4g drama #5213

This commit is contained in:
Andrey 2023-04-01 15:40:24 -04:00
parent a62a16f9e1
commit 0098a3d4b9
4 changed files with 3 additions and 14 deletions

View File

@ -15,7 +15,7 @@
void setMitsubishiConfiguration() {
engineConfiguration->trigger.type = TT_MITSUBISHI_4G93; // same trigger as 4G63?
engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; // same trigger as 4G63?
engineConfiguration->specs.cylindersCount = 4;
engineConfiguration->specs.displacement = 1.800;

View File

@ -942,8 +942,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
setFrankensoMazdaMiataNA8Configuration();
break;
case MITSU_4G93:
setMitsubishiConfiguration();
break;
case FORD_INLINE_6_1995:
setFordInline6();
break;

View File

@ -78,7 +78,7 @@ TEST(real4g93, crankingOn11) {
engineConfiguration->isPhaseSyncRequiredForIgnition = true;
eth.setTriggerType(TT_MITSUBISHI_4G93);
eth.setTriggerType(TT_MAZDA_MIATA_NA);
bool gotRpm = false;
while (reader.haveMore()) {

View File

@ -152,7 +152,7 @@ static void testTriggerDecoder2(const char *msg, engine_type_e type, int synchPo
ASSERT_FALSE(t->shapeDefinitionError) << "isError";
ASSERT_EQ(synchPointIndex, t->getTriggerWaveformSynchPointIndex()) << "synchPointIndex";
ASSERT_EQ(synchPointIndex, t->getTriggerWaveformSynchPointIndex()) << "synchPointIndex " << msg;
if (!cisnan(expectedGapRatio)) {
assertEqualsM2("actual gap ratio", expectedGapRatio, initState.triggerSyncGapRatio, 0.001);
}
@ -363,15 +363,6 @@ TEST(trigger, testTriggerDecoder) {
testTriggerDecoder2("testCitroen", CITROEN_TU3JP, 0, 0.4833, 0);
testTriggerDecoder2("testMitsu", MITSU_4G93, 9, 0.3553, 0.3752);
{
EngineTestHelper eth(MITSU_4G93);
eth.persistentConfig.engineConfiguration.sensorChartMode = SC_DETAILED_RPM;
applyNonPersistentConfiguration();
}
testTriggerDecoder2("miata 1990", MRE_MIATA_NA6_VAF, 4, 1 - 0.7015, 1 - 0.3890);
testTriggerDecoder2("citroen", CITROEN_TU3JP, 0, 0.4833, 0.0, 2.9994);