rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core 8 overrides and stepper-as-brain-pin (#3962) 

* core 8 overrides and stepper-as-brain-pin

* oops, change the pin not the mode

* a little bit of #3963 makes everyone happy
This commit is contained in:
Matthew Kennedy 2022-02-26 06:14:37 -08:00 committed by GitHub
parent d8e0eb08b5
commit 307b33837d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/config/boards/atlas/board_configuration.cpp
View File

@ -1,7 +1,4 @@
#include "pch.h" #include "pch.h"
void setSerialConfigurationOverrides() {
}
void setSdCardConfigurationOverrides() { void setSdCardConfigurationOverrides() {
} }

73
firmware/config/boards/core8/board_configuration.cpp
View File

@ -9,7 +9,6 @@
#include "pch.h" #include "pch.h"
static void setInjectorPins() { static void setInjectorPins() {
engineConfiguration->injectionPinMode = OM_DEFAULT; engineConfiguration->injectionPinMode = OM_DEFAULT;
engineConfiguration->injectionPins[0] = GPIOF_13; engineConfiguration->injectionPins[0] = GPIOF_13;
@ -23,7 +22,6 @@ static void setInjectorPins() {
} }
static void setIgnitionPins() { static void setIgnitionPins() {
engineConfiguration->ignitionPinMode = OM_DEFAULT; engineConfiguration->ignitionPinMode = OM_DEFAULT;
engineConfiguration->ignitionPins[0] = GPIOE_15; engineConfiguration->ignitionPins[0] = GPIOE_15;
@ -40,8 +38,7 @@ static void setIgnitionPins() {
void setSdCardConfigurationOverrides(void) { void setSdCardConfigurationOverrides(void) {
} }
void setBoardConfigOverrides(void) { static void setEtbConfig() {
// TLE9201 driver // TLE9201 driver
// This chip has three control pins: // This chip has three control pins:
// DIR - sets direction of the motor // DIR - sets direction of the motor
@ -72,28 +69,6 @@ void setBoardConfigOverrides(void) {
engineConfiguration->etb_use_two_wires = false; engineConfiguration->etb_use_two_wires = false;
} }
void setPinConfigurationOverrides(void) {
//CAN 1 bus overwrites
engineConfiguration->canTxPin = GPIOD_0;
engineConfiguration->canRxPin = GPIOD_1;
//CAN 2 bus overwrites
engineConfiguration->can2RxPin = GPIOB_5;
engineConfiguration->can2TxPin = GPIOB_6;
}
void setSerialConfigurationOverrides(void) {
}
/**
* @brief Board-specific configuration defaults.
*
* See also setDefaultEngineConfiguration
*
* @todo Add your board-specific code, if any.
*/
static void setupVbatt() { static void setupVbatt() {
// 5.6k high side/10k low side = 1.56 ratio divider // 5.6k high side/10k low side = 1.56 ratio divider
engineConfiguration->analogInputDividerCoefficient = 1.47f; engineConfiguration->analogInputDividerCoefficient = 1.47f;
@ -107,14 +82,39 @@ static void setupVbatt() {
engineConfiguration->adcVcc = 3.3f; engineConfiguration->adcVcc = 3.3f;
} }
static void setStepperConfig() {
engineConfiguration->idle.stepperDirectionPin = GPIOF_7;
engineConfiguration->idle.stepperStepPin = GPIOF_8;
engineConfiguration->stepperEnablePin = GPIOF_9;
}
void setBoardConfigOverrides() {
setupVbatt();
setEtbConfig();
setStepperConfig();
// PE3 is error LED, configured in board.mk
engineConfiguration->communicationLedPin = GPIOG_12;
engineConfiguration->runningLedPin = GPIOG_9;
engineConfiguration->warningLedPin = GPIOG_10;
engineConfiguration->clt.config.bias_resistor = 2490;
engineConfiguration->iat.config.bias_resistor = 2490;
//CAN 1 bus overwrites
engineConfiguration->canTxPin = GPIOD_0;
engineConfiguration->canRxPin = GPIOD_1;
//CAN 2 bus overwrites
engineConfiguration->can2RxPin = GPIOB_5;
engineConfiguration->can2TxPin = GPIOB_6;
}
static void setupDefaultSensorInputs() { static void setupDefaultSensorInputs() {
engineConfiguration->afr.hwChannel = EFI_ADC_11; engineConfiguration->afr.hwChannel = EFI_ADC_11;
setEgoSensor(ES_14Point7_Free); setEgoSensor(ES_14Point7_Free);
engineConfiguration->clt.config.bias_resistor = 2490;
engineConfiguration->iat.config.bias_resistor = 2490;
engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE; engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE;
engineConfiguration->lps25BaroSensorScl = GPIOB_10; engineConfiguration->lps25BaroSensorScl = GPIOB_10;
@ -122,32 +122,17 @@ static void setupDefaultSensorInputs() {
} }
static void setLedPins() {
// PE3 is error LED, configured in board.mk
engineConfiguration->communicationLedPin = GPIOG_12;
engineConfiguration->runningLedPin = GPIOG_9;
engineConfiguration->warningLedPin = GPIOG_10;
}
void setBoardDefaultConfiguration(void) { void setBoardDefaultConfiguration(void) {
setInjectorPins(); setInjectorPins();
setIgnitionPins(); setIgnitionPins();
setupVbatt();
setLedPins();
engineConfiguration->sdCardPeriodMs = 50; engineConfiguration->sdCardPeriodMs = 50;
engineConfiguration->isSdCardEnabled = true; engineConfiguration->isSdCardEnabled = true;
engineConfiguration->canWriteEnabled = true; engineConfiguration->canWriteEnabled = true;
engineConfiguration->canReadEnabled = true; engineConfiguration->canReadEnabled = true;
engineConfiguration->canSleepPeriodMs = 50; engineConfiguration->canSleepPeriodMs = 50;
engineConfiguration->canBaudRate = B500KBPS; engineConfiguration->canBaudRate = B500KBPS;
engineConfiguration->can2BaudRate = B500KBPS; engineConfiguration->can2BaudRate = B500KBPS;
} }

7
firmware/config/boards/f407-discovery/board_extra.cpp
View File

@ -11,13 +11,6 @@
void setPinConfigurationOverrides() { void setPinConfigurationOverrides() {
} }
/**
* @brief Board-specific Serial configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSerialConfigurationOverrides() {
}
/** /**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any. * @todo Add your board-specific code, if any.

3
firmware/config/boards/f429-discovery/board_configuration.cpp
View File

@ -1,8 +1,5 @@
#include "pch.h" #include "pch.h"
void setSerialConfigurationOverrides() {
}
void setSdCardConfigurationOverrides() { void setSdCardConfigurationOverrides() {
} }

7
firmware/config/boards/nucleo_h743/board_configuration.cpp
View File

@ -1,12 +1,5 @@
#include "pch.h" #include "pch.h"
/**
* @brief Board-specific Serial configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSerialConfigurationOverrides() {
}
/** /**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any. * @todo Add your board-specific code, if any.

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

@ -1197,3 +1197,4 @@ void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration) {
// These symbols are weak so that a board_configuration.cpp file can override them // These symbols are weak so that a board_configuration.cpp file can override them
__attribute__((weak)) void setBoardDefaultConfiguration() { } __attribute__((weak)) void setBoardDefaultConfiguration() { }
__attribute__((weak)) void setBoardConfigOverrides() { } __attribute__((weak)) void setBoardConfigOverrides() { }
__attribute__((weak)) void setSerialConfigurationOverrides() { }

6
firmware/integration/rusefi_config.txt
View File

@ -628,8 +628,8 @@ struct idle_hardware_s
int solenoidFrequency;;"Hz", 1, 0, 0, 3000, 0 int solenoidFrequency;;"Hz", 1, 0, 0, 3000, 0
output_pin_e solenoidPin output_pin_e solenoidPin
output_pin_e stepperDirectionPin brain_pin_e stepperDirectionPin
output_pin_e stepperStepPin brain_pin_e stepperStepPin
pin_output_mode_e solenoidPinMode pin_output_mode_e solenoidPinMode
end_struct end_struct
@ -1345,7 +1345,7 @@ custom stepper_num_micro_steps_e 1 bits, U08, @OFFSET@, [0:3], @@stepper_num_mic
float[SCRIPT_CURVE_8] scriptCurve4Bins;;"x", 1, 0, -999, 1000, 3 float[SCRIPT_CURVE_8] scriptCurve4Bins;;"x", 1, 0, -999, 1000, 3
float[SCRIPT_CURVE_8] scriptCurve4;;"y", 1, 0, -999, 1000, 3 float[SCRIPT_CURVE_8] scriptCurve4;;"y", 1, 0, -999, 1000, 3
output_pin_e stepperEnablePin; brain_pin_e stepperEnablePin;
brain_pin_e tle8888_cs; brain_pin_e tle8888_cs;
pin_output_mode_e tle8888_csPinMode; pin_output_mode_e tle8888_csPinMode;
brain_pin_e mc33816_cs; brain_pin_e mc33816_cs;