Index: firmware/App/DDCommon.h =================================================================== diff -u -rff82c2f697e729f16098416acad3d98e337a38cd -r91e5add90c92b7795acfe981a2f87b3f682e5202 --- firmware/App/DDCommon.h (.../DDCommon.h) (revision ff82c2f697e729f16098416acad3d98e337a38cd) +++ firmware/App/DDCommon.h (.../DDCommon.h) (revision 91e5add90c92b7795acfe981a2f87b3f682e5202) @@ -25,7 +25,7 @@ #define DD_VERSION_MAJOR 0 #define DD_VERSION_MINOR 0 #define DD_VERSION_MICRO 0 -#define DD_VERSION_BUILD 27 +#define DD_VERSION_BUILD 32 // ********** development build switches ********** Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -rff82c2f697e729f16098416acad3d98e337a38cd -r91e5add90c92b7795acfe981a2f87b3f682e5202 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision ff82c2f697e729f16098416acad3d98e337a38cd) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 91e5add90c92b7795acfe981a2f87b3f682e5202) @@ -7,8 +7,8 @@ * * @file Temperature.c * -* @author (last) Zoltan Miskolci -* @date (last) 10-Dec-2025 +* @author (last) “rkallala” +* @date (last) 19-Jan-2026 * * @author (original) Vinayakam Mani * @date (original) 25-Sep-2024 @@ -506,15 +506,17 @@ { TEMPERATURE_SENSORS_FP_DATA_T data; - data.m3Temp = getFilteredPressureSensorTemperature( M3_PRES ); - data.p10Temp = getFilteredConductivitySensorTemperature( P9_COND ); - data.p19Temp = getFilteredConductivitySensorTemperature( P18_COND ); - data.p8Temp = getFilteredPressureSensorTemperature( P8_PRES ); - data.p13Temp = getFilteredPressureSensorTemperature( P13_PRES ); - data.p17Temp = getFilteredPressureSensorTemperature( P17_PRES ); - data.p7Temp = getFilteredFlowSensorTemperature( P7_FLOW ); - data.p16Temp = getFilteredFlowSensorTemperature( P16_FLOW ); - data.p46Temp = getFilteredPressureSensorTemperature( P46_PRES ); + data.m3Temp = getFilteredPressureSensorTemperature( M3_PRES ); + data.p10Temp = getFilteredConductivitySensorTemperature( P9_COND ); + data.p19Temp = getFilteredConductivitySensorTemperature( P18_COND ); + data.p8Temp = getFilteredPressureSensorTemperature( P8_PRES ); + data.p13Temp = getFilteredPressureSensorTemperature( P13_PRES ); + data.p17Temp = getFilteredPressureSensorTemperature( P17_PRES ); + data.p7Temp = getFilteredFlowSensorTemperature( P7_FLOW ); + data.p16Temp = getFilteredFlowSensorTemperature( P16_FLOW ); + data.p46Temp = getFilteredPressureSensorTemperature( P46_PRES ); + data.p7InternalTemp = getFlowInternalTemperature( P7_FLOW ); + data.p16InternalTemp = getFlowInternalTemperature( P16_FLOW ); broadcastData( MSG_ID_FP_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_FP_DATA_T ) ); fpTempDataPublicationTimerCounter = 0; Index: firmware/App/Services/Messaging.c =================================================================== diff -u -rff82c2f697e729f16098416acad3d98e337a38cd -r91e5add90c92b7795acfe981a2f87b3f682e5202 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision ff82c2f697e729f16098416acad3d98e337a38cd) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 91e5add90c92b7795acfe981a2f87b3f682e5202) @@ -7,8 +7,8 @@ * * @file Messaging.c * -* @author (last) Dara Navaei -* @date (last) 29-Dec-2025 +* @author (last) “rkallala” +* @date (last) 16-Jan-2026 * * @author (original) Vinayakam Mani * @date (original) 07-Aug-2024 @@ -28,23 +28,21 @@ #include "Flow.h" #include "FlowSensor.h" #include "FluidPump.h" -#include "FlushConcentrate.h" -#include "FlushFilter.h" -#include "FlushPermeate.h" #include "FpgaDD.h" #include "FPModeFault.h" #include "FPModeInitPOST.h" #include "FPModeStandby.h" #include "FPOperationModes.h" #include "Heaters.h" -#include "InletPressureCheck.h" #include "Level.h" #include "Messaging.h" #include "MessagePayloads.h" #include "ModeGenDialysate.h" #include "ModeGenPermeate.h" +#include "ModeGenPermeateDefeatured.h" #include "ModePreGenDialysate.h" #include "ModePreGenPermeate.h" +#include "ModePreGenPermeateDefeatured.h" #include "ModePostGenDialysate.h" #include "ModeStandby.h" #include "OperationModes.h" @@ -55,6 +53,11 @@ #include "ROPump.h" #include "SafetyShutdown.h" #include "SpentChamberFill.h" +#include "StateFlushConcentrate.h" +#include "StateFlushFilter.h" +#include "StateFlushFilterDefeatured.h" +#include "StateFlushPermeate.h" +#include "StateInletPressureCheck.h" #include "SystemCommDD.h" #include "Temperature.h" #include "TestSupport.h" @@ -63,6 +66,7 @@ #include "Ultrafiltration.h" #include "Valves.h" #include "Voltages.h" +#include "WaterQualityMonitor.h" /** * @addtogroup Messaging @@ -198,6 +202,7 @@ { MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST, &testDDConductivitySensorFilteredReadingsOverride }, { MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, &testDDConductivitySensorFilteredTemperatureReadingsOverride }, { MSG_ID_FP_TESTER_LOGIN_REQUEST, &handleTesterFPLogInRequest }, + { MSG_ID_FP_SOFTWARE_RESET_REQUEST, &handleDDSoftwareResetRequest }, { MSG_ID_FP_SET_OPERATION_MODE_REQUEST, &testSetFPOperationMode }, { MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testSetFPOpModePublishIntervalOverride }, { MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testPreGenDataPublishIntervalOverride }, @@ -246,6 +251,19 @@ { MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST, &testSetGeneratePermeateSignal }, { MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testRORejectionRatioDataPublishIntervalOverride }, { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST, &testRORejectionRatioFilteredOverride }, + { MSG_ID_FP_RO_GET_CALCULATED_DUTY_CYCLE_REQUEST, &testROGetCurrentCalculatedDutyCycle }, + { MSG_ID_FP_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testFilterFlushDataPublishIntervalOverride }, + { MSG_ID_FP_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST, &testFilterFlushTimerOverride }, + { MSG_ID_FP_FLUSH_PERMEATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testPermeateFlushDataPublishIntervalOverride }, + { MSG_ID_FP_FLUSH_PERMEATE_TIMER_OVERRIDE_REQUEST, &testPermeateFlushTimerOverride }, + { MSG_ID_FP_FLUSH_PERMEATE_ALARM_TIMER_OVERRIDE_REQUEST, &testPermeateFlushAlarmTimerOverride }, + { MSG_ID_FP_FLUSH_CONCENTRATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testConcentrateFlushDataPublishIntervalOverride }, + { MSG_ID_FP_FLUSH_CONCENTRATE_TIMER_OVERRIDE_REQUEST, &testConcentrateFlushTimerOverride }, + { MSG_ID_FP_DEF_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testFilterFlushDefDataPublishIntervalOverride }, + { MSG_ID_FP_DEF_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST, &testFilterFlushDefTimerOverride }, + { MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testPreGenPermeateDefDataPublishIntervalOverride}, + { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testGenPermeateDefDataPublishIntervalOverride}, + { MSG_ID_FP_DEF_STATUS_REQUEST, &testGetFPDefeaturedStatus }, }; /// Calculation for number of entries in the incoming message function handler look-up table.