Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r28672c1c97532a025a2ca23148760904bde814e5 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision a7bf3ca23ea37a61000379facae628a31b3ecc59) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 28672c1c97532a025a2ca23148760904bde814e5) @@ -7,8 +7,8 @@ * * @file SystemCommMessages.h * -* @author (last) Dara Navaei -* @date (last) 10-Jun-2020 +* @author (last) Quang Nguyen +* @date (last) 24-Aug-2020 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -17,9 +17,24 @@ #ifndef __SYSTEM_COMM_MESSAGES_H__ #define __SYSTEM_COMM_MESSAGES_H__ - + +#include "DrainPump.h" #include "DGCommon.h" -#include "MsgQueues.h" +#include "MsgQueues.h" +#include "ROPump.h" +#include "UVReactors.h" +#include "Thermistors.h" +#include "Fans.h" +#include "ModeHeatDisinfect.h" +#include "Heaters.h" + +/** + * @defgroup SystemCommMessages SystemCommMessages + * @brief System communication messages service module. Handles and broadcasts system messages. + * + * @addtogroup SystemCommMessages + * @{ + */ // ********** public definitions ********** @@ -34,6 +49,9 @@ // MSG_ID_ALARM_CLEARED BOOL broadcastAlarmCleared( U16 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 ); + // MSG_ID_RTC_EPOCH BOOL broadcastRTCEpoch( U32 epoch ); // TODO - probably don't want DG to broadcast these @@ -47,17 +65,26 @@ BOOL broadcastValvesStates( U16 valvesStates ); // MSG_ID_RO_PUMP_DATA -BOOL broadcastROPumpData( U32 tgtPressure, F32 measFlow, F32 setPWM ); +BOOL broadcastROPumpData( RO_PUMP_DATA_T *pumpData ); // MSG_ID_DRAIN_PUMP_DATA -BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac ); +BOOL broadcastDrainPumpData( DRAIN_PUMP_DATA_T *drainPumpData ); // MSG_ID_DG_PRESSURES_DATA BOOL broadcastPressureSensorsData( F32 measROIn, F32 measROOut, F32 measDrainIn, F32 measDrainOut ); // MSG_ID_DG_RESERVOIR_DATA BOOL broadcastReservoirData( U32 resID, U32 fillToVol, U32 drainToVol ); +// MSG_ID_HEATERS_READINGS +BOOL broadcastHeatersData ( HEATERS_DATA_T *heatersData ); + +// MSG_ID_TEMPERATURE_SENSORS_READINGS +BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength ); + +// MSG_ID_DG_CONDUCTIVITY_DATA +BOOL broadcastConductivityData( F32 roRejectionRatio, F32 cpi, F32 cpo ); + // MSG_ID_POWER_OFF_WARNING void handlePowerOffWarning( MESSAGE_T *message ); @@ -82,20 +109,35 @@ // MSG_ID_DG_SAMPLE_WATER_CMD void handleSampleWaterCmd( MESSAGE_T *message ); +// MSG_ID_START_STOP_PRIMARY_HEATER +BOOL handleStartStopPrimaryHeater( MESSAGE_T * message ); + // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message ); -// MSG_ID_HEATERS_READINGS -BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC ); - // MSG_ID_TEMPERATURE_SENSORS_READINGS -BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength ); - +BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength ); + +//MSG_ID_DG_HEAT_DISINFECT_DATA +BOOL broadcastHeatDisinfectData( DG_HEAT_DISINFECT_DATA_T *data ); + +// MSG_ID_DG_UV_REACTORS_DATA +BOOL broadcastUVReactorsData( UV_REACTORS_DATA_T *uvReactorsData ); + +// MSG_ID_DG_THERMISTORS_DATA +BOOL broadcastThermistorsData( THERMISTORS_DATA_T *thermistorsData ); + +// MSG_ID_DG_FANS_DATA +BOOL broadcastFansData( FANS_DATA_T * fansData ); + // *********** public test support message functions ********** #ifdef DEBUG_ENABLED // DEBUG OUTPUT BOOL sendDebugData( U08 *dbgData, U32 len ); + +// Debug message to UI for logging +void sendDebugDataToUI( U08 *str ); #endif // MSG_TESTER_LOG_IN @@ -132,17 +174,14 @@ // MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE: void handleTestPressureDataBroadcastIntervalOverrideRequest( MESSAGE_T *message ); -// MSG_ID_RO_PUMP_SET_PT_OVERRIDE: -void handleTestROPumpSetPointOverrideRequest( MESSAGE_T *message ); - // MSG_ID_RO_MEASURED_FLOW_OVERRIDE: void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message ); // MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE: void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message ); // MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE: -void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message ); +void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message ); // MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE: void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message ); @@ -157,11 +196,82 @@ void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message ); // MSG_ID_START_STOP_PRIMARY_HEATER -BOOL handleStartStopPrimaryHeater( MESSAGE_T * message ); +BOOL handleStartStopPrimaryHeater( MESSAGE_T *message ); -#ifdef CAN_TEST -// MSG_ID_DG_CAN_TEST_1_LARGE_FREQ -void broadcastCANTest1LargeFrequentMessage(); -#endif +// MSG_ID_START_STOP_DG_HEAT_DISINFECT +BOOL handleStartStopDGHeatDisinfect( MESSAGE_T *message ); + +// MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE +void handleSetDrainPumpDeltaPressureOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS +void handleSetHeatDisinfectRecircStateDurationOverrideRequest( MESSAGE_T *message ); + +//MSG_ID_HEAT_DISINFECT_RSRVR1_TO_RSRVR2_DURATION_MINS +void handleSetHeatDisinfectRSVR1ToRSVR2StateDurationOverrideRequest( MESSAGE_T *message ); + +//MSG_ID_HEAT_DISINFECT_RSRVR2_TO_RSRVR1_DURATION_MINS +void handleSetHeatDisinfectRSVR2ToRSVR1StateDurationOverrideRequest( MESSAGE_T *message ); + +//MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN +void handleSetHeatDisinfectNoOfCyclesStateDurationOverrideRequest( MESSAGE_T *message ); + +//MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE +void handleSetHeatDisinfectionPublishDataIntervalOverrideRequest( MESSAGE_T *message ); + +void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_CONDUCTIVITY_OVERRIDE +void handleTestSetConductivityOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE +void handleTestSetConductivityDataPublishIntervalOverrideRequest( MESSAGE_T *message ); +// MSG_ID_DG_ACCEL_OVERRIDE: +void handleTestDGAccelOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_DG_ACCEL_MAX_OVERRIDE: +void handleTestDGAccelMaxOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE: +void handleTestDGAccelBroadcastIntervalOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_DG_ACCEL_SET_CALIBRATION: +void handleSetAccelCalibration( MESSAGE_T *message ); + +// MSG_ID_DG_START_STOP_INLET_UV_REACTOR +BOOL handleStartStopInletUVReactor( MESSAGE_T *message ); + +//MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE +void handleUVReactorsDataPublishIntervalOverride( MESSAGE_T *message ); + +// MSG_ID_DG_FANS_DATA_PUBLISH_OVERRIDE +void handleFansDataPublishIntervalOverride( MESSAGE_T *message ); + +// MSG_ID_DG_START_STOP_OUTLET_UV_REACTOR +BOOL handleStartStopOutletUVReactor( MESSAGE_T *message ); + +// MSG_ID_DG_UV_REACTORS_HEALTH_OVERRIDE +void handleUVReactorsHealthOverride( MESSAGE_T *message ); + +// MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE +void handleThermistorsDataPublishIntervalOverride( MESSAGE_T *message ); + +// MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE +void handleThermisotrsValueOverride( MESSAGE_T *message ); + +// MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE +void handleROPumpDutyCycleOverride( MESSAGE_T *message ); + +// MSG_ID_DG_RO_FLOW_RATE_OVERRIDE +void handleROFlowRateOverride( MESSAGE_T *message ); + +// MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE +void handleROPumpTargetFlowOverride( MESSAGE_T *message ); + +// MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE +void handleROPumpTargetPressureOverride( MESSAGE_T *message ); + +/**@}*/ + #endif