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

MRE for Miata does not exist, also Frankenso method inline (#347) 

* MRE for Miata does not exist, also Frankenso method inline

* MRE nor Frankenstein for Miata do not exist, also Frankenso method inline

---------

Co-authored-by: rusefillc <sdfsdfqsf2334234234>
This commit is contained in:
rusefillc 2024-03-18 14:31:41 -04:00 committed by GitHub
parent 8aebc4ad75
commit addb01f04f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 11 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
firmware/config/engines/mazda_miata.cpp
View File

@ -72,35 +72,6 @@ static const uint8_t miataNA8_maf_advance_table[16][16] = { {/*0 engineLoad=1.2
+29, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+27 } };
#endif
static void commonMiataNa() {
engineConfiguration->trigger.type = trigger_type_e::TT_MAZDA_MIATA_NA;
engineConfiguration->engineChartSize = 100;
engineConfiguration->triggerInputPins[0] = Gpio::C6; // 2G YEL/BLU
engineConfiguration->triggerInputPins[1] = Gpio::A5; // 2E White CKP
engineConfiguration->ignitionMode = IM_WASTED_SPARK;
engineConfiguration->idle.solenoidFrequency = 160;
// Frankenstein: high side #1 is PE8
// Frankenstein: high side #2 is PE10
// Frankenstein: high side #3 is PE12
// Frankenstein: high side #4 is PE14
// Frankenstein: high side #5 is PC9
// Frankenstein: high side #6 is PC7
engineConfiguration->ignitionPins[0] = Gpio::E12; // Frankenstein: high side #3
engineConfiguration->ignitionPins[1] = Gpio::E14; // Frankenstein: high side #4
engineConfiguration->ignitionPins[2] = Gpio::Unassigned;
engineConfiguration->ignitionPins[3] = Gpio::Unassigned;
engineConfiguration->cranking.baseFuel = 24;
setCommonNTCSensor(&engineConfiguration->clt, 2700);
setCommonNTCSensor(&engineConfiguration->iat, 2700);
}
void common079721_2351() {
engineConfiguration->engineChartSize = 300;
@ -132,42 +103,3 @@ void common079721_2351() {
engineConfiguration->clt.adcChannel = EFI_ADC_11;
}
/**
* Tom tomiata, Frankenstein board
*/
void setFrankensteinMiata1996() {
commonMiataNa();
engineConfiguration->displacement = 1.839;
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
copyTable(config->ignitionTable, miataNA8_maf_advance_table);
#endif
// upside down
engineConfiguration->triggerInputPins[0] = Gpio::A5;
engineConfiguration->triggerInputPins[1] = Gpio::C6;
engineConfiguration->fuelPumpPin = Gpio::E4;
engineConfiguration->idle.solenoidPin = Gpio::E5;
engineConfiguration->mafAdcChannel = EFI_ADC_1;
engineConfiguration->clt.adcChannel = EFI_ADC_11;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_13;
engineConfiguration->ignitionPins[0] = Gpio::E12; // Frankenstein: high side #3
engineConfiguration->ignitionPins[1] = Gpio::Unassigned;
engineConfiguration->ignitionPins[2] = Gpio::E14; // Frankenstein: high side #4
engineConfiguration->ignitionPins[3] = Gpio::Unassigned;
// harness is sequential but we have a limited board
engineConfiguration->crankingInjectionMode = IM_BATCH;
engineConfiguration->injectionMode = IM_BATCH;
engineConfiguration->injectionPins[0] = Gpio::B9; // Frankenstein: low side - out #12
engineConfiguration->injectionPins[1] = Gpio::B8; // Frankenstein: low side - out #11
engineConfiguration->injectionPins[2] = Gpio::Unassigned;
engineConfiguration->injectionPins[3] = Gpio::Unassigned;
engineConfiguration->injectionPins[4] = Gpio::Unassigned;
engineConfiguration->injectionPins[5] = Gpio::Unassigned;
}

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

@ -14,4 +14,3 @@
#include "engine_configuration.h"
void common079721_2351();
void setFrankensteinMiata1996();

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

@ -218,15 +218,6 @@ void miataNAcommonEngineSettings() {
engineConfiguration->stft.cellCfgs[3] = { 5, -5, 30 };
}
static void miataNAcommon() {
engineConfiguration->idle.solenoidPin = Gpio::B9; // this W61 <> W61 jumper, pin 3W
engineConfiguration->ignitionPins[0] = Gpio::E14; // Frankenso high side - pin 1G
engineConfiguration->ignitionPins[1] = Gpio::Unassigned;
engineConfiguration->ignitionPins[2] = Gpio::C7; // Frankenso high side - pin 1H
engineConfiguration->ignitionPins[3] = Gpio::Unassigned;
}
/**
* MIATA_NA6_MAP
*/
@ -271,90 +262,12 @@ void setMiataNA6_MAP_Frankenso() {
// W58 PE4 A/C fan relay out
#endif /* EFI_UNIT_TEST */
miataNAcommon();
}
/**
* set engine_type 66
*/
void setMiataNA6_MAP_MRE() {
miataNAcommonEngineSettings();
engineConfiguration->triggerInputPins[0] = Gpio::A5;
engineConfiguration->triggerInputPins[1] = Gpio::C6;
engineConfiguration->camInputs[0] = Gpio::Unassigned;
engineConfiguration->fuelPumpPin = Gpio::Unassigned;
engineConfiguration->useIacTableForCoasting = true;
engineConfiguration->idlePidDeactivationTpsThreshold = 90;
engineConfiguration->idleRpmPid.pFactor = 0.01;
engineConfiguration->idleRpmPid.iFactor = 0.02;
engineConfiguration->idle_derivativeFilterLoss = 0.1;
engineConfiguration->idle_antiwindupFreq = 0.1;
engineConfiguration->idleRpmPid.dFactor = 0.002;
engineConfiguration->acIdleExtraOffset = 14;
engineConfiguration->idleRpmPid.minValue = -7;
engineConfiguration->idleRpmPid.maxValue = 35;
engineConfiguration->idleRpmPid.periodMs = 40;
engineConfiguration->idlerpmpid_iTermMin = -6;
engineConfiguration->idlerpmpid_iTermMax = 30;
engineConfiguration->pidExtraForLowRpm = 25;
engineConfiguration->idlePidRpmDeadZone = 25;
engineConfiguration->idlePidRpmUpperLimit = 1000;
engineConfiguration->useIdleTimingPidControl = true;
engineConfiguration->idleTimingPid.pFactor = 0.05;
engineConfiguration->idleTimingPid.iFactor = 0.0;
engineConfiguration->idleTimingPid.dFactor = 0.0;
engineConfiguration->idleTimingPid.minValue = -13;
engineConfiguration->idleTimingPid.maxValue = 13;
// EFI_ADC_3: "22 - AN temp 4"
engineConfiguration->acSwitch = Gpio::A3;
#if HW_MICRO_RUSEFI
// todo: ask Stefan to clarify this
engineConfiguration->tps1_1AdcChannel = MRE_IN_ANALOG_VOLT_2; // "26 - AN volt 2"
engineConfiguration->tpsMin = 0;
engineConfiguration->tpsMax = 982;
engineConfiguration->map.sensor.hwChannel = MRE_IN_ANALOG_VOLT_5; // "20 - AN volt 5"
engineConfiguration->mafAdcChannel = MRE_IN_ANALOG_VOLT_9; // "40 - AN volt 9"
#endif // HW_MICRO_RUSEFI
#if (BOARD_TLE8888_COUNT > 0)
// Gpio::G1: "Clutch Switch"
engineConfiguration->clutchDownPin = Gpio::G1;
engineConfiguration->fanPin = Gpio::Unassigned;
// Gpio::TLE8888_PIN_23: "33 - GP Out 3"
engineConfiguration->malfunctionIndicatorPin = Gpio::TLE8888_PIN_23;
#endif /* BOARD_TLE8888_COUNT */
}
void setMiata94_MAP_MRE() {
setMiataNA6_MAP_MRE();
#if (BOARD_TLE8888_COUNT > 0)
// "35 - GP Out 1"
engineConfiguration->fuelPumpPin = Gpio::TLE8888_PIN_21;
#endif /* BOARD_TLE8888_COUNT */
engineConfiguration->injectionMode = IM_SEQUENTIAL;
engineConfiguration->displacement = 1.8;
strcpy(engineConfiguration->engineMake, ENGINE_MAKE_MAZDA);
strcpy(engineConfiguration->engineCode, "94");
engineConfiguration->map.sensor.type = MT_MPX4250;
engineConfiguration->idle.solenoidPin = Gpio::B9; // this W61 <> W61 jumper, pin 3W
engineConfiguration->ignitionPins[0] = Gpio::E14; // Frankenso high side - pin 1G
engineConfiguration->ignitionPins[1] = Gpio::Unassigned;
engineConfiguration->ignitionPins[2] = Gpio::C7; // Frankenso high side - pin 1H
engineConfiguration->ignitionPins[3] = Gpio::Unassigned;
}
void setHellenNA94() {

6
firmware/config/engines/mazda_miata_1_6.h
View File

@ -14,12 +14,6 @@
*/
void setMiataNA6_MAP_Frankenso();
void setMiataNA6_MAP_MRE();
/**
* set engine_type 20
*/
void setMiata94_MAP_MRE();
void miataNAcommonEngineSettings();
/**

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

@ -683,12 +683,8 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::BMW_M73_MRE_SLAVE:
setEngineBMW_M73_microRusEfi();
break;
case engine_type_e::MRE_MIATA_94_MAP:
setMiata94_MAP_MRE();
break;
case engine_type_e::MRE_MIATA_NA6_MAP:
setMiataNA6_MAP_MRE();
break;
case engine_type_e::ET_UNUSED_20:
case engine_type_e::ET_UNUSED_66:
case engine_type_e::MRE_BODY_CONTROL:
mreBCM();
break;
@ -863,9 +859,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::FORD_ESCORT_GT:
setFordEscortGt();
break;
case engine_type_e::MIATA_1996:
setFrankensteinMiata1996();
break;
case engine_type_e::ET_UNUSED_21:
case engine_type_e::CITROEN_TU3JP:
setCitroenBerlingoTU3JPConfiguration();
break;

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

@ -44,13 +44,13 @@ enum class engine_type_e : uint32_t {
PROTEUS_E65_6H_MAN_IN_THE_MIDDLE = 9,
HELLEN_NA8_96 = 10,
MRE_MIATA_NA6_MAP = 66,
ET_UNUSED_66 = 66,
TEST_ROTARY = 19,
// Frankenso board
FRANKENSO_MIATA_NA6_MAP = 41,
MRE_MIATA_94_MAP = 20,
MIATA_1996 = 21,
ET_UNUSED_20 = 20,
ET_UNUSED_21 = 21,
FORD_ESCORT_GT = 14,

6
firmware/tunerstudio/rusefi.input
View File

@ -2095,10 +2095,6 @@ cmd_openblt = "@@TS_IO_TEST_COMMAND_char@@\x00\xbc\x00\x00"
cmd_set_engine_type_microRusEFI_VW_B6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_VW_B6_16_hex@@"
cmd_set_engine_type_microRusEFI_MRE_BODY_CONTROL = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_BODY_CONTROL_16_hex@@"
cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_MIATA_NA6_MAP_16_hex@@"
cmd_set_engine_type_microRusEFI_Miata_94_MAP = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_MIATA_94_MAP_16_hex@@"
cmd_set_engine_type_MRE_SUBARU_EJ18 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_SUBARU_EJ18_16_hex@@"
cmd_set_engine_type_MRE_M111 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_M111_16_hex@@"
@ -4296,8 +4292,6 @@ dialog = tcuControls, "Transmission Settings"
commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP@@if_show_Frankenso_presets
commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2@@if_show_Frankenso_presets
commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP@@if_show_microRusEFI_presets
commandButton = "microRusEFI Miata 94/95 MAP", cmd_set_engine_type_microRusEFI_Miata_94_MAP@@if_show_microRusEFI_presets
commandButton = "microRusEFI GDI VAG B6 test", cmd_set_engine_type_microRusEFI_VW_B6@@if_show_microRusEFI_presets
commandButton = "microRusEFI BCM", cmd_set_engine_type_microRusEFI_MRE_BODY_CONTROL@@if_show_microRusEFI_presets
commandButton = "microRusEFI Subaru EJ18", cmd_set_engine_type_MRE_SUBARU_EJ18@@if_show_microRusEFI_presets