Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -rdcd360fb4dc37db2dcbeb7fb14fb327fe68235f4 -ra89d6b091874136d75a9bfbdbbc1ff00f42467b3
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision dcd360fb4dc37db2dcbeb7fb14fb327fe68235f4)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision a89d6b091874136d75a9bfbdbbc1ff00f42467b3)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 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    TaskPriority.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      27-Mar-2021
+* @date    (last)      06-Jul-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -58,35 +58,33 @@
 //    SET_TASK_ON();   // TODO - uncomment and define TASK_TIMING_OUTPUT_ENABLED to monitor this tasks timing
 #endif
 
+#ifndef BOARD_WITH_NO_HARDWARE
     // First pass for FPGA
-    execFPGAIn();
+    execFPGAIn();
 
     // Monitor internal ADC channels
     execInternalADC();
-
-#ifndef BOARD_WITH_NO_HARDWARE
 
     // Monitor pressures
     execPressures();
 
     // Monitor load cells
     execLoadCell();
 
-#ifndef DISABLE_HEATERS_AND_TEMPS
+    // Monitor dialysate flow meter
+    execDialysateFlowMeterMonitor();
+
     // Temperature sensors read
     execTemperatureSensors();
-#endif
 
     // Conductivity sensors read
     execConductivitySensors();
 
     // Control valves
     execValves();
 
-#ifndef DISABLE_ACCELS
     // Monitor accelerometer
     execAccel();
-#endif
 
     // Monitor RO pump
     execROPumpMonitor();
@@ -100,23 +98,16 @@
     // Monitor fluid leak detector
     execFluidLeak();
 
-#endif
-
-#ifdef DIALYSATE_FLOW_METER_ENABLED
-    // Monitor dialysate flow meter
-    execDialysateFlowMeterMonitor();
-#endif
-
     // Second pass for FPGA
-    execFPGAOut();
+    execFPGAOut();
+#endif
 
     // Check in with watchdog manager
     checkInWithWatchdogMgmt( TASK_PRIORITY );
 
 #ifdef TASK_TIMING_OUTPUT_ENABLED
 //    SET_TASK_OFF();   // TODO - uncomment and define TASK_TIMING_OUTPUT_ENABLED to monitor this tasks timing
 #endif
-
 }
 
 /**@}*/