Index: dialin/ui/hd_simulator_alarms.py
===================================================================
diff -u -r206d63e4eefb4f17215e8b33a192691099144b42 -rca129a0f29a49ee531f957a8559fea8051364b90
--- dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision 206d63e4eefb4f17215e8b33a192691099144b42)
+++ dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision ca129a0f29a49ee531f957a8559fea8051364b90)
@@ -122,24 +122,11 @@
         """
         Activates the specified alarm
 
-        @param state: Alarm priority
-        @param alarm: the alarm id
-        @param escalates_in: how long until the alarm escalates
-        @param silence_expires: seconds until silence expires
-        @param flags: additional alarm flags
-                        Alarm flags:
-                        eFlag_systemFault       = 0
-                        eFlag_stop              = 1
-                        eFlag_noClear           = 2
-                        eFlag_noResume          = 3
-                        eFlag_noRinseback       = 4
-                        eFlag_noEndTreatment    = 5
-                        eFlag_noNewTreatment    = 6
-                        eFlag_bypassDialyzer    = 7
-                        eFlag_alarmsToEscalate  = 8
-                        eFlag_alarmsSilenced    = 9
-                        eFlag_userAcknowledged  = 10
-                        ... unused              = 11 - 16
+        @param state: (int) Alarm priority
+        @param alarm: (int) the alarm id
+        @param escalates_in: (int) how long until the alarm escalates
+        @param silence_expires: (int) seconds until silence expires
+        @param flags: (int) See 'cmd_make_alarm_flags'
         @return: None
         """
 
@@ -209,10 +196,15 @@
                          no_rinseback=0,
                          no_end_treatment=0,
                          no_new_treatment=0,
-                         bypass_dialyzer=0,
+                         user_must_ack=0,
                          alarms_to_escalate=0,
                          alarms_silenced=0,
-                         user_acknowledge=0,
+                         lamp_on=0,
+                         unused_1=0,
+                         unused_2=0,
+                         unused_3=0,
+                         unused_4=0,
+                         top_condition=0
                         ):
         """
         Helper function to construct the flags
@@ -238,10 +230,15 @@
                  | no_rinseback         * 2 ** 4 \
                  | no_end_treatment     * 2 ** 5 \
                  | no_new_treatment     * 2 ** 6 \
-                 | bypass_dialyzer      * 2 ** 7 \
+                 | user_must_ack        * 2 ** 7 \
                  | alarms_to_escalate   * 2 ** 8 \
                  | alarms_silenced      * 2 ** 9 \
-                 | user_acknowledge     * 2 ** 10
+                 | lamp_on              * 2 ** 10 \
+                 | unused_1             * 2 ** 11 \
+                 | unused_2             * 2 ** 12 \
+                 | unused_3             * 2 ** 13 \
+                 | unused_4             * 2 ** 14 \
+                 | top_condition        * 2 ** 15
         return flags
 
     def cmd_send_clear_alarms(self):