Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -re4cc37257141c5227186ac6d8ca3d6c87d009042 -r9b831d8407ad2ac737a58f369455074306d5097a
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 9b831d8407ad2ac737a58f369455074306d5097a)
@@ -1,3 +1,19 @@
+/**************************************************************************
+*
+* Copyright (c) 2021-2021 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file Switches.c
+*
+* @author (last) Dara Navaei
+* @date (last) 01-Oct-2021
+*
+* @author (original) Dara Navaei
+* @date (original) 01-Oct-2021
+*
+***************************************************************************/
 
 #include "FPGA.h"
 #include "Switches.h"
Index: firmware/App/Controllers/Switches.h
===================================================================
diff -u -rfe4bcb2c7b5a0ef8d30fd84750ec2c4256db03e2 -r9b831d8407ad2ac737a58f369455074306d5097a
--- firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision fe4bcb2c7b5a0ef8d30fd84750ec2c4256db03e2)
+++ firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision 9b831d8407ad2ac737a58f369455074306d5097a)
@@ -1,5 +1,20 @@
+/**************************************************************************
+*
+* Copyright (c) 2021-2021 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file Switches.h
+*
+* @author (last) Dara Navaei
+* @date (last) 01-Oct-2021
+*
+* @author (original) Dara Navaei
+* @date (original) 01-Oct-2021
+*
+***************************************************************************/
 
-
 #ifndef APP_CONTROLLERS_SWITCHES_H_
 #define APP_CONTROLLERS_SWITCHES_H_
 
Index: firmware/App/Controllers/Temperatures.c
===================================================================
diff -u -re4cc37257141c5227186ac6d8ca3d6c87d009042 -r9b831d8407ad2ac737a58f369455074306d5097a
--- firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
+++ firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision 9b831d8407ad2ac737a58f369455074306d5097a)
@@ -1,5 +1,20 @@
+/**************************************************************************
+*
+* Copyright (c) 2021-2021 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file Temperatures.c
+*
+* @author (last) Dara Navaei
+* @date (last) 01-Oct-2021
+*
+* @author (original) Dara Navaei
+* @date (original) 01-Oct-2021
+*
+***************************************************************************/
 
-
 #include <math.h> // For temperature calculations
 
 #include "FPGA.h"
Index: firmware/App/Controllers/Temperatures.h
===================================================================
diff -u -rdcded621455d8c6cb2f0818c8a8b0624bff8d601 -r9b831d8407ad2ac737a58f369455074306d5097a
--- firmware/App/Controllers/Temperatures.h	(.../Temperatures.h)	(revision dcded621455d8c6cb2f0818c8a8b0624bff8d601)
+++ firmware/App/Controllers/Temperatures.h	(.../Temperatures.h)	(revision 9b831d8407ad2ac737a58f369455074306d5097a)
@@ -1,3 +1,19 @@
+/**************************************************************************
+*
+* Copyright (c) 2021-2021 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file Temperatures.h
+*
+* @author (last) Dara Navaei
+* @date (last) 01-Oct-2021
+*
+* @author (original) Dara Navaei
+* @date (original) 01-Oct-2021
+*
+***************************************************************************/
 
 #ifndef APP_CONTROLLERS_TEMPERATURES_H_
 #define APP_CONTROLLERS_TEMPERATURES_H_
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r46617afb446c35270b59e21085b270433d13d113 -r9b831d8407ad2ac737a58f369455074306d5097a
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 46617afb446c35270b59e21085b270433d13d113)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 9b831d8407ad2ac737a58f369455074306d5097a)
@@ -46,10 +46,10 @@
 //    #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring
 //    #define DISABLE_CRC_ERROR               1           // Do not error on bad CRC for CAN messages
     #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
-//    #define USE_FMD_FLOW_SENSOR             1           // Use FMD flow sensor (on HD) instead of FMD on DG
+    #define USE_FMD_FLOW_SENSOR             1           // Use FMD flow sensor (on HD) instead of FMD on DG
 //    #define USE_FMB_FLOW_SENSOR             1           // Use FMB flow sensor instead of flow estimation from pump speed/pressure/wearing
 //    #define RUN_BP_OPEN_LOOP                1           // Run blood pump in open loop mode
-    #define RUN_DPI_OPEN_LOOP               1           // Run dialysate inlet pump in open loop mode
+//    #define RUN_DPI_OPEN_LOOP               1           // Run dialysate inlet pump in open loop mode
     #define WORN_OUT_CARTRIDGE              1           // Running with an old worn out cartridge (max wear)
     #define DISABLE_MOTOR_CURRENT_CHECKS    1           // Do not error on HD pump current checks
     #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r46617afb446c35270b59e21085b270433d13d113 -r9b831d8407ad2ac737a58f369455074306d5097a
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 46617afb446c35270b59e21085b270433d13d113)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9b831d8407ad2ac737a58f369455074306d5097a)
@@ -55,7 +55,7 @@
 #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        300     ///< Maximum time for a Denali message that requires ACK to be ACK'd
+#define MSG_NOT_ACKED_TIMEOUT_MS        150     ///< Maximum time for a Denali message that requires ACK to be ACK'd
 #define MSG_NOT_ACKED_MAX_RETRIES       3       ///< 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