Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r00b32a5dad2e136d31cfaf0de16f7767b9920fec -rb549c9d87eb01cf1afee74e9fc1e41b3731bdca4 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 00b32a5dad2e136d31cfaf0de16f7767b9920fec) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision b549c9d87eb01cf1afee74e9fc1e41b3731bdca4) @@ -22,6 +22,7 @@ #include "DrainPump.h" #include "Fans.h" #include "MsgQueues.h" +#include "Reservoirs.h" #include "ROPump.h" #include "Thermistors.h" #include "UVReactors.h" @@ -42,11 +43,14 @@ BOOL sendACKMsg( MESSAGE_T *message ); // MSG_ID_ALARM_TRIGGERED -BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 ); +BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 ); // MSG_ID_ALARM_CLEARED -BOOL broadcastAlarmCleared( U16 alarm ); +BOOL broadcastAlarmCleared( U32 alarm ); +// MSG_ID_ALARM_CONDITION_CLEARED +BOOL broadcastAlarmConditionCleared( U32 alarm ); + // MSG_ID_DG_ACCELEROMETER_DATA BOOL broadcastAccelData( F32 x, F32 y, F32 z, F32 xm, F32 ym, F32 zm, F32 xt, F32 yt, F32 zt ); @@ -92,6 +96,12 @@ // MSG_ID_DG_FANS_DATA BOOL broadcastFansData( FANS_DATA_T * fansData ); +// MSG_ID_DG_UV_REACTORS_DATA +BOOL broadcastUVReactorsData( UV_REACTORS_DATA_T *uvReactorsData ); + +// MSG_ID_DG_COMMAND_RESPONSE +void sendCommandResponseMsg( DG_CMD_RESPONSE_T *cmdResponsePtr ); + // MSG_ID_POWER_OFF_WARNING void handlePowerOffWarning( MESSAGE_T *message ); @@ -122,9 +132,6 @@ // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message ); -// MSG_ID_DG_UV_REACTORS_DATA -BOOL broadcastUVReactorsData( UV_REACTORS_DATA_T *uvReactorsData ); - // *********** public test support message functions ********** #ifdef DEBUG_ENABLED