diff --git a/firmware/config/boards/atlas/board_configuration.cpp b/firmware/config/boards/atlas/board_configuration.cpp index 079d8be00b..e6e0d508f9 100644 --- a/firmware/config/boards/atlas/board_configuration.cpp +++ b/firmware/config/boards/atlas/board_configuration.cpp @@ -1,10 +1,10 @@ #include "pch.h" -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { } -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { } diff --git a/firmware/config/boards/f429-discovery/board_configuration.cpp b/firmware/config/boards/f429-discovery/board_configuration.cpp index 99a29bb33e..fea5cd8bed 100644 --- a/firmware/config/boards/f429-discovery/board_configuration.cpp +++ b/firmware/config/boards/f429-discovery/board_configuration.cpp @@ -1,12 +1,12 @@ #include "pch.h" -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { } -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { } /** @@ -22,7 +22,7 @@ void boardInit(void) * @brief Board-specific configuration defaults. * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { engineConfiguration->communicationLedPin = GPIO_UNASSIGNED; engineConfiguration->runningLedPin = GPIOG_13; /* LD3 - green */ engineConfiguration->warningLedPin = GPIO_UNASSIGNED; diff --git a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp index 5b2fcf6937..f78f34cd96 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp @@ -96,7 +96,7 @@ void boardInitHardware() { alphaTachPullUp.initPin("a-tach", H144_OUT_IO1); } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen144LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -108,10 +108,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->canRxPin = GPIOD_0; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -127,7 +127,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -172,7 +172,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2; engineConfiguration->spi2mosiPin = H_SPI2_MOSI; diff --git a/firmware/config/boards/hellen/cypress/board_configuration.cpp b/firmware/config/boards/hellen/cypress/board_configuration.cpp index 0cba9dd0d3..ac08e6d26a 100644 --- a/firmware/config/boards/hellen/cypress/board_configuration.cpp +++ b/firmware/config/boards/hellen/cypress/board_configuration.cpp @@ -10,7 +10,7 @@ #include "pch.h" #include "trigger_input.h" -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; @@ -123,10 +123,10 @@ void setBoardDefaultConfiguration(void) { //engineConfiguration->isFastAdcEnabled = false; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { #if 0 engineConfiguration->useSerialPort = true; engineConfiguration->binarySerialTxPin = GPIOC_7; @@ -138,9 +138,9 @@ void setSerialConfigurationOverrides(void) { #endif } -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { } -void setAdcChannelOverrides(void) { +void setAdcChannelOverrides() { addAdcChannelForTrigger(); } diff --git a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp index 1f4124daa4..ebc8ca60ea 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp @@ -85,7 +85,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen144LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -97,10 +97,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->canRxPin = GPIOD_0; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -116,7 +116,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -161,7 +161,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2; engineConfiguration->spi2mosiPin = H_SPI2_MOSI; diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index b62332b4d6..a0df2b8efb 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -90,7 +90,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen144LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -99,10 +99,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->iat.config.bias_resistor = 4700; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -118,7 +118,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -181,7 +181,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3; engineConfiguration->spi3mosiPin = GPIOC_12; diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp index 129a6cbc86..092b491bc0 100644 --- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp @@ -97,7 +97,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen176LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -109,10 +109,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->canRxPin = GPIOD_0; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -128,7 +128,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -189,7 +189,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3; engineConfiguration->spi3mosiPin = GPIOC_12; diff --git a/firmware/config/boards/hellen/hellen128/board_configuration.cpp b/firmware/config/boards/hellen/hellen128/board_configuration.cpp index fb4771a658..5c804e9899 100644 --- a/firmware/config/boards/hellen/hellen128/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen128/board_configuration.cpp @@ -90,7 +90,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen176LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -103,10 +103,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->canRxPin = H176_CAN_RX; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -122,7 +122,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -186,7 +186,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2; engineConfiguration->spi2mosiPin = H_SPI2_MOSI; diff --git a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp index 1efa1a65bf..a197890544 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp @@ -96,7 +96,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen144LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -105,10 +105,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->iat.config.bias_resistor = 4700; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -124,7 +124,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -196,7 +196,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2; engineConfiguration->spi2mosiPin = H_SPI2_MOSI; diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp index 533e3264bf..74e64300bd 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp @@ -90,7 +90,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen176LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -102,10 +102,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->canRxPin = H176_CAN_RX; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -121,7 +121,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -161,7 +161,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3; engineConfiguration->spi3mosiPin = GPIOC_12; diff --git a/firmware/config/boards/hellen/hellen72/board_configuration.cpp b/firmware/config/boards/hellen/hellen72/board_configuration.cpp index 70b92b7f65..73c870a572 100644 --- a/firmware/config/boards/hellen/hellen72/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen72/board_configuration.cpp @@ -91,7 +91,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen176LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -103,10 +103,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->canRxPin = GPIOD_0; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -122,7 +122,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -169,7 +169,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3; engineConfiguration->spi3mosiPin = GPIOC_12; diff --git a/firmware/config/boards/hellen/hellen81/board_configuration.cpp b/firmware/config/boards/hellen/hellen81/board_configuration.cpp index 3ef0796eb4..d6cccb772b 100644 --- a/firmware/config/boards/hellen/hellen81/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen81/board_configuration.cpp @@ -99,7 +99,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setLedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -111,10 +111,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->canRxPin = GPIOD_0; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -130,7 +130,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -172,7 +172,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { // Hellen81a uses SPI2 for SD-card #if 1 engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2; diff --git a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp index 79bacae0dc..95c04bfd1c 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp @@ -87,7 +87,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen144LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -96,10 +96,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->iat.config.bias_resistor = 4700; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -115,7 +115,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -179,7 +179,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3; engineConfiguration->spi3mosiPin = GPIOC_12; diff --git a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp index 1f4124daa4..ebc8ca60ea 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp @@ -85,7 +85,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setHellen144LedPins(); setupVbatt(); setSdCardConfigurationOverrides(); @@ -97,10 +97,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->canRxPin = GPIOD_0; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -116,7 +116,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); @@ -161,7 +161,7 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2; engineConfiguration->spi2mosiPin = H_SPI2_MOSI; diff --git a/firmware/config/boards/kinetis/board_configuration.cpp b/firmware/config/boards/kinetis/board_configuration.cpp index 5cf6ac6d1e..7c915a00e1 100644 --- a/firmware/config/boards/kinetis/board_configuration.cpp +++ b/firmware/config/boards/kinetis/board_configuration.cpp @@ -14,7 +14,7 @@ char __debugBuffer[80]; int __debugEnabled = 0; #endif -void setBoardDefaultConfiguration(void) { +void setBoardOverrides() { setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; @@ -91,10 +91,10 @@ void setBoardDefaultConfiguration(void) { setSerialConfigurationOverrides(); } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = true; engineConfiguration->binarySerialTxPin = GPIOC_7; engineConfiguration->binarySerialRxPin = GPIOC_6; @@ -104,10 +104,10 @@ void setSerialConfigurationOverrides(void) { engineConfiguration->uartConsoleSerialSpeed = SERIAL_SPEED; } -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { } -void setAdcChannelOverrides(void) { +void setAdcChannelOverrides() { // on Kinetis, ADC_FAST & SLOW are not really "fast" or "slow", // they are just different ADC numbers with different sets of channels removeChannel("VBatt", engineConfiguration->vbattAdcChannel); diff --git a/firmware/config/boards/microrusefi/board_configuration.cpp b/firmware/config/boards/microrusefi/board_configuration.cpp index c2ab402502..55a99e31e8 100644 --- a/firmware/config/boards/microrusefi/board_configuration.cpp +++ b/firmware/config/boards/microrusefi/board_configuration.cpp @@ -156,7 +156,7 @@ static void setupDefaultSensorInputs() { #endif // HW_CHECK_MODE } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setLedPins(); setupVbatt(); setupTle8888(); @@ -177,10 +177,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->spi3sckPin = GPIOC_10; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { // why would MRE disable serial by default? we definitely have pads exposed engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; @@ -197,7 +197,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); engineConfiguration->sdCardCsPin = GPIOB_9; @@ -240,5 +240,5 @@ void setBoardDefaultConfiguration(void) { * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { } diff --git a/firmware/config/boards/nucleo_f767/board_configuration.cpp b/firmware/config/boards/nucleo_f767/board_configuration.cpp index b5ba5444cd..1d9445ad05 100644 --- a/firmware/config/boards/nucleo_f767/board_configuration.cpp +++ b/firmware/config/boards/nucleo_f767/board_configuration.cpp @@ -14,10 +14,10 @@ #undef SERIAL_SPEED #define SERIAL_SPEED 115200 -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = true; engineConfiguration->binarySerialTxPin = GPIOD_8; engineConfiguration->binarySerialRxPin = GPIOD_9; @@ -27,14 +27,14 @@ void setSerialConfigurationOverrides(void) { engineConfiguration->uartConsoleSerialSpeed = SERIAL_SPEED; } -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { } /** * @brief Board-specific configuration defaults. * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setSerialConfigurationOverrides(); engineConfiguration->runningLedPin = GPIOB_0; //green LED diff --git a/firmware/config/boards/nucleo_h743/board_configuration.cpp b/firmware/config/boards/nucleo_h743/board_configuration.cpp index bebc8f2820..2b4e96adf0 100644 --- a/firmware/config/boards/nucleo_h743/board_configuration.cpp +++ b/firmware/config/boards/nucleo_h743/board_configuration.cpp @@ -4,19 +4,19 @@ * @brief Board-specific pin configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } /** * @brief Board-specific Serial configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { } /** * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { } diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index 255cf5a6cd..58e2ec55f8 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -62,7 +62,7 @@ static void setPrometheusDefaults() { } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { #if 0 engineConfiguration->injectionPins[0] = is469 ? GPIOD_9 : GPIOB_14; // #1 engineConfiguration->injectionPins[1] = is469 ? GPIOD_15 : GPIOC_7; // #2 @@ -103,7 +103,7 @@ void setPinConfigurationOverrides(void) { #endif } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = true; engineConfiguration->binarySerialTxPin = GPIOA_0; engineConfiguration->binarySerialRxPin = GPIOA_1; @@ -113,7 +113,7 @@ void setSerialConfigurationOverrides(void) { engineConfiguration->uartConsoleSerialSpeed = SERIAL_SPEED; } -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->is_enabled_spi_1 = true; engineConfiguration->sdCardSpiDevice = SPI_DEVICE_1; engineConfiguration->sdCardCsPin = GPIOA_2; @@ -124,7 +124,7 @@ void setSdCardConfigurationOverrides(void) { * @brief Board-specific configuration defaults. * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { // give a chance to trigger SWD programmer... Wait for 2 secs (=2000 ms). // TODO: remove it when the bootloader is ready chThdSleepMilliseconds(2000); diff --git a/firmware/config/boards/proteus/adc_hack.cpp b/firmware/config/boards/proteus/adc_hack.cpp index 1892b1948a..9c4413e5f6 100644 --- a/firmware/config/boards/proteus/adc_hack.cpp +++ b/firmware/config/boards/proteus/adc_hack.cpp @@ -27,7 +27,7 @@ static ADCConversionGroup adcConvGroup = { FALSE, 1, nullptr, nullptr, static NO_CACHE adcsample_t samples[8]; // we use this as a hook to run near the rest of ADC init... -void setAdcChannelOverrides(void) { +void setAdcChannelOverrides() { efiSetPadMode("adc input", GPIOF_3, PAL_MODE_INPUT_ANALOG); adcStart(&ADCD3, nullptr); diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index eef37b5c49..c571a8ec02 100644 --- a/firmware/config/boards/proteus/board_configuration.cpp +++ b/firmware/config/boards/proteus/board_configuration.cpp @@ -50,7 +50,7 @@ static void setIgnitionPins() { engineConfiguration->ignitionPinMode = OM_DEFAULT; } -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { } static void setLedPins() { @@ -140,7 +140,7 @@ static void setupSdCard() { engineConfiguration->spi3mosiPin = GPIOC_12; } -void setBoardConfigOverrides(void) { +void setBoardConfigOverrides() { setupSdCard(); setLedPins(); setupVbatt(); @@ -160,10 +160,10 @@ void setBoardConfigOverrides(void) { engineConfiguration->lps25BaroSensorSda = GPIOB_11; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -179,7 +179,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); setupEtb(); diff --git a/firmware/config/boards/skeleton/board_configuration.cpp b/firmware/config/boards/skeleton/board_configuration.cpp index f66519d8c3..e9ea4eefbf 100644 --- a/firmware/config/boards/skeleton/board_configuration.cpp +++ b/firmware/config/boards/skeleton/board_configuration.cpp @@ -108,11 +108,11 @@ static void setupDefaultSensorInputs() { engineConfiguration->iat.config.bias_resistor = 2700; } -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } // Future: configure USART3 for LIN bus and UART4 for console -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIO_UNASSIGNED; engineConfiguration->binarySerialRxPin = GPIO_UNASSIGNED; @@ -128,7 +128,7 @@ void setSerialConfigurationOverrides(void) { * * @todo Add any board-specific code */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { // Set indicator LED pins. // This is often redundant with efifeatures.h or the run-time config diff --git a/firmware/config/boards/st_stm32f4/board_extra.c b/firmware/config/boards/st_stm32f4/board_extra.c index e27d8b87e7..684e64537c 100644 --- a/firmware/config/boards/st_stm32f4/board_extra.c +++ b/firmware/config/boards/st_stm32f4/board_extra.c @@ -8,19 +8,19 @@ * @brief Board-specific pin configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } /** * @brief Board-specific Serial configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { } /** * @brief Board-specific SD card configuration code overrides. Needed by bootloader code. * @todo Add your board-specific code, if any. */ -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { } diff --git a/firmware/config/boards/subaru_eg33/board_configuration.cpp b/firmware/config/boards/subaru_eg33/board_configuration.cpp index 1917f36c20..fd5693a4bd 100644 --- a/firmware/config/boards/subaru_eg33/board_configuration.cpp +++ b/firmware/config/boards/subaru_eg33/board_configuration.cpp @@ -12,11 +12,11 @@ #include "smart_gpio.h" #include "drivers/gpio/mc33810.h" -void setPinConfigurationOverrides(void) { +void setPinConfigurationOverrides() { } -void setSerialConfigurationOverrides(void) { +void setSerialConfigurationOverrides() { engineConfiguration->useSerialPort = false; engineConfiguration->binarySerialTxPin = GPIOE_1; engineConfiguration->binarySerialRxPin = GPIOE_0; @@ -27,7 +27,7 @@ void setSerialConfigurationOverrides(void) { engineConfiguration->uartConsoleSerialSpeed = SERIAL_SPEED; } -void setSdCardConfigurationOverrides(void) { +void setSdCardConfigurationOverrides() { engineConfiguration->is_enabled_spi_1 = false; engineConfiguration->sdCardSpiDevice = SPI_DEVICE_1; engineConfiguration->sdCardCsPin = GPIOA_2; @@ -38,7 +38,7 @@ void setSdCardConfigurationOverrides(void) { * @brief Board-specific configuration defaults. * @todo Add your board-specific code, if any. */ -void setBoardDefaultConfiguration(void) { +void setBoardDefaultConfiguration() { setSerialConfigurationOverrides(); /* Battery voltage */ diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index f7023e49ba..1aca4aeb33 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1204,5 +1204,5 @@ void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration) { } // These symbols are weak so that a board_configuration.cpp file can override them -__attribute__((weak)) void setBoardDefaultConfiguration(void) { } -__attribute__((weak)) void setBoardConfigOverrides(void) { } +__attribute__((weak)) void setBoardDefaultConfiguration() { } +__attribute__((weak)) void setBoardConfigOverrides() { } diff --git a/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.cpp b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.cpp index f564f2ac8e..7e5ae7dc12 100644 --- a/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.cpp +++ b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.cpp @@ -20,7 +20,7 @@ static bool isUsbSerialInitialized = false; /** * start USB serial using hard-coded communications pins (see comments inside the code) */ -void usb_serial_start(void) { +void usb_serial_start() { usbPopulateSerialNumber(MCU_SERIAL_NUMBER_LOCATION, MCU_SERIAL_NUMBER_BYTES); efiSetPadMode("USB DM", EFI_USB_SERIAL_DM, PAL_MODE_ALTERNATE(EFI_USB_AF)); @@ -48,12 +48,12 @@ void usb_serial_start(void) { isUsbSerialInitialized = true; } -bool is_usb_serial_ready(void) { +bool is_usb_serial_ready() { return isUsbSerialInitialized && SDU1.config->usbp->state == USB_ACTIVE; } #else -bool is_usb_serial_ready(void) { +bool is_usb_serial_ready() { return false; } diff --git a/firmware/util/math/pid.cpp b/firmware/util/math/pid.cpp index ae2882ae75..7a0e907bf7 100644 --- a/firmware/util/math/pid.cpp +++ b/firmware/util/math/pid.cpp @@ -91,30 +91,30 @@ void Pid::updateFactors(float pFactor, float iFactor, float dFactor) { reset(); } -void Pid::reset(void) { +void Pid::reset() { dTerm = iTerm = 0; output = input = target = previousError = 0; errorAmplificationCoef = 1.0f; resetCounter++; } -float Pid::getP(void) const { +float Pid::getP() const { return parameters->pFactor; } -float Pid::getI(void) const { +float Pid::getI() const { return parameters->iFactor; } -float Pid::getPrevError(void) const { +float Pid::getPrevError() const { return previousError; } -float Pid::getIntegration(void) const { +float Pid::getIntegration() const { return iTerm; } -float Pid::getD(void) const { +float Pid::getD() const { return parameters->dFactor; } diff --git a/firmware/util/math/pid.h b/firmware/util/math/pid.h index c2c133e359..9f90aa6a32 100644 --- a/firmware/util/math/pid.h +++ b/firmware/util/math/pid.h @@ -45,10 +45,10 @@ public: // doesn't limit the result (used in incremental CIC PID, see below) float getUnclampedOutput(float target, float input, float dTime); void updateFactors(float pFactor, float iFactor, float dFactor); - virtual void reset(void); - float getP(void) const; - float getI(void) const; - float getD(void) const; + virtual void reset(); + float getP() const; + float getI() const; + float getD() const; float getOffset() const; float getMinValue() const; float getIntegration(void) const;