Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r14d740bbb065f043daaa348bcda5f447e1c16a32 -r46b16ef94cea2d5db25bfee08457686bc440de23
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 14d740bbb065f043daaa348bcda5f447e1c16a32)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 46b16ef94cea2d5db25bfee08457686bc440de23)
@@ -85,7 +85,7 @@
 #define ARTERIAL_PRESSURE_DIAG_CONDITION    3                                               ///< Arterial pressure status bits diagnostic condition (alarm).
 
 #define OCCLUSION_THRESHOLD_OFFSET          5500                                            ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived above which an occlusion is detected.
-#define OCCLUSION_CLEAR_THRESHOLD_OFFSET    5500                                            ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived below which an occlusion is cleared.
+#define OCCLUSION_CLEAR_THRESHOLD_OFFSET    5000                                            ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived below which an occlusion is cleared.
 
 #define CARTRIDGE_LOADED_THRESHOLD          5000                                            ///< Threshold above which a cartridge is considered loaded.
 #define MIN_OCCLUSION_COUNTS                2000                                            ///< Minimum occlusion sensor reading for range check.
@@ -417,7 +417,7 @@
     U16 artPres       = fpgaArtPres & 0x3FFF;
     U08 artPresStatus = (U08)( fpgaArtPres >> SHIFT_14_BITS );
 
-    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, artErrorCtr, artReadCtr );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_ARTERIAL_PRESSURE_SENSOR, artReadCtr );
     //checkFPGAPersistentAlarms( FPGA_PERS_ERROR_VENOUS_PRESSURE_SESNOR, venReadCtr, venReadCtr ); // TODO investigate this with Noe
 
     if ( ARTERIAL_PRESSURE_NORMAL_OP == artPresStatus )
@@ -452,7 +452,7 @@
     U08 bpReadCtr  = getFPGABloodPumpOcclusionReadCounter();
     U08 bpErrorCtr = getFPGABloodPumpOcclusionErrorCounter();
 
-    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_OCCLUSION_PRESSURE_SENSOR, bpErrorCtr, bpReadCtr );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_OCCLUSION_PRESSURE_SENSOR, bpReadCtr );
 
     // Record occlusion sensor readings
     bloodPumpOcclusion.data = (U32)getFPGABloodPumpOcclusion();
@@ -640,7 +640,7 @@
 #ifndef _RELEASE_
     if( HW_CONFIG_BETA == getHardwareConfigStatus() )
     {
-        outOfRange = (( bpOccl < MIN_OCCLUSION_COUNTS_V3 || bpOccl > MAX_OCCLUSION_COUNTS ? TRUE : FALSE ));
+        outOfRange = ( bpOccl < MIN_OCCLUSION_COUNTS_V3 ? TRUE : FALSE );
     }
 #endif
 
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r9d924ec76ce770eb2a94088bfe37bfb0e30981a8 -r46b16ef94cea2d5db25bfee08457686bc440de23
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9d924ec76ce770eb2a94088bfe37bfb0e30981a8)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 46b16ef94cea2d5db25bfee08457686bc440de23)
@@ -1134,7 +1134,7 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            checkFPGAPersistentAlarms( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, getSyringePumpADCandDACStatus(), getSyringePumpADCReadCounter() );
+            checkFPGAPersistentAlarms( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, getSyringePumpADCReadCounter() );
         }
 
         // Check pump status
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r13b15c23c5065a9967bd8776b0cea2f71cd1a240 -r46b16ef94cea2d5db25bfee08457686bc440de23
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 13b15c23c5065a9967bd8776b0cea2f71cd1a240)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 46b16ef94cea2d5db25bfee08457686bc440de23)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      20-Mar-2023
+* @author  (last)      James Walter Taylor
+* @date    (last)      31-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -45,13 +45,13 @@
 #define CAN_XMIT_PACKET_TIMEOUT_MS      200     ///< If transmitted CAN frame does not cause a transmit complete interrupt within this time, re-send or move on
 #define MAX_XMIT_RETRIES                5       ///< Maximum number of retries on no transmit complete interrupt timeout
 
-#define UI_COMM_TIMEOUT_IN_MS           5000    ///< UI has not checked in for this much time
+#define UI_COMM_TIMEOUT_IN_MS           7500    ///< UI has not checked in for this much time
 #define DG_COMM_TIMEOUT_IN_MS           1000    ///< DG has not checked in for this much time
 
 #define MAX_COMM_CRC_FAILURES           5       ///< Maximum number of CRC errors within window period before alarm
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
 
-#define MSG_NOT_ACKED_TIMEOUT_MS        150     ///< Maximum time for a Denali message that requires ACK to be ACK'd
+#define MSG_NOT_ACKED_TIMEOUT_MS        250     ///< Maximum time for a Denali message that requires ACK to be ACK'd
 
 #define MSG_NOT_ACKED_MAX_RETRIES       10      ///< Maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
 #define PENDING_ACK_LIST_SIZE           25      ///< Maximum number of Denali messages that can be pending ACK at any given time