Index: shared/scripts/names.py
===================================================================
diff -u -re09e4bf9ba04efde15f93efc8766d2abcaedc4cb -rdd2540a25327b187e4a783682b400fbf711672a3
--- shared/scripts/names.py	(.../names.py)	(revision e09e4bf9ba04efde15f93efc8766d2abcaedc4cb)
+++ shared/scripts/names.py	(.../names.py)	(revision dd2540a25327b187e4a783682b400fbf711672a3)
@@ -58,6 +58,38 @@
 o_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True}
 o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True}
 
+#end-treatment screens
+o_text_object = {"type": "Text", "unnamed": 1, "visible": True}
+o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True}
+#rinseback-setup
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRinsebackStack", "type": "EndTreatmentRinsebackStack", "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinsebackInit", "type": "EndTreatmentRinsebackInit", "visible": True}
+o_EndTreatmentRinsebackInit_rightImage_Image = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackInit_leftImage_Image = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True}
+o_EndTreatmentEndStack_EndTreatmentEndStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentEndStack", "type": "EndTreatmentEndStack", "visible": True}
+o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase = {"container": o_EndTreatmentEndStack_EndTreatmentEndStack, "objectName": "_EndTreatmentBase", "type": "EndTreatmentBase", "visible": True}
+o_rinse_back_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "Rinseback Setup", "type": "Text", "unnamed": 1, "visible": True}
+o_start_rinseback_button_text = {"container": o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True}
+o_rinseback_setup_rinseback_button = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinseback", "type": "EndTreatmentRinseback", "visible": True}
+o_EndTreatmentRinseback_imageEnd_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageEnd", "source": "qrc:/images/iRedCrossWCircle", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_imageDecelerate_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageDecelerate", "source": "qrc:/images/iDecelerate", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_imageAccelerate_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageAccelerate", "source": "qrc:/images/iAccelerate", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_imagePause_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imagePause", "source": "qrc:/images/iPauseLightBlue", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "Rinseback", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_imageResume_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageResume", "source": "qrc:/images/iResume", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinsebackComplete", "type": "EndTreatmentRinsebackComplete", "visible": True}
+o_EndTreatmentRinsebackComplete_Rinseback_Complete_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "Rinseback Complete", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackComplete_END_TREATMENT_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackComplete_ADDITIONAL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "ADDITIONAL", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentAdditional", "type": "EndTreatmentBase", "visible": True}
+o_EndTreatmentAdditional_Additional_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "text": "Additional Rinseback", "type": "Text", "unnamed": 1, "visible": True}
+o_rinseback_timer_ml_min_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "  mL/min", "type": "Text", "unnamed": 1, "visible": True}
+# o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_circle", "type": "ProgressCircle", "visible": True}
+# o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True}
+o_shape_Shape = {"container": o_Gui_MainView, "id": "_shape", "type": "Shape", "unnamed": 1, "visible": True}
+o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_Circle", "type": "ProgressCircle", "visible": True}
+# o_self_test_dry_progress_circle = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "id": "_progressCircle", "type": "ProgressCircle", "unnamed": 1, "visible": True}
 
 #settings_Home
 o_settings_Text = {"container": o_Gui_MainView, "text": "Settings", "type": "Text", "unnamed": 1, "visible": True}
@@ -69,9 +101,21 @@
 o_settings_base_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True}
 o_service_date_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True}
 
-#volume and brightness
-o_SettingsBase_SettingsVolumeBrightness = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsVolumeBrightness", "visible": True}
-o_SettingsBase_Volume_And_Brightness_Text = {"container": o_SettingsBase_SettingsVolumeBrightness, "type": "Text", "unnamed": 1, "visible": True}
-o_brightness_parent_obj = {"container": o_SettingsBase_SettingsVolumeBrightness, "gradient": 0, "id": "_brightness", "type": "Slider", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_0_mL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True}
+o_rinseack_title = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "Rinseback", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackInit_TimeText_TimeText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "gradient": 0, "objectName": "_TimeText", "type": "TimeText", "visible": True}
+o_EndTreatmentRinsebackInit_TimeText_minute_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "objectName": "_TimeText_minute", "type": "Text", "visible": True}
+o_EndTreatmentRinsebackInit_TimeText_hour_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "objectName": "_TimeText_hour", "type": "Text", "visible": True}
+o_EndTreatmentRinseback_1_mL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "Text", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_1_mL_min_Text_2 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_1_mL_Text_2 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentAdditional_1_mL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentAdditional_1_mL_min_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackComplete_TimeText_minute_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "objectName": "_TimeText_minute", "type": "Text", "visible": True}
+o_EndTreatmentRinsebackComplete_TimeText_hour_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete,"objectName": "_TimeText_hour", "type": "Text", "visible": True}
 
-
+o_text_volume_rinseback_state = {"type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_circle_Circle = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_circle", "type": "Circle", "unnamed": 1, "visible": True}
+o_EndTreatmentAdditional_circle_Circle = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "id": "_circle", "type": "Circle", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_circle_ProgressCircle = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_circle", "type": "ProgressCircle", "unnamed": 1, "visible": True}
+o_EndTreatmentAdditional_circle_ProgressCircle = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "id": "_circle", "type": "ProgressCircle", "unnamed": 1, "visible": True}