Index: firmware/App/Controllers/DialOutFlow.h =================================================================== diff -u -rf3b83f75a19b975ad1abead662c8151a2907ac00 -r933a18d740285e70be9d00696ed0f5a5381bc8e4 --- firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision f3b83f75a19b975ad1abead662c8151a2907ac00) +++ firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision 933a18d740285e70be9d00696ed0f5a5381bc8e4) @@ -79,18 +79,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 );