Index: firmware/App/Monitors/Flow.c
===================================================================
diff -u -r863f8f88c73ee5dd285242f6e131a14862b4f5c4 -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0
--- firmware/App/Monitors/Flow.c	(.../Flow.c)	(revision 863f8f88c73ee5dd285242f6e131a14862b4f5c4)
+++ firmware/App/Monitors/Flow.c	(.../Flow.c)	(revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0)
@@ -15,8 +15,10 @@
 *
 ***************************************************************************/
 
-#include "AlarmMgmtRO.h"
+
+#include "AlarmMgmtFP.h"
 #include "Flow.h"
+#include "FPOperationModes.h"
 #include "Messaging.h"
 #include "PersistentAlarm.h"
 #include "TaskPriority.h"
@@ -179,7 +181,7 @@
  * @brief
  * The getFilteredFlowSensorTemperature function gets the filtered current
  * flow sensor temperature (in deg C) for a given flow sensor.
- * @details \b Alarm: ALARM_ID_RO_SOFTWARE_FAULT if given sensor is invalid.
+ * @details \b Alarm: ALARM_ID_FP_SOFTWARE_FAULT if given sensor is invalid.
  * @details \b Inputs: currentFlowTempReadings
  * @details \b Outputs: none
  * @param sensor ID of flow sensor to get temperature reading for.
@@ -213,7 +215,7 @@
  * of the flow sensors.
  * @details \b Inputs: flowsState
  * @details \b Outputs: flowsState
- * @details \b Alarm: ALARM_ID_RO_SOFTWARE_FAULT if in invalid flow state
+ * @details \b Alarm: ALARM_ID_FP_SOFTWARE_FAULT if in invalid flow state
  * @return none
  *************************************************************************/
 void execFlowMonitor( void )
@@ -355,10 +357,10 @@
 
 /*********************************************************************//**
  * @brief
- * The publishFlowsData function publishes RO flow data at a set interval.
+ * The publishFlowsData function publishes FP flow data at a set interval.
  * @details \b Inputs: flowsDataPublicationTimerCounter
  * @details \b Outputs: flowsDataPublicationTimerCounter
- * @details \b Message \b Sent: MSG_ID_RO_FLOW_DATA to publish flow data.
+ * @details \b Message \b Sent: MSG_ID_FP_FLOW_DATA to publish flow data.
  * @return none
  *************************************************************************/
 static void publishFlowsData( void )
@@ -373,7 +375,7 @@
         data.p7Temp  = getFilteredFlowSensorTemperature( P7_FLOW );
         data.p16Temp = getFilteredFlowSensorTemperature( P16_FLOW );
 
-        broadcastData( MSG_ID_FP_FLOW_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( FLOW_TEMP_DATA_T ) );
+        broadcastData( MSG_ID_FP_FLOW_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( FLOW_TEMP_DATA_T ) );
         flowsDataPublicationTimerCounter = 0;
     }
 }