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

WTF is wrong with MRE_miata_na6 config? operationMode complexity fix #898

This commit is contained in:
rusefi 2019-08-08 23:11:56 -04:00
parent 9112b7f797
commit 946374184e
8 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/engines/custom_engine.cpp
View File

@ -321,6 +321,10 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// see also setDefaultEtbBiasCurve // see also setDefaultEtbBiasCurve
} }
void setIssue898(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA;
}
// TLE8888_BENCH_ENGINE // TLE8888_BENCH_ENGINE
// set engine_type 59 // set engine_type 59
void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {

1
firmware/config/engines/custom_engine.h
View File

@ -17,6 +17,7 @@ void setFrankensoBoardTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setIssue898(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void mreBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE); void mreBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* CONFIG_ENGINES_CUSTOM_ENGINE_H_ */ #endif /* CONFIG_ENGINES_CUSTOM_ENGINE_H_ */

1
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -102,6 +102,7 @@ static const fuel_table_t miataNA6_maf_fuel_table = {
static void miataNAcommonEngineSettings(DECLARE_CONFIG_PARAMETER_SIGNATURE) { static void miataNAcommonEngineSettings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA;
engineConfiguration->useOnlyRisingEdgeForTrigger = false;
engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.cylindersCount = 4;
engineConfiguration->specs.firingOrder = FO_1_3_4_2; engineConfiguration->specs.firingOrder = FO_1_3_4_2;

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

@ -667,8 +667,8 @@ case LM_SPEED_DENSITY:
} }
const char *getEngine_type_e(engine_type_e value){ const char *getEngine_type_e(engine_type_e value){
switch(value) { switch(value) {
case ACURA_RSX: case ISSUE_898:
return "ACURA_RSX"; return "ISSUE_898";
case AUDI_AAN: case AUDI_AAN:
return "AUDI_AAN"; return "AUDI_AAN";
case BMW_E34: case BMW_E34:

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

@ -1055,7 +1055,9 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case MRE_MIATA_NA6: case MRE_MIATA_NA6:
setMiataNA6_VAF_MRE(PASS_CONFIG_PARAMETER_SIGNATURE); setMiataNA6_VAF_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case ACURA_RSX: case ISSUE_898:
setIssue898(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MINI_COOPER_R50: case MINI_COOPER_R50:
case MINIMAL_PINS: case MINIMAL_PINS:
// all basic settings are already set in prepareVoidConfiguration(), no need to set anything here // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here

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

@ -106,7 +106,10 @@ typedef enum {
TEST_ENGINE = 26, TEST_ENGINE = 26,
ACURA_RSX = 27, // used by unit test
// see https://github.com/rusefi/rusefi/issues/898
// see TriggerShape::bothFrontsRequired
ISSUE_898 = 27,
MAZDA_626 = 28, MAZDA_626 = 28,

2
firmware/controllers/engine_controller.cpp
View File

@ -812,6 +812,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0) if (initBootloader() != 0)
return 123; return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */ #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20190806; return 20190808;
} }
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */

2
unit_tests/tests/test_issue_898.cpp
View File

@ -15,7 +15,7 @@ static void boardConfigurationForIssue898(engine_configuration_s *engineConfigur
} }
TEST(issues, issue898) { TEST(issues, issue898) {
EngineTestHelper eth(MRE_MIATA_NA6, &boardConfigurationForIssue898); EngineTestHelper eth(ISSUE_898, &boardConfigurationForIssue898);
EXPAND_EngineTestHelper; EXPAND_EngineTestHelper;
ASSERT_EQ(TRUE, engine->triggerCentral.triggerShape.shapeDefinitionError) << "MRE_MIATA_NA6 shapeDefinitionError"; ASSERT_EQ(TRUE, engine->triggerCentral.triggerShape.shapeDefinitionError) << "MRE_MIATA_NA6 shapeDefinitionError";