Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r99498a5bab0a1f4c706376feceadc66df6d1c22e -r410afd26b3ae5e372310c696c82f58c59235e10d
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 410afd26b3ae5e372310c696c82f58c59235e10d)
@@ -19,6 +19,7 @@
 #include <string.h>             // For memcpy
 
 #include "Conductivity.h"
+#include "ConductivitySensor.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
 #include "OperationModes.h"
@@ -88,6 +89,20 @@
     // publish conductivity sensors
     publishConductivitySensorsData();
 }
+/*********************************************************************//**
+ * @brief
+ * The getFilteredConductivity function gets the filtered current flow (in mL/min)
+ * for a given flow sensor.
+ * @details \b Alarm: ALARM_ID_RO_SOFTWARE_FAULT if given sensor is invalid.
+ * @details \b Inputs: filteredcurrentFlowReadings[]
+ * @details \b Outputs: none
+ * @param sensor ID of flow sensor to get filtered flow reading for.
+ * @return The filtered current flow (in mL/min) of the given flow sensor.
+ *************************************************************************/
+F32 getFilteredConductivity( CONDUCTIVITY_SENSORS_T sensor )
+{
+    return 0.0F;
+}
 
 /*********************************************************************//**
  * @brief
@@ -109,7 +124,7 @@
         data.p18Conductivity = getConductivityValue( P18_COND );
         conductivityPublishTimerCounter = 0;
 
-        broadcastData( MSG_ID_FP_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) );
+        broadcastData( MSG_ID_FP_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) );
     }
 }