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

fixing build & refactoring

This commit is contained in:
rusefi 2019-04-28 23:42:49 -04:00
parent f2151638a3
commit ff641d81e2
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/bootloader/src/main.cpp
View File

@ -38,9 +38,9 @@ int main(void) {
halInit(); halInit();
chSysInit(); chSysInit();
// set base pin configuration based on the board // set base pin configuration based on the board
setDefaultBasePins(PASS_ENGINE_PARAMETER_SIGNATURE); setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
// set UART pads configuration based on the board // set UART pads configuration based on the board
setDefaultSerialParameters(PASS_ENGINE_PARAMETER_SIGNATURE); setDefaultSerialParameters(PASS_CONFIG_PARAMETER_SIGNATURE);
/* at the moment SD card is not needed by bootloader /* at the moment SD card is not needed by bootloader
// set SD card configuration also // set SD card configuration also
setDefaultSdCardParameters(PASS_ENGINE_PARAMETER_SIGNATURE); setDefaultSdCardParameters(PASS_ENGINE_PARAMETER_SIGNATURE);

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

@ -244,9 +244,9 @@ void setFrankensoBoardTestConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// ETB_BENCH_ENGINE // ETB_BENCH_ENGINE
// set engine_type 58 // set engine_type 58
void setEtbTestConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void setEtbTestConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setDefaultBasePins(); setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
// TODO: HOW?! IS THIS HELPING USB SERIAL?! // TODO: HOW?! IS THIS HELPING USB SERIAL?!
setDefaultSerialParameters(PASS_ENGINE_PARAMETER_SIGNATURE); setDefaultSerialParameters(PASS_CONFIG_PARAMETER_SIGNATURE);
// VAG test ETB // VAG test ETB
// set tps_min 54 // set tps_min 54
engineConfiguration->tpsMin = 54; engineConfiguration->tpsMin = 54;
@ -293,9 +293,9 @@ void setEtbTestConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// TLE8888_BENCH_ENGINE // TLE8888_BENCH_ENGINE
// set engine_type 59 // set engine_type 59
void setTle8888TestConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void setTle8888TestConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setDefaultBasePins(); setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
// TODO: HOW?! IS THIS HELPING USB SERIAL?! // TODO: HOW?! IS THIS HELPING USB SERIAL?!
setDefaultSerialParameters(PASS_ENGINE_PARAMETER_SIGNATURE); setDefaultSerialParameters(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->specs.cylindersCount = 8; engineConfiguration->specs.cylindersCount = 8;
engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3; engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3;
engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS;

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

@ -440,7 +440,7 @@ void prepareVoidConfiguration(engine_configuration_s *engineConfiguration) {
boardConfiguration->is_enabled_spi_3 = boardConfiguration->is_enabled_spi_4 = false; boardConfiguration->is_enabled_spi_3 = boardConfiguration->is_enabled_spi_4 = false;
} }
void setDefaultBasePins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void setDefaultBasePins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
#ifdef EFI_FATAL_ERROR_PIN #ifdef EFI_FATAL_ERROR_PIN
engineConfiguration->fatalErrorPin = EFI_FATAL_ERROR_PIN; engineConfiguration->fatalErrorPin = EFI_FATAL_ERROR_PIN;
#else #else
@ -463,7 +463,7 @@ void setDefaultBasePins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
} }
// needed also by bootloader code // needed also by bootloader code
void setDefaultSerialParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void setDefaultSerialParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
boardConfiguration->useSerialPort = true; boardConfiguration->useSerialPort = true;
engineConfiguration->binarySerialTxPin = GPIOC_10; engineConfiguration->binarySerialTxPin = GPIOC_10;
engineConfiguration->binarySerialRxPin = GPIOC_11; engineConfiguration->binarySerialRxPin = GPIOC_11;
@ -480,7 +480,7 @@ void setDefaultSerialParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// needed also by bootloader code // needed also by bootloader code
// at the moment bootloader does NOT really need SD card, this is a step towards future bootloader SD card usage // at the moment bootloader does NOT really need SD card, this is a step towards future bootloader SD card usage
void setDefaultSdCardParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void setDefaultSdCardParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
boardConfiguration->is_enabled_spi_3 = true; boardConfiguration->is_enabled_spi_3 = true;
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3; engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
boardConfiguration->sdCardCsPin = GPIOD_4; boardConfiguration->sdCardCsPin = GPIOD_4;
@ -1074,9 +1074,9 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
*/ */
void setDefaultBoardConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void setDefaultBoardConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// set initial pin groups // set initial pin groups
setDefaultBasePins(PASS_ENGINE_PARAMETER_SIGNATURE); setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
setDefaultSerialParameters(PASS_ENGINE_PARAMETER_SIGNATURE); setDefaultSerialParameters(PASS_CONFIG_PARAMETER_SIGNATURE);
setCanDefaults(PASS_ENGINE_PARAMETER_SIGNATURE); setCanDefaults(PASS_ENGINE_PARAMETER_SIGNATURE);

6
firmware/controllers/algo/engine_configuration.h
View File

@ -67,9 +67,9 @@ void setConstantDwell(floatms_t dwellMs DECLARE_ENGINE_PARAMETER_SUFFIX);
void printFloatArray(const char *prefix, float array[], int size); void printFloatArray(const char *prefix, float array[], int size);
// needed by bootloader // needed by bootloader
void setDefaultBasePins(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setDefaultBasePins(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setDefaultSerialParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setDefaultSerialParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setDefaultSdCardParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setDefaultSdCardParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void rememberCurrentConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); void rememberCurrentConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE);
void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_SIGNATURE); void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_SIGNATURE);