Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r89f4c7f0995e2094b3f26fc7e7e12371e847abac -r6b870cd0699bb3ee22b93981d51373a6c2d56162
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 6b870cd0699bb3ee22b93981d51373a6c2d56162)
@@ -49,13 +49,13 @@
 static const F32 MIN_RINSEBACK_SAFETY_VOLUME_ML = ( TARGET_RINSEBACK_VOLUME_ML * 0.8 );
 
 /// Interval at which rinseback progress is to be published to UI.
-#define RINSEBACK_DATA_PUBLISH_INTERVAL        ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
+static const U32 RINSEBACK_DATA_PUBLISH_INTERVAL  = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
 /// Maximum time allowed for rinseback operation until full volume is delivered.  Timer is reset whenever BP is running.
-#define MAX_RINSEBACK_TIME                     ( 5 * SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) )
+static const U32 MAX_RINSEBACK_TIME               = ( 5 * SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
 /// Maximum time allowed for each additional rinseback volume delivery.
-#define MAX_RINSEBACK_ADDITIONAL_TIME          ( 15 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )
+static const U32 MAX_RINSEBACK_ADDITIONAL_TIME    = ( 15 * MS_PER_SECOND / TASK_GENERAL_INTERVAL );
 /// Multiplier to convert flow (mL/min) into volume (mL) for period of general task interval.
-static const F32 RINSEBACK_FLOW_INTEGRATOR = 1.0 / (F32)( SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
+static const F32 RINSEBACK_FLOW_INTEGRATOR        = 1.0 / (F32)( SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
 
 // ********** private data **********