Index: firmware/App/Drivers/Comm.c
===================================================================
diff -u -r6dfc8ab61908df85dd18a8db78c3b37eda892554 -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9
--- firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision 6dfc8ab61908df85dd18a8db78c3b37eda892554)
+++ firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file Comm.c
+* @file    Comm.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 25-Aug-2020
+* @author  (last)      Sean Nash
+* @date    (last)      02-Dec-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -30,9 +30,6 @@
 // ********** private data **********
 
 static volatile BOOL canXmitsInProgress = FALSE;            ///< Flag to indicates CAN transmit is in progress.
-#ifdef DEBUG_ENABLED
-    static volatile BOOL uartXmitsInProgress = FALSE;       ///< Flag to indicates UART transmit is in progress.
-#endif
 
 /*********************************************************************//**
  * @brief
@@ -73,117 +70,8 @@
     return result;
 }
 
-#ifdef DEBUG_ENABLED
 /*********************************************************************//**
  * @brief
- * The signalSCI1XmitsInitiated function sets the SCI1 transmits in progress flag.
- * @details Inputs: none
- * @details Outputs: uartXmitsInProgress
- * @return none
- *************************************************************************/
-void signalSCI1XmitsInitiated( void )
-{
-    uartXmitsInProgress = TRUE;
-}
-
-/*********************************************************************//**
- * @brief
- * The signalSCI1XmitsCompleted function resets the SCI1 transmits in progress flag.
- * @details Inputs: none
- * @details Outputs: uartXmitsInProgress
- * @return none
- *************************************************************************/
-void signalSCI1XmitsCompleted( void )
-{
-    uartXmitsInProgress = FALSE;
-}
-
-/*********************************************************************//**
- * @brief
- * The setSCI1DMAReceiveInterrupt function enables DMA receive interrupts
- * for the SCI1 peripheral.
- * @details Inputs: none
- * @details Outputs: DMA receive interrupt is enabled.
- * @return none
- *************************************************************************/
-void setSCI1DMAReceiveInterrupt( void )
-{
-    sciREG->SETINT = SCI_DMA_RECEIVE_INT;
-}
-
-/*********************************************************************//**
- * @brief
- * The setSCI1DMATransmitInterrupt function enables DMA transmit interrupts
- * for the SCI1 peripheral.
- * @details Inputs: none
- * @details Outputs: DMA transmit interrupt is enabled.
- * @return none
- *************************************************************************/
-void setSCI1DMATransmitInterrupt( void )
-{
-    sciREG->SETINT = SCI_DMA_TRANSMIT_INT;
-}
-
-/*********************************************************************//**
- * @brief
- * The clearSCI1DMAReceiveInterrupt function disables DMA receive interrupts
- * for the SCI1 peripheral.
- * @details Inputs: none
- * @details Outputs: DMA receive interrupt is disabled.
- * @return none
- *************************************************************************/
-void clearSCI1DMAReceiveInterrupt( void )
-{
-    sciREG->CLEARINT = SCI_DMA_RECEIVE_INT;
-}
-
-/*********************************************************************//**
- * @brief
- * The clearSCI1DMATransmitInterrupt function disables DMA transmit interrupts
- * for the SCI1 peripheral.
- * @details Inputs: none
- * @details Outputs: DMA transmit interrupt is disabled.
- * @return none
- *************************************************************************/
-void clearSCI1DMATransmitInterrupt( void )
-{
-    sciREG->CLEARINT = SCI_DMA_TRANSMIT_INT;
-}
-
-/*********************************************************************//**
- * @brief
- * The clearSCI1CommErrors function clears framing and/or overrun error flags
- * for the SCI1 peripheral.
- * @details Inputs: none
- * @details Outputs: SCI1 error flags cleared.
- * @return none
- *************************************************************************/
-void clearSCI1CommErrors( void )
-{
-    sciReceiveByte( sciREG );
-    sciREG->FLR |= ( SCI_FE_INT | SCI_OE_INT );
-}
-
-/*********************************************************************//**
- * @brief
- * The isSCI1DMATransmitInProgress function determines whether a DMA transmit
- * is in progress on the SCI1 peripheral.
- * @details Inputs: status registers
- * @details Outputs: none
- * @return TRUE if a transmit is in progress, FALSE if not
- *************************************************************************/
-BOOL isSCI1DMATransmitInProgress( void )
-{
-    BOOL transmitterBusy = ( ( sciREG->FLR & (U32)SCI_TX_INT ) == 0U ? TRUE : FALSE );
-    BOOL dmaTransmitterBusy = ( ( dmaREG->PEND & DMA_CH_STATUS_BIT(DMA_CH3) ) != 0U ? TRUE : FALSE );
-
-
-    return ( ( TRUE == uartXmitsInProgress ) || ( transmitterBusy == TRUE ) || ( dmaTransmitterBusy == TRUE ) ? TRUE : FALSE );
-}
-#endif
-
-/*********************************************************************//**
- * @brief
  * The setSCI2DMAReceiveInterrupt function enables DMA receive interrupts
  * for the SCI2 peripheral.
  * @details Inputs: none