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

https://github.com/rusefi/hellen-NB1-issues/issues/15

This commit is contained in:
rusefi 2021-09-29 11:51:25 -04:00
parent f62c628bef
commit 1edb9f279d
6 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/boards/hellen/hellen121vag/board.mk
View File

@ -14,10 +14,6 @@ ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8 LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8
endif endif
ifeq ($(LED_COMMUNICATION_BRAIN_PIN),)
LED_COMMUNICATION_BRAIN_PIN = -DEFI_COMMUNICATION_PIN=GPIOH_10
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
DDEFS += -DLED_ERROR_BRAIN_PIN_MODE=INVERTED_OUTPUT DDEFS += -DLED_ERROR_BRAIN_PIN_MODE=INVERTED_OUTPUT

12
firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
View File

@ -56,16 +56,6 @@ static void setIgnitionPins() {
engineConfiguration->ignitionPinMode = OM_DEFAULT; engineConfiguration->ignitionPinMode = OM_DEFAULT;
} }
static void setLedPins() {
#ifdef EFI_COMMUNICATION_PIN
engineConfiguration->communicationLedPin = EFI_COMMUNICATION_PIN;
#else
engineConfiguration->communicationLedPin = GPIOH_10;
#endif /* EFI_COMMUNICATION_PIN */
engineConfiguration->runningLedPin = GPIOH_9; // green
engineConfiguration->warningLedPin = GPIOH_11; // yellow
}
static void setupVbatt() { static void setupVbatt() {
// 4.7k high side/4.7k low side = 2.0 ratio divider // 4.7k high side/4.7k low side = 2.0 ratio divider
engineConfiguration->analogInputDividerCoefficient = 2.0f; engineConfiguration->analogInputDividerCoefficient = 2.0f;
@ -113,7 +103,7 @@ static void setupDefaultSensorInputs() {
} }
void setBoardConfigOverrides(void) { void setBoardConfigOverrides(void) {
setLedPins(); setHellen176LedPins();
setupVbatt(); setupVbatt();
setSdCardConfigurationOverrides(); setSdCardConfigurationOverrides();

5
firmware/config/boards/hellen/hellen128/board.mk
View File

@ -9,14 +9,11 @@ ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_128_MERCEDES_4_CYL DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_128_MERCEDES_4_CYL
endif endif
# 176 package MCU
ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),) ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8 LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8
endif endif
ifeq ($(LED_COMMUNICATION_BRAIN_PIN),)
LED_COMMUNICATION_BRAIN_PIN = -DEFI_COMMUNICATION_PIN=GPIOH_10
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
DDEFS += -DLED_ERROR_BRAIN_PIN_MODE=INVERTED_OUTPUT DDEFS += -DLED_ERROR_BRAIN_PIN_MODE=INVERTED_OUTPUT

12
firmware/config/boards/hellen/hellen128/board_configuration.cpp
View File

@ -54,16 +54,6 @@ static void setIgnitionPins() {
engineConfiguration->ignitionPinMode = OM_DEFAULT; engineConfiguration->ignitionPinMode = OM_DEFAULT;
} }
static void setLedPins() {
#ifdef EFI_COMMUNICATION_PIN
engineConfiguration->communicationLedPin = EFI_COMMUNICATION_PIN;
#else
engineConfiguration->communicationLedPin = GPIOH_10;
#endif /* EFI_COMMUNICATION_PIN */
engineConfiguration->runningLedPin = GPIOH_9; // green
engineConfiguration->warningLedPin = GPIOH_11; // yellow
}
static void setupVbatt() { static void setupVbatt() {
// 4.7k high side/4.7k low side = 2.0 ratio divider // 4.7k high side/4.7k low side = 2.0 ratio divider
engineConfiguration->analogInputDividerCoefficient = 2.0f; engineConfiguration->analogInputDividerCoefficient = 2.0f;
@ -104,7 +94,7 @@ static void setupDefaultSensorInputs() {
} }
void setBoardConfigOverrides(void) { void setBoardConfigOverrides(void) {
setLedPins(); setHellen176LedPins();
setupVbatt(); setupVbatt();
setSdCardConfigurationOverrides(); setSdCardConfigurationOverrides();

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

@ -9,14 +9,11 @@ ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA6 DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA6
endif endif
# 176 package MCU
ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),) ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8 LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8
endif endif
ifeq ($(LED_COMMUNICATION_BRAIN_PIN),)
LED_COMMUNICATION_BRAIN_PIN = -DEFI_COMMUNICATION_PIN=GPIOH_10
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
DDEFS += -DLED_ERROR_BRAIN_PIN_MODE=INVERTED_OUTPUT DDEFS += -DLED_ERROR_BRAIN_PIN_MODE=INVERTED_OUTPUT

5
firmware/config/boards/hellen/hellen72/board.mk
View File

@ -9,14 +9,11 @@ ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2 DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2
endif endif
# 176 package MCU
ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),) ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8 LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8
endif endif
ifeq ($(LED_COMMUNICATION_BRAIN_PIN),)
LED_COMMUNICATION_BRAIN_PIN = -DEFI_COMMUNICATION_PIN=GPIOH_10
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
DDEFS += -DLED_ERROR_BRAIN_PIN_MODE=INVERTED_OUTPUT DDEFS += -DLED_ERROR_BRAIN_PIN_MODE=INVERTED_OUTPUT