andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only:let's export all just for simplicity

This commit is contained in:
rusefillc 2024-10-07 11:19:35 -04:00 committed by Andrey
parent 1e6a01b5ea
commit 5d74fae320
5 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -874,23 +874,6 @@ void proteusStimQc() {
}
#endif // HW_PROTEUS
#ifdef HW_HELLEN_4CHAN
// HELLEN_4CHAN_STIM_QC
// set engine_type 74
void alphax4chanStimQc() {
engineConfiguration->trigger.type = trigger_type_e::TT_ONE_PLUS_ONE;
engineConfiguration->vvtMode[0] = VVT_SINGLE_TOOTH;
engineConfiguration->vvtMode[1] = VVT_SINGLE_TOOTH;
engineConfiguration->triggerInputPins[0] = Gpio::H144_IN_CAM; // C7
engineConfiguration->triggerInputPins[1] = Gpio::H144_IN_D_4; // E6
engineConfiguration->camInputs[0] = Gpio::H144_IN_VSS; // C4
engineConfiguration->camInputs[1] = Gpio::H144_IN_D_AUX4; // E7
engineConfiguration->camInputs[2] = Gpio::H144_IN_SENS2; // E3
engineConfiguration->camInputs[3] = Gpio::H144_IN_SENS3; // E4
}
#endif // HW_HELLEN_4CHAN
// set engine_type 93
void testEngine6451() {
#ifdef HW_FRANKENSO

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

@ -40,5 +40,4 @@ void setVrThresholdTest();
void detectBoardType();
void alphax4chanStimQc();
void testEngine6451();

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

@ -31,7 +31,7 @@
#if EFI_ONBOARD_MEMS
#include "accelerometer.h"
#endif
#endif // EFI_ONBOARD_MEMS
#include "defaults.h"
@ -740,17 +740,49 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
* And override them with engine-specific defaults
*/
switch (engineType) {
case engine_type_e::ET_AUX_0:
case engine_type_e::ET_AUX_1:
case engine_type_e::ET_AUX_2:
case engine_type_e::ET_AUX_3:
case engine_type_e::ET_AUX_4:
case engine_type_e::ET_AUX_5:
case engine_type_e::ET_AUX_6:
case engine_type_e::ET_AUX_7:
case engine_type_e::FORD_COYOTE:
case engine_type_e::MAZDA_MIATA_NC:
case engine_type_e::DISCOVERY_PDM:
case engine_type_e::UNUSED47:
case engine_type_e::UNUSED49:
case engine_type_e::ET_UNUSED_55:
case engine_type_e::ET_UNUSED_56:
case engine_type_e::UNUSED_65:
case engine_type_e::UNUSED67:
case engine_type_e::UNUSED94:
case engine_type_e::UNUSED_97:
case engine_type_e::TEST_100:
case engine_type_e::TEST_101:
case engine_type_e::UNUSED102:
case engine_type_e::HELLEN_4CHAN_STIM_QC:
case engine_type_e::HELLEN_2CHAN_STIM_QC:
case engine_type_e::HELLEN_154_VAG:
case engine_type_e::HELLEN_121_NISSAN_8_CYL:
case engine_type_e::HELLEN_121_NISSAN_ALMERA_N16:
case engine_type_e::SIMULATOR_CONFIG:
case engine_type_e::HELLEN_121_VAG_4_CYL:
case engine_type_e::MINIMAL_PINS:
// all basic settings are already set in prepareVoidConfiguration(), no need to set anything here
// nothing to do - we do it all in setBoardDefaultConfiguration
break;
#if EFI_UNIT_TEST
#if EFI_UNIT_TEST || EFI_SIMULATOR
case engine_type_e::TEST_ISSUE_366_BOTH:
#if EFI_UNIT_TEST
setTestEngineIssue366both();
#endif
break;
case engine_type_e::TEST_ISSUE_366_RISE:
#if EFI_UNIT_TEST
setTestEngineIssue366rise();
#endif
break;
case engine_type_e::ET_BOSCH_QUICK_START:
setTestEngineBoschQuickStart();
@ -760,9 +792,11 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
break;
#endif // EFI_UNIT_TEST
#if EFI_TCU
#if EFI_TCU || EFI_SIMULATOR
case engine_type_e::TCU_4R70W:
#if EFI_TCU
configureTcu4R70W();
#endif // EFI_TCU
break;
#endif //EFI_TCU
@ -850,7 +884,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
break;
#endif
#if HW_PROTEUS
#if HW_PROTEUS || EFI_SIMULATOR
case engine_type_e::WASTEGATE_PROTEUS_TEST:
proteusDcWastegateTest();
break;
@ -884,14 +918,16 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::GM_SBC:
setGmSbc();
break;
#ifdef HARDWARE_CI
#if defined(HARDWARE_CI) || EFI_SIMULATOR
case engine_type_e::PROTEUS_ANALOG_PWM_TEST:
#if defined(HARDWARE_CI)
setProteusAnalogPwmTest();
#endif
break;
#endif // HARDWARE_CI
#endif // HW_PROTEUS
#ifdef HW_HELLEN_MERCEDES
#if defined(HW_HELLEN_MERCEDES) || EFI_SIMULATOR
case engine_type_e::HELLEN_128_MERCEDES_4_CYL:
setHellenMercedes128_4_cyl();
break;
@ -921,19 +957,13 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
break;
#endif
#ifdef HW_HELLEN_4CHAN
case engine_type_e::HELLEN_4CHAN_STIM_QC:
alphax4chanStimQc();
break;
#endif // HW_HELLEN_4CHAN
#if defined(HW_HELLEN_8CHAN) || defined(HW_HELLEN_UAEFI121)
case engine_type_e::GM_SBC:
setGmSbc();
break;
#endif
#ifdef HW_HELLEN_121_VAG
#if defined(HW_HELLEN_121_VAG) || EFI_SIMULATOR
case engine_type_e::VAG_5_CYL:
setVag_5_cyl();
break;
@ -960,7 +990,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
setHondaCivicBcm();
break;
#endif // HW_HELLEN
#if defined(HW_FRANKENSO) || HW_PROTEUS
#if defined(HW_FRANKENSO) || HW_PROTEUS || EFI_SIMULATOR
// used in HW CI
case engine_type_e::VW_ABA:
setVwAba();
@ -974,12 +1004,14 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
testEngine6451();
break;
#if defined(HW_FRANKENSO)
#if defined(HW_FRANKENSO) || EFI_SIMULATOR
case engine_type_e::DEFAULT_FRANKENSO:
setFrankensoConfiguration();
break;
case engine_type_e::FRANKENSO_TEST_33810:
#if EFI_PROD_CODE
setDiscovery33810Test();
#endif
break;
case engine_type_e::TEST_ENGINE:
setTestCamEngineConfiguration();
@ -1056,7 +1088,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::BMW_M52:
bmwM52();
break;
#ifdef HW_SUBARU_EG33
#if defined(HW_SUBARU_EG33) || EFI_SIMULATOR
case engine_type_e::SUBARU_EG33:
setSubaruEG33Defaults();
break;

3
firmware/controllers/algo/engine_types.h
View File

@ -225,6 +225,9 @@ enum class engine_type_e : uint16_t {
ET_AUX_5 = 111,
ET_AUX_6 = 112,
ET_AUX_7 = 113,
// [CannedTunes] please keep this always last always unused
ET_LAST_UNUSED = 114,
};
/**

22
simulator/simulator/rusEfiFunctionalTest.cpp
View File

@ -182,25 +182,9 @@ void rusEfiFunctionalTest() {
initFlash();
// [CannedTunes] at the moment we manually sync this list with WriteSimulatorConfiguration.java
for (auto const type : {
engine_type_e::MERCEDES_M111,
engine_type_e::BMW_M52,
engine_type_e::MAZDA_MIATA_NA6,
engine_type_e::MAZDA_MIATA_NA94,
engine_type_e::MAZDA_MIATA_NA96,
engine_type_e::MAZDA_MIATA_NB1,
engine_type_e::MAZDA_MIATA_NB2,
engine_type_e::HONDA_OBD1,
engine_type_e::HONDA_K,
engine_type_e::HELLEN_121_NISSAN_6_CYL,
engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK1,
engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2,
engine_type_e::POLARIS_RZR,
engine_type_e::HYUNDAI_PB,
engine_type_e::MAVERICK_X3,
engine_type_e::HARLEY,
} ) {
// [CannedTunes] let's export all just for simplicity. See also WriteSimulatorConfiguration.java
for (size_t typeIndex = 0;typeIndex<(size_t)engine_type_e::ET_LAST_UNUSED;typeIndex++) {
engine_type_e type = (engine_type_e)typeIndex;
writeEngineTypeDefaultConfig(type);
}