Index: firmware/App/Controllers/DialOutFlow.h =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -re7bd79a79d566ef58f09cffb4c97d08fbe277ca7 --- firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision e7bd79a79d566ef58f09cffb4c97d08fbe277ca7) @@ -68,18 +68,19 @@ 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 );