Added alternate function inits for USART

SHAL/Src/Peripheral/GPIO/SHAL_GPIO.cpp

@@ -31,9 +31,9 @@ GPIO::GPIO() : m_GPIO_KEY(GPIO_Key::INVALID){
 
 GPIO::GPIO(GPIO_Key key, PinMode pinMode) : m_GPIO_KEY(key) {
 
-    SHAL_Peripheral gpioPeripheral = getGPIORegister(key);
+    SHAL_GPIO_Peripheral gpioPeripheral = getGPIORegister(key);
 
-    auto gpioRegister = static_cast<GPIO_TypeDef*>(gpioPeripheral.registers);
+    auto gpioRegister = gpioPeripheral.reg;
     unsigned long registerOffset = gpioPeripheral.global_offset;
 
     volatile unsigned long* gpioEnable = getGPIORCCEnable(key).reg;
@@ -47,17 +47,17 @@ GPIO::GPIO(GPIO_Key key, PinMode pinMode) : m_GPIO_KEY(key) {
 
 void GPIO::setLow() {
     auto gpioPeripheral = getGPIORegister(m_GPIO_KEY);
-    static_cast<GPIO_TypeDef*>(gpioPeripheral.registers)->ODR &= ~(1 << gpioPeripheral.global_offset);
+    gpioPeripheral.reg->ODR &= ~(1 << gpioPeripheral.global_offset);
 }
 
 void GPIO::setHigh() {
     auto gpioPeripheral = getGPIORegister(m_GPIO_KEY);
-    static_cast<GPIO_TypeDef*>(gpioPeripheral.registers)->ODR |= (1 << gpioPeripheral.global_offset);
+    gpioPeripheral.reg->ODR |= (1 << gpioPeripheral.global_offset);
 }
 
 void GPIO::toggle() volatile {
-    auto gpioPeripheral = getGPIORegister(m_GPIO_KEY);
-    static_cast<GPIO_TypeDef*>(gpioPeripheral.registers)->ODR ^= (1 << gpioPeripheral.global_offset);
+    SHAL_GPIO_Peripheral gpioPeripheral = getGPIORegister(m_GPIO_KEY);
+    gpioPeripheral.reg->ODR ^= (1 << gpioPeripheral.global_offset);
 }
 
 

SHAL/Src/Peripheral/Timer/SHAL_TIM.cpp

@@ -6,8 +6,8 @@
 #include <cassert>
 
 Timer::Timer(Timer_Key t) : TIMER_KEY(t){
-    SHAL_Peripheral_Register rcc = getTimerRCC(TIMER_KEY);
-    *rcc.reg |= (1 << rcc.offset);
+    TIM_RCC_Enable rcc = getTimerRCC(TIMER_KEY);
+    *rcc.busEnableReg |= (1 << rcc.offset);
 }
 
 Timer::Timer() : TIMER_KEY(Timer_Key::S_TIM_INVALID){

SHAL/Src/Peripheral/UART/SHAL_UART.cpp

@@ -10,7 +10,7 @@
 #include "SHAL_UART.h"
 #include "SHAL_GPIO.h"
 
-UART::UART(const UART_Pair pair){
+UART::UART(const UART_Pair pair) : m_UARTPair(pair){
     SHAL_UART_Pair uart_pair = getUARTPair(pair); //Get the UART_PAIR information to be initialized
 
     //Get the GPIO pins for this UART setup
@@ -20,15 +20,55 @@ UART::UART(const UART_Pair pair){
     initGPIO(Tx_Key,PinMode::ALTERNATE_FUNCTION_MODE); //Initialize Tx GPIO with alternate function (initializes GPIO port as well)
     initGPIO(Rx_Key,PinMode::ALTERNATE_FUNCTION_MODE); //Initialize Rx GPIO with alternate function
 
+    //Determine which AFR register (high or low) to write depending on pin
+    uint8_t TxAFR = getGPIORegister(Tx_Key).global_offset < 8 ? 0 : 1; //Use AFR[0] if pin < 8, AFR[1] if pin >= 8
+    uint8_t RxAFR = getGPIORegister(Rx_Key).global_offset < 8 ? 0 : 1;
+
+    //Apply Alternate Function masks to the AFR registers for each GPIO to enable alternate functions
+    getGPIORegister(Tx_Key).reg->AFR[TxAFR] |= getAFMask(uart_pair.TxMask);
+    getGPIORegister(Rx_Key).reg->AFR[RxAFR] |= getAFMask(uart_pair.RxMask);
+
     SHAL_UART_ENABLE_REG pairUARTEnable = getUARTEnableReg(pair); //Register and mask to enable the UART channel
 
     *pairUARTEnable.reg |= pairUARTEnable.mask; //Enable UART line
 }
 
+void UART::begin(uint32_t baudRate) {
+
+    USART_TypeDef* usart = getUARTPair(m_UARTPair).USARTReg;
+
+    usart->CR1 &= ~USART_CR1_UE; //Disable USART
+
+    usart->CR1 = 0; //Clear USART config
+
+    usart->CR1 = USART_CR1_TE | USART_CR1_RE; //Tx enable and Rx Enable
+
+    usart->BRR = 48000000 / baudRate; //MAKE SURE ANY FUNCTION THAT CHANGES CLOCK UPDATES THIS!
+
+    usart->CR1 |= USART_CR1_UE;
+
+}
+
+void UART::sendString(const char *s) {
+    while (*s) sendChar(*s++); //Send chars while we haven't reached end of s
+}
+
+void UART::sendChar(char c) {
+
+    USART_TypeDef* usart = getUARTPair(m_UARTPair).USARTReg;
+
+    while(!(usart->ISR & USART_ISR_TXE)); //Wait for usart to finish what it's doing
+
+    usart->TDR = c; //Send character
+}
+
+
+
 
 UART& UARTManager::get(UART_Pair pair) {
 
-    //Perform logic for reassigning UART object in array
+    //Always reassign since we could be changing to different pins for some reason
+    m_UARTs[getUARTChannel(pair)] = UART(pair);
 
     return m_UARTs[getUARTChannel(pair)];
 }

SHAL/Src/System/system_stm32f0xx.c

@@ -91,11 +91,6 @@
   */
   /* This variable is updated in three ways:
       1) by calling CMSIS function SystemCoreClockUpdate()
-      2) by calling HAL API function HAL_RCC_GetHCLKFreq()
-      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
-         Note: If you use this function to configure the system clock; then there
-               is no need to call the 2 first functions listed above, since SystemCoreClock
-               variable is updated automatically.
   */
 uint32_t SystemCoreClock = 8000000;
 

SHAL/Src/main.cpp

@@ -17,6 +17,11 @@ void tim2Handler(){
 }
 
 int main() {
+
+    UART uart2 = initUART(UART_Pair::Tx2A2_Rx2A3);
+
+    uart2.begin(115200);
+
     RCC->AHBENR |= RCC_AHBENR_GPIOBEN;
 
     Timer timer2 = getTimer(Timer_Key::S_TIM2);
@@ -43,5 +48,6 @@ int main() {
 
     while (true) {
     	__WFI();
+        uart2.sendString("Hello\r\n");
     }
 }