rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.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:47:04 -04:00
parent 5cfaae7fbd
commit f62c628bef
7 changed files with 33 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp
View File

@ -12,6 +12,7 @@
#include "pch.h" #include "pch.h"
#include "fsio_impl.h" #include "fsio_impl.h"
#include "custom_engine.h"
static void setInjectorPins() { static void setInjectorPins() {
engineConfiguration->injectionPins[0] = GPIOG_7; engineConfiguration->injectionPins[0] = GPIOG_7;
@ -56,16 +57,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 +95,7 @@ static void setupDefaultSensorInputs() {
} }
void setBoardConfigOverrides(void) { void setBoardConfigOverrides(void) {
setLedPins(); setHellen144LedPins();
setupVbatt(); setupVbatt();
setSdCardConfigurationOverrides(); setSdCardConfigurationOverrides();

13
firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp
View File

@ -12,6 +12,7 @@
#include "pch.h" #include "pch.h"
#include "fsio_impl.h" #include "fsio_impl.h"
#include "custom_engine.h"
static void hellenWbo() { static void hellenWbo() {
engineConfiguration->enableAemXSeries = true; engineConfiguration->enableAemXSeries = true;
@ -50,16 +51,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 = GPIOE_7;
#endif /* EFI_COMMUNICATION_PIN */
engineConfiguration->runningLedPin = GPIOG_1; // green
engineConfiguration->warningLedPin = GPIOE_8; // 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 +95,7 @@ static void setupDefaultSensorInputs() {
} }
void setBoardConfigOverrides(void) { void setBoardConfigOverrides(void) {
setLedPins(); setHellen144LedPins();
setupVbatt(); setupVbatt();
setSdCardConfigurationOverrides(); setSdCardConfigurationOverrides();

13
firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp
View File

@ -12,6 +12,7 @@
#include "pch.h" #include "pch.h"
#include "fsio_impl.h" #include "fsio_impl.h"
#include "custom_engine.h"
static void hellenWbo() { static void hellenWbo() {
engineConfiguration->enableAemXSeries = true; engineConfiguration->enableAemXSeries = true;
@ -50,16 +51,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 = GPIOE_7;
#endif /* EFI_COMMUNICATION_PIN */
engineConfiguration->runningLedPin = GPIOG_1; // green
engineConfiguration->warningLedPin = GPIOE_8; // 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;
@ -102,7 +93,7 @@ static void setupDefaultSensorInputs() {
} }
void setBoardConfigOverrides(void) { void setBoardConfigOverrides(void) {
setLedPins(); setHellen144LedPins();
setupVbatt(); setupVbatt();
setSdCardConfigurationOverrides(); setSdCardConfigurationOverrides();

13
firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp
View File

@ -12,6 +12,7 @@
#include "pch.h" #include "pch.h"
#include "fsio_impl.h" #include "fsio_impl.h"
#include "custom_engine.h"
static void setInjectorPins() { static void setInjectorPins() {
engineConfiguration->injectionPins[0] = GPIOG_7; engineConfiguration->injectionPins[0] = GPIOG_7;
@ -56,16 +57,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 +95,7 @@ static void setupDefaultSensorInputs() {
} }
void setBoardConfigOverrides(void) { void setBoardConfigOverrides(void) {
setLedPins(); setHellen176LedPins();
setupVbatt(); setupVbatt();
setSdCardConfigurationOverrides(); setSdCardConfigurationOverrides();

13
firmware/config/boards/hellen/hellen72/board_configuration.cpp
View File

@ -12,6 +12,7 @@
#include "pch.h" #include "pch.h"
#include "fsio_impl.h" #include "fsio_impl.h"
#include "custom_engine.h"
static void hellenWbo() { static void hellenWbo() {
engineConfiguration->enableAemXSeries = true; engineConfiguration->enableAemXSeries = true;
@ -55,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;
@ -104,7 +95,7 @@ static void setupDefaultSensorInputs() {
} }
void setBoardConfigOverrides(void) { void setBoardConfigOverrides(void) {
setLedPins(); setHellen176LedPins();
setupVbatt(); setupVbatt();
setSdCardConfigurationOverrides(); setSdCardConfigurationOverrides();

20
firmware/config/engines/custom_engine.cpp
View File

@ -778,3 +778,23 @@ void setHellenDefaultVrThresholds(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setLinearCurve(engineConfiguration->vrThreshold[i].values, PACK_PERCENT_BYTE_MULT * 0.6, PACK_PERCENT_BYTE_MULT * 1.2, PACK_PERCENT_BYTE_MULT * 0.1); setLinearCurve(engineConfiguration->vrThreshold[i].values, PACK_PERCENT_BYTE_MULT * 0.6, PACK_PERCENT_BYTE_MULT * 1.2, PACK_PERCENT_BYTE_MULT * 0.1);
} }
} }
void setHellen144LedPins() {
#ifdef EFI_COMMUNICATION_PIN
engineConfiguration->communicationLedPin = EFI_COMMUNICATION_PIN;
#else
engineConfiguration->communicationLedPin = GPIOE_7;
#endif /* EFI_COMMUNICATION_PIN */
engineConfiguration->runningLedPin = GPIOG_1;
engineConfiguration->warningLedPin = GPIOE_8;
}
void setHellen176LedPins() {
#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
}

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

@ -35,3 +35,6 @@ void setBoschHDEV_5_injectors(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setHellen72etb(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setHellen72etb(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setRotary(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setRotary(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setVrThresholdTest(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setVrThresholdTest(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setHellen144LedPins();
void setHellen176LedPins();