Index: firmware/App/Services/Messaging.c =================================================================== diff -u -rf47296145b6a0adb78df0e325587629171909fd6 -ra1907314deab28c20945cd41d2d167924daf2c08 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision f47296145b6a0adb78df0e325587629171909fd6) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision a1907314deab28c20945cd41d2d167924daf2c08) @@ -12,6 +12,7 @@ #include "Pressure.h" #include "ROPump.h" #include "SystemCommRO.h" +#include "Temperature.h" #include "Utilities.h" #include "Valves.h" @@ -76,11 +77,14 @@ MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST, MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST, + MSG_ID_RO_FILTERED_FLOW_RATE_OVERRIDE_REQUEST, + MSG_ID_RO_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST, MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST, MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST, MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST, MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST, - MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST + MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST, + MSG_ID_RO_TEMPERATURE_OVERRIDE_REQUEST }; /// Message handling function table @@ -106,11 +110,14 @@ &testFlowSensorDataPublishIntervalOverride, &testFlowSensorReadingsOverride, &testFlowSensorTemperatureReadingsOverride, + &testFlowSensorFilteredReadingsOverride, + &testFlowSensorFilteredTemperatureReadingsOverride, &testConductivitySensorDataPublishIntervalOverride, &testConductivitySensorReadingsOverride, &testConductivitySensorTemperatureReadingsOverride, &testConductivitySensorReadCounterOverride, - &testConductivitySensorErrorCounterOverride + &testConductivitySensorErrorCounterOverride, + &testMeasuredTemperatureOverride }; #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr)) @@ -325,7 +332,7 @@ } } // ACK/NAK request - if ( message->hdr.msgID < MSG_ID_FIRST_DD_TESTER_MESSAGE ) + if ( message->hdr.msgID < MSG_ID_FIRST_TD_TESTER_MESSAGE ) { if ( respBuffer != COMM_BUFFER_NOT_USED ) { @@ -610,8 +617,6 @@ { testerLoggedIn = FALSE; } - // respond to would be tester - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, testerLoggedIn ); return testerLoggedIn; }