Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r318d977d9d47b1860f09b93f06cc5885723f3e77 -r5cfa1f3d17db625f92f046868812717e3f1f51c3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 318d977d9d47b1860f09b93f06cc5885723f3e77)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5cfa1f3d17db625f92f046868812717e3f1f51c3)
@@ -100,8 +100,6 @@
 {
     F32 cpi;
     F32 cpo;
-    F32 cd1;
-    F32 cd2;
 } CONDUCTIVITY_DATA_T;
 
 typedef struct
@@ -200,7 +198,7 @@
         if ( FALSE == addMsgToPendingACKList( &msg, buffer, data, msgSize ) )
         {
             error = TRUE;
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL )
         }
     }
 
@@ -678,11 +676,11 @@
  * @details
  * Inputs : none
  * Outputs : conductivity data msg constructed and queued
- * @param inlet : water inlet conductivity data.
- * @param outlet : water outlet conductivity data.
+ * @param cpi: water inlet conductivity data.
+ * @param cpo : water outlet conductivity data.
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastConductivityData( F32 inlet, F32 outlet, F32 cd1, F32 cd2 )
+BOOL broadcastConductivityData( F32 cpi, F32 cpo )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -694,10 +692,8 @@
     msg.hdr.msgID = MSG_ID_DG_CONDUCTIVITY_DATA;
     msg.hdr.payloadLen = sizeof( CONDUCTIVITY_DATA_T );
 
-    payload.cpi = inlet;
-    payload.cpo = outlet;
-    payload.cd1 = cd1;
-    payload.cd2 = cd2;
+    payload.cpi = cpi;
+    payload.cpo = cpo;
 
     memcpy( payloadPtr, &payload, sizeof( CONDUCTIVITY_DATA_T ) );