Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -r5075786897d42d24a93ae5485936b5d50c307f65 -r9862626891d641c84626e9b11373e523f5ef4208
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 5075786897d42d24a93ae5485936b5d50c307f65)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 9862626891d641c84626e9b11373e523f5ef4208)
@@ -130,8 +130,8 @@
 
 #define TOTAL_CONDUCTIVITY                          ( ACID_CONDUCTIVITY_POST + BICARB_CONDUCTIVITY_POST )                                           ///< Theoretical Dialysate conductivity
 
-#define FLOW_SETTING_FOR_STATIC_CONTROL_INTERVAL_UPDATE 100
-#define STATIC_CONTROL_INTERVAL                     2
+#define FLOW_SETTING_FOR_STATIC_CONTROL_INTERVAL_UPDATE 100.0F
+#define STATIC_CONTROL_INTERVAL                     ( 2 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )
 /// Enumeration of dialysate Mixing id.
 typedef enum DialysateMixingID
 {