Added alternate function inits for USART

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)];
 }