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

Marussia

This commit is contained in:
rusefillc 2023-03-26 12:47:04 -04:00
parent ac6d3e8fb9
commit 6a7a3f9efe
5 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
firmware/config/engines/nissan_vq.cpp
View File

@ -31,12 +31,9 @@ void setHellen121nissanQR() {
}
void setHellen121nissanVQ() {
#include "nissan_vq.lua"
engineConfiguration->trigger.type = TT_NISSAN_VQ35;
static void setNissanVqEngineConfig() {
setNissanMAF0031(config);
engineConfiguration->trigger.type = TT_NISSAN_VQ35;
engineConfiguration->specs.cylindersCount = 6;
engineConfiguration->specs.firingOrder = FO_1_2_3_4_5_6;
@ -45,13 +42,9 @@ void setHellen121nissanVQ() {
engineConfiguration->vvtMode[0] = VVT_NISSAN_VQ;
// we have this here and not in board_configuration.cpp so that unit test would get this value
engineConfiguration->invertCamVVTSignal = true;
engineConfiguration->vvtOffsets[0 * CAMS_PER_BANK] = NISSAN_VQ_VVT_OFFSET;
engineConfiguration->vvtOffsets[1 * CAMS_PER_BANK] = NISSAN_VQ_VVT_OFFSET + NISSAN_VQ_CAM_OFFSET;
// VVT closed loop
engineConfiguration->auxPid[0].pFactor = 2;
engineConfiguration->auxPid[0].iFactor = 0.5;
@ -60,12 +53,28 @@ void setHellen121nissanVQ() {
// engineConfiguration->auxPid[0].minValue = 20;
// engineConfiguration->auxPid[0].maxValue = 90;
engineConfiguration->cranking.baseFuel = 35;
}
void setHellen121nissanVQ() {
#include "nissan_vq.lua"
setNissanVqEngineConfig();
// we have this here and not in board_configuration.cpp so that unit test would get this value
engineConfiguration->invertCamVVTSignal = true;
#if HW_HELLEN
engineConfiguration->vvtPins[0 * CAMS_PER_BANK] = H176_LS_7;
engineConfiguration->vvtPins[1 * CAMS_PER_BANK] = H176_LS_8;
#endif
}
engineConfiguration->cranking.baseFuel = 35;
void setProteusNissanVQ() {
setNissanVqEngineConfig();
// open question if that's a board setting or engine setting
engineConfiguration->invertCamVVTSignal = true;
}
void setHellen121nissanAltimaN16() {

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

@ -12,3 +12,5 @@
void setHellen121nissanVQ();
void setHellen121nissanQR();
void setHellen121nissanAltimaN16();
void setProteusNissanVQ();

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

@ -774,6 +774,9 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case WASTEGATE_PROTEUS_TEST:
proteusDcWastegateTest();
break;
case PROTEUS_NISSAN_VQ35:
setProteusNissanVQ();
break;
case PROTEUS_GM_LS_4:
setProteusGmLs4();
break;

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

@ -224,10 +224,13 @@ typedef enum __attribute__ ((__packed__)) {
*/
MINIMAL_PINS = 99,
// use this in case of emergency without github actions? :)
TEST_100 = 100,
TEST_101 = 101,
TEST_102 = 102,
PROTEUS_NISSAN_VQ35 = 103,
// java code generator handles this value in a special way
// also looks like 2 enums are either 1 byte or 4 bytes
Force_4_bytes_size_engine_type = 70000,

8
firmware/tunerstudio/rusefi.input
View File

@ -2058,7 +2058,10 @@ cmd_set_engine_type_PROTEUS_HONDA_OBD2A = "@@TS_IO_TEST_COMMAND_char@@@@ts_co
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@@"
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@@"
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@@"
cmd_set_engine_type_PROTEUS_HARLEY = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_HARLEY_16_hex@@"
cmd_set_engine_type_PROTEUS_HARLEY = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_HARLEY_16_hex@@"
cmd_set_engine_type_PROTEUS_NISSAN_VQ35 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_NISSAN_VQ35_16_hex@@"
cmd_set_engine_type_PROTEUS_SBC = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_SBC_16_hex@@"
cmd_set_engine_type_PROTEUS_M111 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_M111_16_hex@@"
; ETB_BENCH_ENGINE = 58
@ -4150,9 +4153,12 @@ dialog = tcuControls, "Transmission Settings"
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 = "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 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