Index: firmware/App/Monitors/Flow.c
===================================================================
diff -u -r72ae21d8343d3a2b07a47452ff48549e25f876df -r863f8f88c73ee5dd285242f6e131a14862b4f5c4
--- firmware/App/Monitors/Flow.c	(.../Flow.c)	(revision 72ae21d8343d3a2b07a47452ff48549e25f876df)
+++ firmware/App/Monitors/Flow.c	(.../Flow.c)	(revision 863f8f88c73ee5dd285242f6e131a14862b4f5c4)
@@ -169,7 +169,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_FLOW_SENSOR_INVALID_SENSOR3, (U32)sensor )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FLOW_SENSOR_INVALID_SENSOR3, (U32)sensor )
     }
 
     return result;
@@ -199,7 +199,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_FLOW_SENSOR_INVALID_SENSOR4, (U32)sensor )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FLOW_SENSOR_INVALID_SENSOR4, (U32)sensor )
     }
 
     return result;
@@ -230,7 +230,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_FLOW_INVALID_EXEC_STATE, (U32)flowsState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FLOW_INVALID_EXEC_STATE, (U32)flowsState )
             flowsState = FLOW_INIT_STATE;
             break;
     }
@@ -253,7 +253,7 @@
 
     for ( sensor = FLOW_SENSOR_FIRST; sensor < NUM_OF_FLOW_SENSORS; sensor++ )
     {
-        F32 rawFlow = getFlowRate( sensor );
+        F32 rawFlow = (F32)getFlowRate( sensor );
 
         // TODO - calibrate
 
@@ -373,7 +373,7 @@
         data.p7Temp  = getFilteredFlowSensorTemperature( P7_FLOW );
         data.p16Temp = getFilteredFlowSensorTemperature( P16_FLOW );
 
-        broadcastData( MSG_ID_RO_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_RO_BROADCAST, (U08*)&data, sizeof( FLOW_TEMP_DATA_T ) );
         flowsDataPublicationTimerCounter = 0;
     }
 }