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

only:K

This commit is contained in:
rusefillc 2023-11-25 19:59:15 -05:00
parent aaf597b6c3
commit 723b9d5995
6 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firmware/config/engines/honda_k_dbc.cpp
View File

@ -61,18 +61,14 @@ void setHondaK() {
gppwm_channel *vtsControl = &engineConfiguration->gppwm[0];
vtsControl->pwmFrequency = 0;
strcpy(engineConfiguration->gpPwmNote[0], "VTS");
}
/**
* K24A4 engine
* PROTEUS_HONDA_K
* HONDA_K
*/
void setProteusHondaElement2003() {
setHondaK();
strcpy(engineConfiguration->vehicleName, "test");
#if HW_PROTEUS & EFI_PROD_CODE
strcpy(engineConfiguration->vehicleName, "test");
// engineConfiguration->triggerInputPins[0] = PROTEUS_DIGITAL_2; // crank
// engineConfiguration->camInputs[0] = PROTEUS_DIGITAL_4; // intake
// engineConfiguration->camInputs[1 * CAMS_PER_BANK] = PROTEUS_DIGITAL_1; // exhaust
@ -88,7 +84,6 @@ void setProteusHondaElement2003() {
engineConfiguration->injectionPins[2] = Gpio::PROTEUS_LS_6;
engineConfiguration->injectionPins[3] = Gpio::PROTEUS_LS_5;
gppwm_channel *vtsControl = &engineConfiguration->gppwm[0];
vtsControl->pin = Gpio::PROTEUS_HS_1;
engineConfiguration->vvtPins[0] = Gpio::PROTEUS_HS_2;

2
firmware/config/engines/honda_k_dbc.h
View File

@ -10,5 +10,5 @@
#include "engine_configuration.h"
void setHondaK();
void setProteusHondaElement2003();
void setProteusHondaOBD2A();

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

@ -746,6 +746,12 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
break;
#endif
#if HW_PROTEUS || HW_HELLEN_HONDA
case engine_type_e::HONDA_K:
setHondaK();
break;
#endif
#if HW_PROTEUS
case engine_type_e::MAVERICK_X3:
setMaverickX3();
@ -783,9 +789,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::MIATA_PROTEUS_TCU:
setMiataNB2_Proteus_TCU();
break;
case engine_type_e::PROTEUS_HONDA_K:
setProteusHondaElement2003();
break;
case engine_type_e::PROTEUS_HONDA_OBD2A:
setProteusHondaOBD2A();
break;

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

@ -198,7 +198,7 @@ enum class engine_type_e : uint16_t {
HELLEN_128_MERCEDES_8_CYL = 89,
PROTEUS_HONDA_K = 90,
HONDA_K = 90,
PROTEUS_HONDA_OBD2A = 91,

12
firmware/tunerstudio/rusefi.input
View File

@ -2211,7 +2211,7 @@ cmd_set_engine_type_FUEL_BENCH = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e
cmd_set_engine_type_Proteus_M73 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_BMW_M73_16_hex@@"@@if_show_Proteus_presets
cmd_set_engine_type_PROTEUS_VW_B6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_VW_B6_16_hex@@"@@if_show_Proteus_presets
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_PROTEUS_HONDA_K_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_PROTEUS_HONDA_OBD2A = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_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
@ -4415,29 +4415,29 @@ dialog = tcuControls, "Transmission Settings"
; commandButton = "Mitsubishi 3A92", cmd_set_engine_type_MITSUBISHI_3A92
; commandButton = "Mitsubishi 4G93", cmd_set_engine_type_MITSUBISHI_4G93
commandButton = "Toyota 1NZ-FE", cmd_set_engine_type_TOYOTA_1NZ_FE@@if_show_4chan_presets
; commandButton = "Toyota 1NZ-FE", cmd_set_engine_type_TOYOTA_1NZ_FE@@if_show_4chan_presets
commandButton = "microRusEFI M111", cmd_set_engine_type_MRE_M111@@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
; commandButton = "microRusEFI Subaru EJ18", cmd_set_engine_type_MRE_SUBARU_EJ18@@if_show_microRusEFI_presets
commandButton = "microRusEFI CAN Extender", cmd_set_engine_type_MRE_SECONDARY_CAN@@if_show_microRusEFI_presets
commandButton = "Hyundai PB", cmd_set_engine_type_HYUNDAI_PB@@if_show_Proteus_presets
commandButton = "Hyundai PB", cmd_set_engine_type_HYUNDAI_PB@@if_show_4chan_presets
commandButton = "Hyundai PB", cmd_set_engine_type_HYUNDAI_PB@@if_show_8chan_presets
commandButton = "Proteus Nissan VQ", cmd_set_engine_type_PROTEUS_NISSAN_VQ35@@if_show_Proteus_presets
; commandButton = "Proteus Nissan VQ", cmd_set_engine_type_PROTEUS_NISSAN_VQ35@@if_show_Proteus_presets
commandButton = "Proteus M111", cmd_set_engine_type_PROTEUS_M111@@if_show_Proteus_presets
commandButton = "Proteus M73 v12", cmd_set_engine_type_Proteus_M73@@if_show_Proteus_presets
commandButton = "Proteus GDI VAG B6 test", cmd_set_engine_type_PROTEUS_VW_B6@@if_show_Proteus_presets
commandButton = "Proteus GM Gen4", cmd_set_engine_type_PROTEUS_GM_LS_4@@if_show_Proteus_presets
commandButton = "Proteus SBC", cmd_set_engine_type_PROTEUS_SBC@@if_show_Proteus_presets
commandButton = "Proteus Miata TCU", cmd_set_engine_type_Proteus_Miata_TCU@@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_PROTEUS_HONDA_OBD2A@@if_show_Proteus_presets
; commandButton = "Proteus Honda OBD2A", cmd_set_engine_type_PROTEUS_HONDA_OBD2A@@if_show_Proteus_presets
commandButton = "Proteus Harley", cmd_set_engine_type_PROTEUS_HARLEY@@if_show_Proteus_presets
commandButton = "Fuel Bench", cmd_set_engine_type_FUEL_BENCH

2
unit_tests/tests/trigger/test_real_k20.cpp
View File

@ -12,7 +12,7 @@ TEST(realk20, cranking) {
reader.open("tests/trigger/resources/civic-K20-cranking.csv", NORMAL_ORDER, REVERSE_ORDER);
reader.twoBanksSingleCamMode = false;
EngineTestHelper eth (engine_type_e::PROTEUS_HONDA_K);
EngineTestHelper eth (engine_type_e::HONDA_K);
while (reader.haveMore()) {
reader.processLine(&eth);