Index: shared/scripts/names.py
===================================================================
diff -u -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7 -r932d63fb26cda19a65375d592e454836f8b2522e
--- shared/scripts/names.py	(.../names.py)	(revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7)
+++ shared/scripts/names.py	(.../names.py)	(revision 932d63fb26cda19a65375d592e454836f8b2522e)
@@ -65,7 +65,7 @@
     "Last disinfection date CRC error.",                                                                                  
     "Pressure at outlet of RO pump is out of range.",                                                                     
     "DG temperature sensors fault.",                                                                                      
-    "DG temperature sensors values are inconsistent.",                                                                    
+    "FPGA communication down for too long.",
     "HD communication timeout.",                                                                                          
     "FPGA not accepting commanded valve states.",                                                                         
     "Blood pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed.",           
@@ -117,6 +117,7 @@
 o_poweroff_notification = {"container": o_Overlay     , "id": "_titleText"     , "type": "TitleText"  , "unnamed": 1, "visible": True, "type": "Text", "text": "System is shutting down"}
 o_poweroff_rejection    = {"container": o_Overlay     , "id": "_titleText"     , "type": "TitleText"  , "unnamed": 1, "visible": True, "type": "Text"}
 o_settings_end_treatment  = {"container": o_QQuickView  , "objectName": "_endTreatmentButton", "type": "TouchRect"}
+o_settings_clear_alarm_condition  = {"container": o_QQuickView  , "objectName": "_clearAlarmCondition", "type": "TouchRect"}
 
 # Main Treatment Screen 
 o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True}
@@ -160,10 +161,14 @@
 # Alarm Status
 o_qquickview_alarm = {"type": "QQuickView", "unnamed": 1, "visible": True}
 o_alarm_dialog = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
-o_okay_alarm = {"container": o_Overlay, "id": "_okay", "type": "TouchRect", "unnamed": 1, "visible": True}
+o_okay_alarm = {"container": o_Overlay, "objectName": "_alarmOK", "type": "TouchRect"}
+o_alarm_resume = {"container": o_Overlay, "objectName": "_alarmResume", "type": "TouchRect"}
+o_alarm_rinseback = {"container": o_Overlay, "objectName": "_alarmRinseback", "type": "TouchRect"}
+o_alarm_end = {"container": o_Overlay, "objectName": "_alarmEnd", "type": "TouchRect"}
 o_alarm_bar = {"container": o_qquickview_alarm, "objectName": "NotificationBar", "type": "NotificationBar"}
+o_alarm_mute_button = {"container": o_Overlay, "objectName": "_alarmMuteButton", "type": "MuteButton"}
+o_alarm_silence_expires = {"container": o_Overlay, "objectName": "_TimeText", "type": "TimeText"}
 o_treatmentStart_heparinTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_heparinTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True}
-o_dismiss_alarm = {"container": o_Overlay, "id": "_silence", "type": "TouchRect", "unnamed": 1, "visible": True}
 o_treatmentStart_TimeText_TimeText = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText", "type": "TimeText", "visible": True}
 o_treatmentStart_TimeText_hour_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_hour", "type": "Text", "visible": True}
 o_treatmentStart_TimeText_minute_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_minute", "type": "Text", "visible": True}
@@ -394,6 +399,11 @@
 o_NotificationDialog_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text"}
 o_NotificationDialog_OKAY             = {"container": o_Overlay, "text": "OKAY", "type": "Text"}
 
+# Alert System
+o_alert                               = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle"}
+o_alert_confirm                       = {"container": o_Overlay, "objectName": "AlertConfirmButton", "type": "TouchRect"}
+o_alert_cancel                        = {"container": o_Overlay, "objectName": "AlertCancelButton", "type": "TouchRect"}
+
 o_create_treatment_button = {"container": o_treatmentHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1 }
 o_create_treatment_container = {"container": o_qquickview_alarm, "objectName": "TreatmentCreate", "type": "TreatmentCreate" }
 o_create_treatment_flickable = {"container": o_create_treatment_container, "objectName": "_treatmentCreateFlickable", "type": "Flickable"}
@@ -416,6 +426,11 @@
 o_create_treatment_confirm = {"container": o_create_treatment_confirm_container, "objectName": "_continueRect", "type": "TouchRect"}
 o_create_treatment_confirm_back_button = {"container": o_create_treatment_confirm_container, "objectName": "_backButton", "type": "BackButton"}
 
+o_create_treatment_arterial_column = {"container": o_create_treatment_container, "objectName": "_arterialPressureLimitsColumn", "type": "Column" }
+o_create_treatment_arterial_slider = {"container": o_create_treatment_container, "objectName": "_arterialPressureLimitsSlider", "type": "RangeSlider" }
+o_create_treatment_venous_column = {"container": o_create_treatment_container, "objectName": "_venousPressureLimitsColumn", "type": "Column" }
+o_create_treatment_venous_slider = {"container": o_create_treatment_container, "objectName": "_venousPressureLimitsSlider", "type": "RangeSlider" }
+
 # Confirm + Priming + Begin Treatment
 o_confirm_treatment_flickable = {"container": o_create_treatment_confirm_container, "objectName": "_treatmentConfirmFlickable", "type": "Flickable"}
 o_priming_container = {"container": o_qquickview_alarm, "objectName": "_treatmentPrime", "type": "TreatmentPrime"}