Index: firmware/App/Controllers/DialOutFlow.h
===================================================================
diff -u -rc84daa1f07003427fc5cdde8f5651434478f7313 -r8e7158d8231435496fcf1d5649e51babf859ccc7
--- firmware/App/Controllers/DialOutFlow.h	(.../DialOutFlow.h)	(revision c84daa1f07003427fc5cdde8f5651434478f7313)
+++ firmware/App/Controllers/DialOutFlow.h	(.../DialOutFlow.h)	(revision 8e7158d8231435496fcf1d5649e51babf859ccc7)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file DialOutFlow.h
 *
-* @author (last) Sean
-* @date (last) 06-May-2020
+* @author (last) Sean Nash
+* @date (last) 01-Dec-2020
 *
 * @author (original) Sean
 * @date (original) 24-Jan-2020
@@ -43,6 +43,7 @@
 } LOAD_CELL_T;
 
 #pragma pack(push, 1)
+
 /// Dialysate outlet pump broadcast record
 typedef struct DialOutBroadcastingRecord
 {
@@ -54,6 +55,16 @@
     F32 measMCCurrmA;                               ///< Latest measured motor controller current for dialysate outlet pump in mA.
     F32 setPWMpct;                                  ///< Latest PWM duty cycle for dialysate outlet pump in % (0..100).
 } DIAL_OUT_FLOW_DATA_T;
+
+/// Payload record structure for a load cell data message.
+typedef struct
+{
+    F32 res1PrimaryLoadCell;
+    F32 res1BackupLoadCell;
+    F32 res2PrimaryLoadCell;
+    F32 res2BackupLoadCell;
+} LOAD_CELL_READINGS_PAYLOAD_T;
+
 #pragma pack(pop)
 
 // ********** public function prototypes **********
@@ -68,23 +79,23 @@
 void signalDialOutPumpHardStop( void );
 void signalDialOutPumpRotorHallSensor( void );
 BOOL homeDialOutPump( void );
+BOOL isDialOutPumpRunning( void );
 
 BOOL setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup );
 
 // SELF_TEST_STATUS_T execDialOutFlowTest( void );  // TODO - implement later
 
-DATA_GET_PROTOTYPE( F32, getTotalTargetDialOutUFVolumeInMl );
-DATA_GET_PROTOTYPE( F32, getTotalMeasuredUFVolumeInMl);
-DATA_GET_PROTOTYPE( F32, getMeasuredDialOutPumpMCSpeed );
-DATA_GET_PROTOTYPE( F32, getMeasuredDialOutPumpMCCurrent );
-DATA_ARRAY_GET_PROTOTYPE( F32, getLoadCellWeightInGrams, loadCellID );
-DATA_GET_PROTOTYPE( F32, getMeasuredDialOutPumpRotorSpeed );
-DATA_GET_PROTOTYPE( F32, getMeasuredDialOutPumpSpeed );
+F32 getTotalTargetDialOutUFVolumeInMl( void );
+F32 getTotalMeasuredUFVolumeInMl( void );
+F32 getMeasuredDialOutPumpMCSpeed( void );
+F32 getMeasuredDialOutPumpMCCurrent( void );
+F32 getLoadCellWeightInGrams( U32 loadCellID );
+F32 getMeasuredDialOutPumpRotorSpeed( void );
+F32 getMeasuredDialOutPumpSpeed( void );
 
 BOOL testSetDialOutPumpAndLoadCellDataPublishIntervalOverride( U32 value );
 BOOL testResetDialOutPumpAndLoadCellDataPublishIntervalOverride( void );
 BOOL testSetTargetDialOutFlowRateOverride( S32 value, U32 ctrlMode );
-BOOL testResetTargetDialOutFlowRateOverride( void );
 BOOL testSetDialOutUFRefVolumeOverride( F32 value );
 BOOL testResetDialOutUFRefVolumeOverride( void );
 BOOL testSetDialOutUFTotVolumeOverride( F32 value );