Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r3a87ca0e2a722318216623d7e1f4c354c58c506c -re7fe0454b5b2d39009dc784dc8c156856df8bc86 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 3a87ca0e2a722318216623d7e1f4c354c58c506c) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision e7fe0454b5b2d39009dc784dc8c156856df8bc86) @@ -27,6 +27,7 @@ #include "PAL.h" #include "Pressure.h" #include "SystemCommDD.h" +#include "Temperature.h" #include "Utilities.h" #include "Valves.h" @@ -78,26 +79,31 @@ MSG_ID_DD_SOFTWARE_RESET_REQUEST, MSG_ID_TD_OP_MODE_DATA, MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, - MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST, + MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST, //5 MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST, MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST, MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST, - MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST, + MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST, //10 MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST, MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST, MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST, - MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, + MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, //15 MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST, MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST, MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST, - MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST, + MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST, //20 MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST, MSG_ID_DD_CONCENTRATE_PUMP_PARKED_OVERRIDE_REQUEST, MSG_ID_DD_CONCENTRATE_PUMP_PARK_FAULT_OVERRIDE_REQUEST, - MSG_ID_DD_CONCENTRATE_PUMP_PARK_REQUEST_OVERRIDE_REQUEST + MSG_ID_DD_CONCENTRATE_PUMP_PARK_REQUEST_OVERRIDE_REQUEST, + MSG_ID_DD_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, //25 + MSG_ID_DD_TEMPERATURE_SENSOR_MEASURED_TEMPERATURE_OVERRIDE_REQUEST, + MSG_ID_DD_TEMPERATURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST, + MSG_ID_DD_TEMPERATURE_SENSOR_BARO_READ_COUNTER_OVERRIDE_REQUEST, + MSG_ID_DD_TEMPERATURE_SENSOR_BARO_CRC_OVERRIDE_REQUEST, }; /// Message handling function table @@ -106,26 +112,31 @@ &handleDDSoftwareResetRequest, &handleSetTDOperationMode, &testValvesStatesPublishIntervalOverride, - &testValveStateOverride, + &testValveStateOverride, //5 &testValveSensedStateOverride, &testPressureSensorReadingsOverride, &testPressureSensorTemperatureReadingsOverride, &testPressureSensorReadCounterOverride, - &testPressureSensorErrorCounterOverride, + &testPressureSensorErrorCounterOverride, //10 &testPressureSensorDataPublishIntervalOverride, &testPressureSensorFilteredReadingsOverride, &testPressureSensorFilteredTemperatureReadingsOverride, &testConductivitySensorReadingsOverride, - &testConductivitySensorTemperatureReadingsOverride, + &testConductivitySensorTemperatureReadingsOverride, //15 &testConductivitySensorReadCounterOverride, &testConductivitySensorErrorCounterOverride, &testConductivitySensorDataPublishIntervalOverride, &testConcentratePumpDataPublishIntervalOverride, - &testConcentratePumpTargetSpeedOverride, + &testConcentratePumpTargetSpeedOverride, //20 &testConcentratePumpMeasuredSpeedOverride, &testConcentratePumpParkedOverride, &testConcentratePumpParkCmdFaultedOverride, - &testConcentratePumpParkRequestOverride + &testConcentratePumpParkRequestOverride, + &testTemperatureSensorsDataPublishIntervalOverride, //25 + &testMeasuredTemperatureOverride, + &testTemperatureReadCounterOverride, + &testBaroTemperatureReadCounterOverride, + &testBaroTemperatureCRCOverride }; #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))