Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r3eb7c2e62c727be195cd937d49957db9d4ba83b4 -r8467f8ff09e382e0991f14d02683080dc811e24e
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3eb7c2e62c727be195cd937d49957db9d4ba83b4)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8467f8ff09e382e0991f14d02683080dc811e24e)
@@ -567,13 +567,12 @@
             else
             {
                 signalCANXmitsCompleted();
-                // TODO - shouldn't get here, but let's see if we do
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)mBox )
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_CAN_TX_FAULT, (U32)mBox )
             }
         }
         else
-        {   // TODO - shouldn't get here - just testing - set first data to new s/w fault enum later
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)buffer, (U32)dataSize )
+        {
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_SIZE, (U32)dataSize )
         }
     }
 
@@ -839,9 +838,7 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdIsCommunicating = FALSE;
-#ifndef DEBUG_ENABLED
-        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );  // TODO - add this alarm if we're in middle of a treatment? or if in a mode that comm loss would impact badly?
-#endif
+        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
     }
 }