Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 533272e6ef2873fcfe7a41338a6c88c7a601605d)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98)
@@ -64,7 +64,7 @@
  *************************************************************************/
 void phantomInterrupt(void)
 {
-    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PHANTOM_INTERRUPT )
+    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PHANTOM_INTERRUPT )
 }
 
 /*********************************************************************//**
@@ -97,7 +97,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_RTI_NOTIFICATION, notification )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_RTI_NOTIFICATION, notification )
             break;
     }
 }
@@ -142,7 +142,7 @@
             can1ParityCnt++;
             if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PARITY ) )
             {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_CAN_PARITY_ERROR )
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_CAN_PARITY_ERROR )
             }
         }
         // Bus off - our transmitter has counted 255+ errors
@@ -151,7 +151,7 @@
             can1BusOffCnt++;
             if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_OFF ) )
             {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_CAN_OFF_ERROR )
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_CAN_OFF_ERROR )
             }
         }
         // Warning - our transmitter has counted 96+ errors
@@ -224,40 +224,14 @@
                 break;
 
             default:
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT, channel )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT, channel )
                 break;
         }
     }
 }
 
 /*********************************************************************//**
  * @brief
- * The edgeNotification function handles hall sensor interrupts.
- * @details \b Alarm: ALARM_ID_TD_SOFTWARE_FAULT if given edge is invalid/unexpected.
- * @details \b Inputs: none
- * @details \b Outputs: Hall sensor interrupt is handled according given pulse edge.
- * @param hetREG HET controller associated with the edge
- * @param edge ID of pulse edge that triggered this interrupt
- * @return none
- *************************************************************************/
-void edgeNotification(hetBASE_t * hetREG, uint32 edge)
-{
-    if ( hetREG == hetREG1 )
-    {
-        switch ( edge )
-        {
-            case HET1_EDGE_BP_ROTOR_HALL_SENSOR:
-                break;
-
-            default:
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INTERRUPTS_INVALID_EDGE_DETECTED, edge )
-                break;
-        }
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The getSci2FEOEError function returns the sci2FEOEError (OE - Overrun,
  * FE - Framing Error) status and resets the status if TRUE
  * @details \b Inputs: sci2FEOEError