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

only: mazda engine types rename

This commit is contained in:
Andrey 2024-03-06 00:47:01 -05:00 committed by rusefillc
parent 0f55a83961
commit e7415482f9
8 changed files with 23 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/config/boards/hellen/hellen-nb1/board.mk
View File

@ -2,9 +2,8 @@
# Target ECU board design
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal hellen-nb1
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_NB1
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::MAZDA_MIATA_NB1
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

2
firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
View File

@ -4,7 +4,7 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal hellen64_miataNA6_94
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_NA6
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::MAZDA_MIATA_NA6
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

3
firmware/config/boards/hellen/hellenNA8_96/board.mk
View File

@ -2,9 +2,8 @@
# Target ECU board design
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal hellen-nb1
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::MAZDA_NA8_96
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::MAZDA_MIATA_NA96
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

64
firmware/config/engines/mazda/mazda_miata_vvt.cpp
View File

@ -589,70 +589,6 @@ void setMiataNB2_Proteus_TCU() {
config->tcuSolenoidTable[5][0] = 0;
config->tcuSolenoidTable[5][1] = 0;
}
/**
* https://github.com/rusefi/rusefi/wiki/HOWTO-Miata-NB2-on-Proteus
*/
void setMiataNB2_Proteus() {
setMazdaMiataEngineNB2Defaults();
engineConfiguration->triggerInputPins[0] = Gpio::C6; // pin 10/black23
engineConfiguration->triggerInputPins[1] = Gpio::Unassigned;
engineConfiguration->camInputs[0] = Gpio::E11; // pin 1/black23
engineConfiguration->alternatorControlPin = Gpio::A8; // "Highside 2" # pin 1/black35
engineConfiguration->vvtPins[0] = Gpio::B5; // VVT solenoid control # pin 8/black35
// high-side driver with +12v VP jumper
engineConfiguration->tachOutputPin = Gpio::A9; // tachometer
engineConfiguration->tachPulsePerRev = 2;
engineConfiguration->ignitionMode = IM_WASTED_SPARK;
#if EFI_PROD_CODE
engineConfiguration->ignitionPins[0] = Gpio::PROTEUS_IGN_1;
engineConfiguration->ignitionPins[1] = Gpio::Unassigned;
engineConfiguration->ignitionPins[2] = Gpio::PROTEUS_IGN_3;
engineConfiguration->ignitionPins[3] = Gpio::Unassigned;
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_SEQUENTIAL;
engineConfiguration->injectionPins[0] = Gpio::PROTEUS_LS_1; // BLU # pin 3/black35
engineConfiguration->injectionPins[1] = Gpio::PROTEUS_LS_2; // BLK
engineConfiguration->injectionPins[2] = Gpio::PROTEUS_LS_3; // GRN
engineConfiguration->injectionPins[3] = Gpio::PROTEUS_LS_4; // WHT
engineConfiguration->enableSoftwareKnock = true;
engineConfiguration->malfunctionIndicatorPin = Gpio::PROTEUS_LS_10;
engineConfiguration->map.sensor.hwChannel = PROTEUS_IN_MAP;
engineConfiguration->afr.hwChannel = EFI_ADC_11;
engineConfiguration->mafAdcChannel = EFI_ADC_13; // PA6 W46 <> W46
engineConfiguration->tps1_1AdcChannel = EFI_ADC_12;
engineConfiguration->clt.adcChannel = PROTEUS_IN_ANALOG_TEMP_1;
engineConfiguration->iat.adcChannel = PROTEUS_IN_ANALOG_TEMP_3;
engineConfiguration->fuelPumpPin = Gpio::PROTEUS_LS_6;
engineConfiguration->idle.solenoidPin = Gpio::PROTEUS_LS_7;
engineConfiguration->fanPin = Gpio::B7;
engineConfiguration->mainRelayPin = Gpio::G12;
#endif // EFI_PROD_CODE
}
#endif // HW_PROTEUS

5
firmware/config/engines/mazda/mazda_miata_vvt.h
View File

@ -24,11 +24,6 @@ void setMazdaMiata2003EngineConfiguration();
*/
void setMiataNB2_Proteus_TCU();
/**
* set engine_type 67
*/
void setMiataNB2_Proteus();
/**
* set engine_type 69
*/

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

@ -738,7 +738,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
mreBCM();
break;
#endif // HW_MICRO_RUSEFI
case engine_type_e::MIATA_NC:
case engine_type_e::HONDA_OBD1:
setHondaObd1();
break;
@ -804,10 +803,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::PROTEUS_STIM_QC:
proteusStimQc();
break;
case engine_type_e::PROTEUS_N73:
case engine_type_e::PROTEUS_MIATA_NB2:
setMiataNB2_Proteus();
break;
case engine_type_e::GM_SBC:
setGmSbc();
break;
@ -862,7 +857,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
#endif
#if HW_HELLEN_NB1
case engine_type_e::HELLEN_NB1:
case engine_type_e::MAZDA_MIATA_NB1:
setHellenNB1();
break;
#endif
@ -871,7 +866,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::MAZDA_MIATA_NB2:
setMiataNB2_Hellen72();
break;
case engine_type_e::HELLEN_NB2_36:
case engine_type_e::MAZDA_MIATA_NB2_36:
setMiataNB2_Hellen72_36();
break;
#endif
@ -899,16 +894,16 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::TOYOTA_1NZ_FE:
setToyota1NZFE();
break;
case engine_type_e::MAZDA_NA8_96:
case engine_type_e::MAZDA_MIATA_NA96:
setMazdaMiata96();
break;
case engine_type_e::HELLEN_121_VAG_4_CYL:
case engine_type_e::HELLEN_154_VAG:
break;
case engine_type_e::HELLEN_NA6:
case engine_type_e::MAZDA_MIATA_NA6:
setHellenNA6();
break;
case engine_type_e::HELLEN_NA94:
case engine_type_e::MAZDA_MIATA_NA94:
setHellenNA94();
break;
case engine_type_e::HELLEN_HONDA_BCM:
@ -1014,9 +1009,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::TEST_33816:
setTest33816EngineConfiguration();
break;
case engine_type_e::TEST_100:
case engine_type_e::TEST_101:
case engine_type_e::TEST_102:
case engine_type_e::TEST_ROTARY:
setRotary();
break;

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

@ -46,7 +46,7 @@ enum class engine_type_e : uint16_t {
GY6_139QMB = 8,
PROTEUS_E65_6H_MAN_IN_THE_MIDDLE = 9,
MAZDA_NA8_96 = 10,
MAZDA_MIATA_NA96 = 10,
FORD_COYOTE = 11,
MITSUBISHI_3A92 = 12,
TOYOTA_1NZ_FE = 13,
@ -61,7 +61,7 @@ enum class engine_type_e : uint16_t {
TEST_ROTARY = 19,
// Frankenso board
FRANKENSO_MIATA_NA6_MAP = 41,
MIATA_NC = 20,
MAZDA_MIATA_NC = 20,
UNUSED_21 = 21,
// BMW e36 etc
@ -95,7 +95,7 @@ enum class engine_type_e : uint16_t {
ME17_9_MISC = 33,
HELLEN_NA6 = 34,
MAZDA_MIATA_NA6 = 34,
ET_UNUSED_35 = 35,
@ -107,6 +107,7 @@ enum class engine_type_e : uint16_t {
PROTEUS_VW_B6 = 39,
// used by unit tests and HW CI
FRANKENSO_BMW_M73_F = 40,
PROTEUS_QC_TEST_BOARD = 42,
@ -150,7 +151,7 @@ enum class engine_type_e : uint16_t {
DODGE_RAM = 64,
UNUSED_65 = 65,
HONDA_OBD1 = 66,
PROTEUS_MIATA_NB2 = 67,
UNUSED67 = 67,
MRE_M111 = 68,
MAZDA_MIATA_NB2 = 69,
@ -169,17 +170,17 @@ enum class engine_type_e : uint16_t {
HELLEN_121_VAG_VR6_CYL = 79,
HELLEN_121_VAG_8_CYL = 81,
HELLEN_NA94 = 80,
MAZDA_MIATA_NA94 = 80,
// 82
HELLEN_154_HYUNDAI_COUPE_BK1 = 82,
HELLEN_NB1 = 83,
MAZDA_MIATA_NB1 = 83,
// 84
HELLEN_121_NISSAN_4_CYL = 84,
HELLEN_121_NISSAN_8_CYL = 85,
HELLEN_NB2_36 = 86,
MAZDA_MIATA_NB2_36 = 86,
HELLEN_121_NISSAN_ALMERA_N16 = 87,
@ -211,7 +212,7 @@ enum class engine_type_e : uint16_t {
// use this in case of emergency without github actions? :)
TEST_100 = 100,
TEST_101 = 101,
TEST_102 = 102,
UNUSED102 = 102,
PROTEUS_NISSAN_VQ35 = 103,

19
firmware/tunerstudio/rusefi.input
View File

@ -2218,11 +2218,10 @@ cmd_set_engine_type_TOYOTA_1NZ_FE = "@@TS_IO_TEST_COMMAND_char@@@@ts_comman
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@@"
cmd_set_engine_type_hellen_NA6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HELLEN_NA6_16_hex@@"
cmd_set_engine_type_hellen_NA94 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HELLEN_NA94_16_hex@@"
cmd_set_engine_type_MAZDA_MIATA_NA6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MAZDA_MIATA_NA6_16_hex@@"
cmd_set_engine_type_MAZDA_MIATA_NA94 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MAZDA_MIATA_NA94_16_hex@@"
cmd_set_engine_type_hellen_NB1_36 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HELLEN_NB1_36_16_hex@@"
cmd_set_engine_type_hellen_NB2_36 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HELLEN_NB2_36_16_hex@@"
cmd_set_engine_type_MAZDA_MIATA_NB2_36 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MAZDA_MIATA_NB2_36_16_hex@@"
cmd_set_engine_type_hellen_nissan_121_4 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HELLEN_121_NISSAN_4_CYL_16_hex@@"
cmd_set_engine_type_hellen_nissan_121_6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HELLEN_121_NISSAN_6_CYL_16_hex@@"
@ -2243,8 +2242,6 @@ cmd_set_engine_type_hellen_coupe_bk2 = "@@TS_IO_TEST_COMMAND_char@@@@ts_comm
; MIATA_NA6_MAP = 41
cmd_set_engine_type_Frankenso_Miata_NA6_MAP = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_FRANKENSO_MIATA_NA6_MAP_16_hex@@"
; MAZDA_MIATA_2003 = 47
cmd_set_engine_type_Frankenso_Miata_NB2 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_FRANKENSO_MAZDA_MIATA_2003_16_hex@@"
cmd_set_engine_type_FUEL_BENCH = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_FUEL_BENCH_16_hex@@"
@ -2253,7 +2250,6 @@ cmd_set_engine_type_PROTEUS_VW_B6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command
cmd_set_engine_type_PROTEUS_GM_LS_4 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_GM_LS_4_16_hex@@"@@if_show_Proteus_presets
cmd_set_engine_type_PROTEUS_HONDA_K = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HONDA_K_16_hex@@"@@if_show_Proteus_presets
cmd_set_engine_type_HONDA_OBD2A = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HONDA_OBD2A_16_hex@@"@@if_show_Proteus_presets
cmd_set_engine_type_PROTEUS_MIATA_NB2 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_MIATA_NB2_16_hex@@"@@if_show_Proteus_presets
cmd_set_engine_type_Proteus_Miata_TCU = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MIATA_PROTEUS_TCU_16_hex@@"@@if_show_Proteus_presets
cmd_set_engine_type_PROTEUS_LUA_DEMO = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_LUA_DEMO_16_hex@@"@@if_show_Proteus_presets
cmd_set_engine_type_HARLEY = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HARLEY_16_hex@@"@@if_show_Proteus_presets
@ -4557,7 +4553,6 @@ dialog = tcuControls, "Transmission Settings"
field = "!These buttons send a command to rusEFI controller to apply preset values"
field = "!Once you send the command, please reconnect to rusEFI controller in order to read fresh values"
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 = "Honda OBD1", cmd_set_engine_type_HONDA_OBD1
@ -4582,7 +4577,6 @@ dialog = tcuControls, "Transmission Settings"
commandButton = "Proteus SBC", cmd_set_engine_type_GM_SBC@@if_show_Proteus_presets
; commandButton = "Proteus Miata TCU", cmd_set_engine_type_Proteus_Miata_TCU@@if_show_Proteus_presets
commandButton = "Proteus Lua Demo", cmd_set_engine_type_PROTEUS_LUA_DEMO@@if_show_Proteus_presets
commandButton = "Proteus Miata NB2", cmd_set_engine_type_PROTEUS_MIATA_NB2@@if_show_Proteus_presets
commandButton = "Proteus Honda K", cmd_set_engine_type_PROTEUS_HONDA_K@@if_show_Proteus_presets
; commandButton = "Proteus Honda OBD2A", cmd_set_engine_type_HONDA_OBD2A@@if_show_Proteus_presets
commandButton = "Proteus Harley", cmd_set_engine_type_HARLEY@@if_show_Proteus_presets
@ -4594,11 +4588,10 @@ dialog = tcuControls, "Transmission Settings"
commandButton = "SBC", cmd_set_engine_type_GM_SBC@@if_show_8chan_presets
commandButton = "Honda BCM", cmd_set_engine_type_SMALL_CB_HONDA_BCM@@if_show_small_can_board_presets
commandButton = "Hellen NA6", cmd_set_engine_type_hellen_NA6@@if_show_HellenNA6_presets
commandButton = "Hellen NA8 94-95", cmd_set_engine_type_hellen_NA94@@if_show_HellenNA6_presets
commandButton = "Mazda Miata NA6", cmd_set_engine_type_MAZDA_MIATA_NA6@@if_show_HellenNA6_presets
commandButton = "Mazda Miata NA8 94-95", cmd_set_engine_type_MAZDA_MIATA_NA94@@if_show_HellenNA6_presets
commandButton = "Hellen NB1 36 wheel", cmd_set_engine_type_hellen_NB2_36@@if_show_HellenNB1_presets
commandButton = "Hellen NB2 36 wheel", cmd_set_engine_type_hellen_NB2_36@@if_show_HellenNB2_presets
commandButton = "Hellen NB2 36 wheel", cmd_set_engine_type_MAZDA_MIATA_NB2_36@@if_show_HellenNB2_presets
commandButton = "Hellen Nissan 4 cylinder", cmd_set_engine_type_hellen_nissan_121_4@@if_show_Hellen121nissan_presets
commandButton = "Hellen Nissan 6 cylinder", cmd_set_engine_type_hellen_nissan_121_6@@if_show_Hellen121nissan_presets