Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r161a56481d1a194704b63a5fd55d4c5583fa94df -r6b870cd0699bb3ee22b93981d51373a6c2d56162
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 161a56481d1a194704b63a5fd55d4c5583fa94df)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 6b870cd0699bb3ee22b93981d51373a6c2d56162)
@@ -42,9 +42,9 @@
 #define MAX_UF_RATE_ML_PER_HOUR                 2750.0                          ///< Maximum ultrafiltration rate in mL/hour
 #define MAX_UF_ACCURACY_ERROR_ML                250.0                           ///< Maximum ultrafiltration accuracy error in mL over the entire treatment.
 /// Saline bolus data broadcast interval (ms/task time) count.
-#define SALINE_BOLUS_DATA_PUB_INTERVAL          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
+static const U32 SALINE_BOLUS_DATA_PUB_INTERVAL = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
 /// Ultrafiltration rate accuracy check interval count.
-#define UF_ACCURACY_CHECK_INTERVAL              ((1 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND) / TASK_GENERAL_INTERVAL)
+static const U32 UF_ACCURACY_CHECK_INTERVAL     = ((1 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND) / TASK_GENERAL_INTERVAL);
 
 #define MAX_SALINE_VOLUME_DELIVERED             800                             ///< Maximum saline volume delivered for a treatment.
 #define SALINE_BOLUS_RATE_ML_MIN                150                             ///< Fixed rate for saline bolus delivery.