Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rbc22e4fbb56800101e22ac1752c2f1b67541ba02 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision bc22e4fbb56800101e22ac1752c2f1b67541ba02)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -7,8 +7,8 @@
 *
 * @file    BalancingChamber.c
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      28-Apr-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  28-Jan-2025
@@ -1392,7 +1392,7 @@
                 }
             }
 
-	    //Update spent fill is complete
+        //Update spent fill is complete
             if ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod )
             {
                 isSpentFillComplete = TRUE;
Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rbc22e4fbb56800101e22ac1752c2f1b67541ba02 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision bc22e4fbb56800101e22ac1752c2f1b67541ba02)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -8,7 +8,7 @@
 * @file    ConcentratePumps.c
 *
 * @author  (last)      Jashwant Gantyada
-* @date    (last)      02-Apr-2026
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  19-Sep-2024
Index: firmware/App/Controllers/DryBiCart.h
===================================================================
diff -u -rfc3ad8a7cdeed09ed70feaeb3517c885e313dfcc -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision fc3ad8a7cdeed09ed70feaeb3517c885e313dfcc)
+++ firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -7,8 +7,8 @@
 *
 * @file    DryBiCart.h
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      30-Apr-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      15-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  19-Nov-2025
Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -rbc22e4fbb56800101e22ac1752c2f1b67541ba02 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision bc22e4fbb56800101e22ac1752c2f1b67541ba02)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -7,8 +7,8 @@
 *
 * @file    RinsePump.c
 *
-* @author  (last)      Raghu Kallala
-* @date    (last)      19-May-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      22-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  02-Oct-2025
Index: firmware/App/DDCommon.h
===================================================================
diff -u -r944ac5a8725d23440fd6aba0de84842af0d03078 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 944ac5a8725d23440fd6aba0de84842af0d03078)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -7,8 +7,8 @@
 *
 * @file    DDCommon.h
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      29-Apr-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      22-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -rbc22e4fbb56800101e22ac1752c2f1b67541ba02 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision bc22e4fbb56800101e22ac1752c2f1b67541ba02)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -7,8 +7,8 @@
 *
 * @file    ConductivitySensors.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      20-Apr-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  13-Sep-2024
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -ra2ea8edd918761b403cbe2c00e1bfe2fc69be5ea -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision a2ea8edd918761b403cbe2c00e1bfe2fc69be5ea)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -7,8 +7,8 @@
 *
 * @file    ModeGenDialysate.c
 *
-* @author  (last)      Raghu Kallala
-* @date    (last)      05-May-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      14-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -rbc22e4fbb56800101e22ac1752c2f1b67541ba02 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision bc22e4fbb56800101e22ac1752c2f1b67541ba02)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -7,8 +7,8 @@
 *
 * @file    Level.c
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      01-May-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  14-Oct-2024
Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -rbc22e4fbb56800101e22ac1752c2f1b67541ba02 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision bc22e4fbb56800101e22ac1752c2f1b67541ba02)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -7,8 +7,8 @@
 *
 * @file    Temperature.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      14-Apr-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  25-Sep-2024
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r1c478c1aff953528127767db1f4f747a7f7089c8 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 1c478c1aff953528127767db1f4f747a7f7089c8)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -8,8 +8,8 @@
 *
 * @file    FpgaDD.c
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      16-Apr-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      01-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  26-Aug-2024
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r4b270434e2fc3734e4b6b303822bbb8f96098616 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 4b270434e2fc3734e4b6b303822bbb8f96098616)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      24-Apr-2026
+* @author  (last)      Dara Navaei
+* @date    (last)      27-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -122,6 +122,7 @@
     { MSG_ID_DD_TESTER_LOGIN_REQUEST,                                               &handleTesterLogInRequest },
     { MSG_ID_DD_SOFTWARE_RESET_REQUEST,                                             &handleDDSoftwareResetRequest },
     { MSG_ID_TD_OP_MODE_DATA,                                                       &handleSetTDOperationMode },
+    { MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE,                                        &handleUpdateAvailable },
     { MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                            &testValvesStatesPublishIntervalOverride },
     { MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST,                                       &testValveStateOverride },
     { MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST,                                &testValveSensedStateOverride },
@@ -770,7 +771,45 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The resetMicroControllerUnit function resets the MCU.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @return none
+ *************************************************************************/
+void resetMicroControllerUnit( void )
+{
+    setSystemREG1_SYSECR( (0x2) << 14 );  // Reset processor
+}
 
+/*********************************************************************//**
+ * @brief
+ * The handleUpdateAvailable function handles a request from the
+ * Firmware FPGA Updater (FFU) to reset the TD firmware processor.
+ * @note If reset is successful, this function will not return.
+ * @details \b Inputs: none
+ * @details \b Outputs: TD processor soft reset if request is valid
+ * @param message Pointer to the reset request message
+ * @return FALSE if reset command rejected
+ *************************************************************************/
+BOOL handleUpdateAvailable( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {   // S/w reset of processor
+        result = TRUE;                        // Reset will prevent this from getting transmitted though
+        requestNewOperationMode( DD_MODE_UPDT );
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DD_2_UI, result );
+
+    return result;
+}
+
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -906,7 +945,7 @@
     if ( 0 == message->hdr.payloadLen )
     {   // S/w reset of processor
         result = TRUE;                        // Reset will prevent this from getting transmitted though
-        setSystemREG1_SYSECR( (0x2) << 14 );  // Reset processor
+        resetMicroControllerUnit();
     }
 
     return result;
Index: firmware/source/sys_main.c
===================================================================
diff -u -r11fcfaffab49f00f358124c8c285a821632eba24 -rdc451e960ab328d05a06137ffdc4d8b2b1601d55
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 11fcfaffab49f00f358124c8c285a821632eba24)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision dc451e960ab328d05a06137ffdc4d8b2b1601d55)
@@ -80,6 +80,7 @@
 #include "FpgaDD.h"
 #include "FPInterface.h"
 #include "Heaters.h"
+#include "Integrity.h"
 #include "Interrupts.h"
 #include "Level.h"
 #include "ModeGenPermeateDefeatured.h"
@@ -209,7 +210,11 @@
     initUltrafiltration();
     initRinsePump();
     initDryBiCart();
+<<<<<<< HEAD
     initSubstitutionPump();
+=======
+    initIntegrity();
+>>>>>>> staging
 
     // FP Modules