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

SBC 

only:proteus_f7
This commit is contained in:
rusefi 2023-12-09 02:20:29 -05:00
parent c8321a0f7c
commit 540018934f
4 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
firmware/config/boards/proteus/board_configuration.cpp
View File

@ -191,14 +191,28 @@ void boardPrepareForStop() {
palEnableLineEvent(PAL_LINE(GPIOD, 0), PAL_EVENT_MODE_RISING_EDGE); palEnableLineEvent(PAL_LINE(GPIOD, 0), PAL_EVENT_MODE_RISING_EDGE);
} }
#if HW_PROTEUS
static Gpio PROTEUS_ME17_ADAPTER_OUTPUTS[] = { static Gpio PROTEUS_ME17_ADAPTER_OUTPUTS[] = {
Gpio::PROTEUS_LS_1, Gpio::PROTEUS_LS_1,
}; };
static Gpio PROTEUS_SBC_OUTPUTS[] = {
Gpio::PROTEUS_LS_14, // inj 1 four times
Gpio::PROTEUS_LS_14, // inj 1 four times
Gpio::PROTEUS_LS_14, // inj 1 four times
Gpio::PROTEUS_LS_14, // inj 1 four times
Gpio::PROTEUS_LS_15, // inj 4 four times
Gpio::PROTEUS_LS_15, // inj 4 four times
Gpio::PROTEUS_LS_15, // inj 4 four times
Gpio::PROTEUS_LS_15, // inj 4 four times
};
static Gpio PROTEUS_CANAM_OUTPUTS[] = { static Gpio PROTEUS_CANAM_OUTPUTS[] = {
Gpio::PROTEUS_LS_1, Gpio::PROTEUS_LS_1, // inj 1
Gpio::PROTEUS_LS_2, Gpio::PROTEUS_LS_2, // inj 2
Gpio::PROTEUS_LS_3, Gpio::PROTEUS_LS_3, // inj 3
Gpio::PROTEUS_LS_12, // main relay Gpio::PROTEUS_LS_12, // main relay
Gpio::PROTEUS_LS_14, // starter Gpio::PROTEUS_LS_14, // starter
Gpio::PROTEUS_LS_15, // intercooler fan Gpio::PROTEUS_LS_15, // intercooler fan
@ -224,10 +238,12 @@ int getBoardMetaLowSideOutputsCount() {
if (engineConfiguration->engineType == engine_type_e::PROTEUS_HARLEY) { if (engineConfiguration->engineType == engine_type_e::PROTEUS_HARLEY) {
return getBoardMetaOutputsCount(); return getBoardMetaOutputsCount();
} }
if (engineConfiguration->engineType == engine_type_e::PROTEUS_SBC) {
return getBoardMetaOutputsCount();
}
return 16; return 16;
} }
#if HW_PROTEUS
static Gpio PROTEUS_OUTPUTS[] = { static Gpio PROTEUS_OUTPUTS[] = {
Gpio::PROTEUS_LS_1, Gpio::PROTEUS_LS_1,
Gpio::PROTEUS_LS_2, Gpio::PROTEUS_LS_2,
@ -262,7 +278,6 @@ Gpio::PROTEUS_LS_16,
Gpio::PROTEUS_HS_3, Gpio::PROTEUS_HS_3,
Gpio::PROTEUS_HS_4 Gpio::PROTEUS_HS_4
}; };
#endif // HW_PROTEUS
int getBoardMetaOutputsCount() { int getBoardMetaOutputsCount() {
if (engineConfiguration->engineType == engine_type_e::MAVERICK_X3) { if (engineConfiguration->engineType == engine_type_e::MAVERICK_X3) {
@ -274,6 +289,9 @@ int getBoardMetaOutputsCount() {
if (engineConfiguration->engineType == engine_type_e::PROTEUS_HARLEY) { if (engineConfiguration->engineType == engine_type_e::PROTEUS_HARLEY) {
return efi::size(PROTEUS_HARLEY_OUTPUTS); return efi::size(PROTEUS_HARLEY_OUTPUTS);
} }
if (engineConfiguration->engineType == engine_type_e::PROTEUS_SBC) {
return efi::size(PROTEUS_SBC_OUTPUTS);
}
return efi::size(PROTEUS_OUTPUTS); return efi::size(PROTEUS_OUTPUTS);
} }
@ -294,5 +312,9 @@ Gpio* getBoardMetaOutputs() {
if (engineConfiguration->engineType == engine_type_e::PROTEUS_HARLEY) { if (engineConfiguration->engineType == engine_type_e::PROTEUS_HARLEY) {
return PROTEUS_HARLEY_OUTPUTS; return PROTEUS_HARLEY_OUTPUTS;
} }
if (engineConfiguration->engineType == engine_type_e::PROTEUS_SBC) {
return PROTEUS_SBC_OUTPUTS;
}
return PROTEUS_OUTPUTS; return PROTEUS_OUTPUTS;
} }
#endif // HW_PROTEUS

10
firmware/config/engines/gm_sbc.cpp
View File

@ -54,7 +54,7 @@ void setStepperHw() {
#endif // HW_PROTEUS #endif // HW_PROTEUS
} }
void setSbc() { void setGmSbc() {
engineConfiguration->cylindersCount = 8; engineConfiguration->cylindersCount = 8;
engineConfiguration->firingOrder = FO_1_8_4_3_6_5_7_2; engineConfiguration->firingOrder = FO_1_8_4_3_6_5_7_2;
engineConfiguration->displacement = 5.2; engineConfiguration->displacement = 5.2;
@ -104,11 +104,3 @@ void setSbc() {
engineConfiguration->map.sensor.type = MT_GM_1_BAR; engineConfiguration->map.sensor.type = MT_GM_1_BAR;
} }
void set8chanSbc() {
setSbc();
}
void setProteusSbc() {
setSbc();
}

3
firmware/config/engines/gm_sbc.h
View File

@ -3,5 +3,4 @@
*/ */
#pragma once #pragma once
void set8chanSbc(); void setGmSbc();
void setProteusSbc();

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

@ -803,7 +803,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
setMiataNB2_Proteus(); setMiataNB2_Proteus();
break; break;
case engine_type_e::PROTEUS_SBC: case engine_type_e::PROTEUS_SBC:
setProteusSbc(); setGmSbc();
break; break;
#ifdef HARDWARE_CI #ifdef HARDWARE_CI
case engine_type_e::PROTEUS_ANALOG_PWM_TEST: case engine_type_e::PROTEUS_ANALOG_PWM_TEST:
@ -850,7 +850,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
#if HW_HELLEN_8CHAN #if HW_HELLEN_8CHAN
case engine_type_e::ALPHAX_8CHAN_SBC: case engine_type_e::ALPHAX_8CHAN_SBC:
set8chanSbc(); setGmSbc();
break; break;
#endif #endif