FWT-45 adding Multiple Actually Dangerous Commits (Multi ADC Support)

include/core/io/platform/f3xx/ADCf3xx.hpp

@@ -52,8 +52,8 @@ class ADCf3xx : public ADC {
      * channel: 5 bits. The STM32 ADC channel value with said supported ADC peripherals
      */
     struct Channel_Support {
-        uint8_t adc1     : 1;
-        uint32_t channel : 5;
+        uint8_t adc1    : 1;
+        uint8_t channel : 5;
     };
 
     /**

include/core/io/platform/f4xx/ADCf4xx.hpp

@@ -92,10 +92,10 @@ class ADCf4xx : public ADC {
      * channel: 5 bits. The STM32 ADC channel value with said supported ADC peripherals
      */
     struct Channel_Support {
-        uint8_t adc1     : 1;
-        uint8_t adc2     : 1;
-        uint8_t adc3     : 1;
-        uint32_t channel : 5;
+        uint8_t adc1    : 1;
+        uint8_t adc2    : 1;
+        uint8_t adc3    : 1;
+        uint8_t channel : 5;
     };
 
     // Array of all ADC peripheral states

samples/adc/multi_adc.cpp

@@ -20,23 +20,22 @@ int main() {
 
     // Set up the logger to catch errors in ADC creation
     core::log::LOGGER.setUART(&uart);
-    core::log::LOGGER.setLogLevel(core::log::Logger::LogLevel::ERROR);
+    core::log::LOGGER.setLogLevel(core::log::Logger::LogLevel::INFO);
 
-    uart.printf("Starting ADC test\r\n");
+    core::log::LOGGER.log(core::log::Logger::LogLevel::INFO, "Starting ADC test");
 
     time::wait(500);
 
     io::ADC& adc0 = io::getADC<io::Pin::PA_0, io::ADCPeriph::ONE>();
-    io::ADC& adc1 = io::getADC<io::Pin::PA_1, io::ADCPeriph::ONE>();
+    io::ADC& adc1 = io::getADC<io::Pin::PC_4, io::ADCPeriph::ONE>();
 
     while (1) {
         core::log::LOGGER.log(core::log::Logger::LogLevel::INFO, "--------------------");
         core::log::LOGGER.log(
-            core::log::Logger::LogLevel::INFO, "ADC0 : %d mV", static_cast<uint32_t>(adc0.read() * 1000));
+            core::log::Logger::LogLevel::INFO, "ADC1 : %d mV", static_cast<uint32_t>(adc0.read() * 1000));
         core::log::LOGGER.log(
-            core::log::Logger::LogLevel::INFO, "ADC0: %d%%", static_cast<uint32_t>(adc0.readPercentage() * 100));
-        core::log::LOGGER.log(core::log::Logger::LogLevel::INFO, "ADC0 raw: %d\r\n", adc0.readRaw());
-
+            core::log::Logger::LogLevel::INFO, "ADC1: %d%%", static_cast<uint32_t>(adc0.readPercentage() * 100));
+        core::log::LOGGER.log(core::log::Logger::LogLevel::INFO, "ADC1 raw: %d\r\n", adc0.readRaw());
         core::log::LOGGER.log(
             core::log::Logger::LogLevel::INFO, "ADC1 : %d mV", static_cast<uint32_t>(adc1.read() * 1000));
         core::log::LOGGER.log(

src/core/io/platform/f3xx/ADCf3xx.cpp

@@ -38,6 +38,7 @@ ADCf3xx::ADCf3xx(Pin pin, ADCPeriph adcPeriph) : ADC(pin, adcPeriph) {
 
     // Maximum number of ADC channels have already been added
     if (rank == MAX_CHANNELS) {
+        log::LOGGER.log(log::Logger::LogLevel::WARNING, "ADC1 ALREADY HAS MAX NUMBER OF CHANNELS!!");
         return;
     }
 
@@ -135,71 +136,56 @@ void ADCf3xx::addChannel(uint8_t rank) {
     GPIOf3xx::gpioStateInit(&gpioInit, myPins, numOfPins, GPIO_MODE_ANALOG, GPIO_NOPULL, GPIO_SPEED_FREQ_HIGH);
 
     ADC_ChannelConfTypeDef adcChannel;
-    Channel_Support channelStruct = {};
+    Channel_Support channelStruct;
 
     switch (pin) {
     case Pin::PA_0:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_1;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_1)};
         break;
     case Pin::PA_1:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_2;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_2)};
         break;
     case Pin::PA_2:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_3;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_3)};
         break;
     case Pin::PA_3:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_4;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_4)};
         break;
     case Pin::PA_4:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_5;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_5)};
         break;
     case Pin::PC_0:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_6;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_6)};
         break;
     case Pin::PC_1:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_7;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_7)};
         break;
     case Pin::PC_2:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_8;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_8)};
         break;
     case Pin::PC_3:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_9;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_9)};
         break;
     case Pin::PA_6:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_10;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_10)};
         break;
     case Pin::PB_0:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_11;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_11)};
         break;
     case Pin::PB_1:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_12;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_12)};
         break;
     case Pin::PB_13:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_13;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_13)};
         break;
     case Pin::PB_11:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_14;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_14)};
         break;
     case Pin::PA_7:
-        channelStruct.adc1    = 1;
-        channelStruct.channel = ADC_CHANNEL_15;
+        channelStruct = {.adc1 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_15)};
         break;
     default:
-        // Channel Struct is set to all 0 at initialization, so no need to be set all support bits to 0
+        channelStruct = {}; // sets all variables to 0
         log::LOGGER.log(log::Logger::LogLevel::ERROR, "INVALID PIN 0x%x!!", pin);
         break; // Should never get here
     }

src/core/io/platform/f4xx/ADCf4xx.cpp

@@ -52,18 +52,20 @@ constexpr uint8_t ADC1_SLOT = 0;
 constexpr uint8_t ADC2_SLOT = 1;
 constexpr uint8_t ADC3_SLOT = 2;
 
-bool ADCf4xx::timerInit = false;
+ADCf4xx::ADC_State core::io::ADCf4xx::adcArray[NUM_ADCS];
+bool core::io::ADCf4xx::timerInit = false;
+TIM_HandleTypeDef core::io::ADCf4xx::htim8;
 
 ADCf4xx::ADCf4xx(Pin pin, ADCPeriph adcPeriph)
-    : ADC(pin, adcPeriph), adcState(adcArray[getADCNum(adcPeriph)]), adcNum(getADCNum(adcPeriph)) {
+    : ADC(pin, adcPeriph), adcState(ADCf4xx::adcArray[getADCNum(adcPeriph)]), adcNum(getADCNum(adcPeriph)) {
     if (adcState.rank == MAX_CHANNELS) {
-        log::LOGGER.log(log::Logger::LogLevel::WARNING, "ADC %d ALREADY HAS MAX PINS!!", (adcNum + 1));
+        log::LOGGER.log(log::Logger::LogLevel::WARNING, "ADC %d ALREADY HAS MAX NUMBER OF CHANNELS!!", (adcNum + 1));
         return;
     }
 
-    if (timerInit) {
-        HAL_TIM_Base_DeInit(&htim8); // Stop Timer8 (Trigger Source For ADC's)
-        timerInit = false;
+    if (ADCf4xx::timerInit) {
+        HAL_TIM_Base_DeInit(&ADCf4xx::htim8); // Stop Timer8 (Trigger Source For ADC's)
+        ADCf4xx::timerInit = false;
     }
 
     if (adcState.isADCInit) {
@@ -78,14 +80,14 @@ ADCf4xx::ADCf4xx(Pin pin, ADCPeriph adcPeriph)
     initADC(adcState.rank);
     addChannel(adcState.rank);
 
-    dmaHandle[adcNum] = &this->adcArray[adcNum].halDMA;
-    adcHandle[adcNum] = &this->adcArray[adcNum].halADC;
+    dmaHandle[adcNum] = &this->ADCf4xx::adcArray[adcNum].halDMA;
+    adcHandle[adcNum] = &this->ADCf4xx::adcArray[adcNum].halADC;
 
-    if (!timerInit) {
+    if (!ADCf4xx::timerInit) {
         __HAL_RCC_TIM8_CLK_ENABLE();
         initTimer();
-        HAL_TIM_Base_Start(&htim8); // Start Timer8 (Trigger Source For ADC's)
-        timerInit = true;
+        HAL_TIM_Base_Start(&ADCf4xx::htim8); // Start Timer8 (Trigger Source For ADC's)
+        ADCf4xx::timerInit = true;
     }
 
     HAL_ADC_Start_DMA(&adcState.halADC, reinterpret_cast<uint32_t*>(&adcState.buffer[0]), adcState.rank);
@@ -123,8 +125,8 @@ void ADCf4xx::initADC(uint8_t num_channels) {
     halADC->Init.ContinuousConvMode    = DISABLE;
     halADC->Init.DiscontinuousConvMode = DISABLE;
     halADC->Init.ExternalTrigConvEdge  = ADC_EXTERNALTRIGCONVEDGE_RISING;
-    halADC->Init.ExternalTrigConv =
-        ADC_EXTERNALTRIGCONV_T8_TRGO; // Sets conversions to be done when timer 8 sends an Update Trigger
+    // Sets conversions to be done when timer 8 sends an Update Trigger
+    halADC->Init.ExternalTrigConv      = ADC_EXTERNALTRIGCONV_T8_TRGO;
     halADC->Init.DataAlign             = ADC_DATAALIGN_RIGHT;
     halADC->Init.NbrOfConversion       = num_channels;
     halADC->Init.DMAContinuousRequests = ENABLE;
@@ -212,108 +214,60 @@ void ADCf4xx::addChannel(uint8_t rank) {
     GPIOf4xx::gpioStateInit(&gpioInit, pins, numOfPins, GPIO_MODE_ANALOG, GPIO_NOPULL, GPIO_SPEED_FREQ_HIGH);
 
     ADC_ChannelConfTypeDef adcChannel;
-    Channel_Support channelStruct = {}; // Create struct and set all values to 0
+    Channel_Support channelStruct;
     // Combines the ADC channel with the ADC peripherals it supports into a struct, avoiding having multi-layered switch
     // statements
     switch (pin) {
     case Pin::PA_0:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 1;
-        channelStruct.channel = ADC_CHANNEL_0;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_0)};
         break;
     case Pin::PA_1:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 1;
-        channelStruct.channel = ADC_CHANNEL_1;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_1)};
         break;
     case Pin::PA_2:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 1;
-        channelStruct.channel = ADC_CHANNEL_2;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_2)};
         break;
     case Pin::PA_3:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 1;
-        channelStruct.channel = ADC_CHANNEL_3;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_3)};
         break;
     case Pin::PA_4:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 0;
-        channelStruct.channel = ADC_CHANNEL_4;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 0, .channel = static_cast<uint8_t>(ADC_CHANNEL_4)};
         break;
     case Pin::PA_5:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 0;
-        channelStruct.channel = ADC_CHANNEL_5;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 0, .channel = static_cast<uint8_t>(ADC_CHANNEL_5)};
         break;
     case Pin::PA_6:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 0;
-        channelStruct.channel = ADC_CHANNEL_6;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 0, .channel = static_cast<uint8_t>(ADC_CHANNEL_6)};
         break;
     case Pin::PA_7:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 0;
-        channelStruct.channel = ADC_CHANNEL_7;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 0, .channel = static_cast<uint8_t>(ADC_CHANNEL_7)};
         break;
     case Pin::PB_0:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 0;
-        channelStruct.channel = ADC_CHANNEL_8;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 0, .channel = static_cast<uint8_t>(ADC_CHANNEL_8)};
         break;
     case Pin::PB_1:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 0;
-        channelStruct.channel = ADC_CHANNEL_9;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 0, .channel = static_cast<uint8_t>(ADC_CHANNEL_9)};
         break;
     case Pin::PC_0:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 1;
-        channelStruct.channel = ADC_CHANNEL_10;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_10)};
         break;
     case Pin::PC_1:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 1;
-        channelStruct.channel = ADC_CHANNEL_11;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_11)};
         break;
     case Pin::PC_2:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 1;
-        channelStruct.channel = ADC_CHANNEL_12;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_12)};
         break;
     case Pin::PC_3:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 1;
-        channelStruct.channel = ADC_CHANNEL_13;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 1, .channel = static_cast<uint8_t>(ADC_CHANNEL_13)};
         break;
     case Pin::PC_4:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 0;
-        channelStruct.channel = ADC_CHANNEL_14;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 0, .channel = static_cast<uint8_t>(ADC_CHANNEL_14)};
         break;
     case Pin::PC_5:
-        channelStruct.adc1    = 1;
-        channelStruct.adc2    = 1;
-        channelStruct.adc3    = 0;
-        channelStruct.channel = ADC_CHANNEL_15;
+        channelStruct = {.adc1 = 1, .adc2 = 1, .adc3 = 0, .channel = static_cast<uint8_t>(ADC_CHANNEL_15)};
         break;
     default:
-        // Channel Struct is set to all 0 at initialization, so no need to be set all support bits to 0
+        channelStruct = {}; // sets all values to 0
         log::LOGGER.log(log::Logger::LogLevel::ERROR, "INVALID PIN 0x%x!!", pin);
         break; // Should never get here
     }
@@ -367,20 +321,20 @@ void ADCf4xx::initTimer() {
     TIM_ClockConfigTypeDef sClockSourceConfig = {0};
     TIM_MasterConfigTypeDef sMasterConfig     = {0};
 
-    htim8.Instance               = TIM8;
-    htim8.Init.Prescaler         = 0;
-    htim8.Init.CounterMode       = TIM_COUNTERMODE_UP;
-    htim8.Init.Period            = (SystemCoreClock / 1000) - 1;
-    htim8.Init.ClockDivision     = TIM_CLOCKDIVISION_DIV1;
-    htim8.Init.RepetitionCounter = 0;
-    htim8.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
-    HAL_TIM_Base_Init(&htim8);
+    ADCf4xx::htim8.Instance               = TIM8;
+    ADCf4xx::htim8.Init.Prescaler         = 0;
+    ADCf4xx::htim8.Init.CounterMode       = TIM_COUNTERMODE_UP;
+    ADCf4xx::htim8.Init.Period            = (SystemCoreClock / 1000) - 1;
+    ADCf4xx::htim8.Init.ClockDivision     = TIM_CLOCKDIVISION_DIV1;
+    ADCf4xx::htim8.Init.RepetitionCounter = 0;
+    ADCf4xx::htim8.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
+    HAL_TIM_Base_Init(&ADCf4xx::htim8);
     sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-    HAL_TIM_ConfigClockSource(&htim8, &sClockSourceConfig);
+    HAL_TIM_ConfigClockSource(&ADCf4xx::htim8, &sClockSourceConfig);
 
     sMasterConfig.MasterOutputTrigger = TIM_TRGO_UPDATE;
     sMasterConfig.MasterSlaveMode     = TIM_MASTERSLAVEMODE_DISABLE;
-    HAL_TIMEx_MasterConfigSynchronization(&htim8, &sMasterConfig);
+    HAL_TIMEx_MasterConfigSynchronization(&ADCf4xx::htim8, &sMasterConfig);
 }
 
 } // namespace core::io