Index: firmware/.cproject
===================================================================
diff -u -r79f3a45ee472c053fd191e8196245729703ebab3 -ra673b3fdaed36dc1e30bce51c8d90218cc96fccb
--- firmware/.cproject	(.../.cproject)	(revision 79f3a45ee472c053fd191e8196245729703ebab3)
+++ firmware/.cproject	(.../.cproject)	(revision a673b3fdaed36dc1e30bce51c8d90218cc96fccb)
@@ -49,6 +49,7 @@
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE.1286433369" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="__TI_VIM_128CH__"/>
+									<listOptionValue builtIn="false" value="__TI_VFPV3D16_SUPPORT__"/>
 								</option>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEBUGGING_MODEL.17413764" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WARNING.770195724" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DIAG_WARNING" valueType="stringList">
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r926afe9b1d9cc6931cbca48080e4a66385a20239 -ra673b3fdaed36dc1e30bce51c8d90218cc96fccb
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 926afe9b1d9cc6931cbca48080e4a66385a20239)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision a673b3fdaed36dc1e30bce51c8d90218cc96fccb)
@@ -210,7 +210,7 @@
             break;
 
         default:
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSIS_INVALID_STATE, currentDialysisState )
             break;
     }
 }
@@ -247,7 +247,7 @@
             break;
 
         default:
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE, currentUFState )
             break;
     }
 
@@ -267,6 +267,8 @@
 {
     DIALYSIS_STATE_T result = DIALYSIS_SOLUTION_INFUSION_STATE;
 
+    // TODO -
+
     return result;
 }
 
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r79f3a45ee472c053fd191e8196245729703ebab3 -ra673b3fdaed36dc1e30bce51c8d90218cc96fccb
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 79f3a45ee472c053fd191e8196245729703ebab3)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision a673b3fdaed36dc1e30bce51c8d90218cc96fccb)
@@ -252,7 +252,7 @@
     U32 newTime = getMSTimerCount();
     U32 msSinceLast = calcTimeBetween( lastTreatmentTimeStamp, newTime );
 
-    // update UF time
+    // update treatment time
     treatmentTimeMS += msSinceLast;
     lastTreatmentTimeStamp = newTime;
 
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r926afe9b1d9cc6931cbca48080e4a66385a20239 -ra673b3fdaed36dc1e30bce51c8d90218cc96fccb
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 926afe9b1d9cc6931cbca48080e4a66385a20239)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision a673b3fdaed36dc1e30bce51c8d90218cc96fccb)
@@ -164,6 +164,8 @@
     SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL,
     SW_FAULT_ID_DIAL_OUT_INVALID_MEASURED_SIGNAL_STATE,
     SW_FAULT_ID_DIAL_OUT_SET_RX_OUT_OF_RANGE,
+    SW_FAULT_ID_DIALYSIS_INVALID_STATE,                                 // 55
+    SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8dfdaca983c36456b0e067a20ef6c003da3758ac -ra673b3fdaed36dc1e30bce51c8d90218cc96fccb
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8dfdaca983c36456b0e067a20ef6c003da3758ac)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a673b3fdaed36dc1e30bce51c8d90218cc96fccb)
@@ -93,7 +93,7 @@
 };
 
 static U08 lastCANPacketSent[ CAN_MESSAGE_PAYLOAD_SIZE ];
-static CAN_MESSAGE_BOX_T lastCANPacketSentChannel = 0;
+static CAN_MESSAGE_BOX_T lastCANPacketSentChannel = (CAN_MESSAGE_BOX_T)0;
 static U32 lastCANPacketSentTimeStamp = 0;
 
 static U08 pcXmitPacket[ PC_MESSAGE_PACKET_SIZE ] = { 0, 0, 0, 0, 0, 0, 0, 0 };