Index: dialin/hd/blood_leak.py =================================================================== diff -u -r4ba661babfe27c5396ffaf4342199faa8e10dd69 -r205df4b194d84b1bd345ce6bccd6e89eba09bcd2 --- dialin/hd/blood_leak.py (.../blood_leak.py) (revision 4ba661babfe27c5396ffaf4342199faa8e10dd69) +++ dialin/hd/blood_leak.py (.../blood_leak.py) (revision 205df4b194d84b1bd345ce6bccd6e89eba09bcd2) @@ -50,6 +50,8 @@ BLOOD_LEAK_INIT_STATE = 2 BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE = 3 BLOOD_LEAK_NORMAL_STATE = 4 + BLOOD_LEAK_RECOVER_BLOOD_DETECT_STATE = 5 + NUM_OF_BLOOD_LEAK_STATES = 6 class HDBloodLeak(AbstractSubSystem): @@ -106,7 +108,8 @@ def get_blood_leak_state(self): """ Gets the current blood leak state - (0: wait for POST, 1: check set point, 2: init, 3: zero and self test, 4: normal ) + (0: wait for POST, 1: check set point, 2: init, + 3: zero and self test, 4: normal, 5: recover blood detect state ) @return: integer - blood leak state """ Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r4ba661babfe27c5396ffaf4342199faa8e10dd69 -r205df4b194d84b1bd345ce6bccd6e89eba09bcd2 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 4ba661babfe27c5396ffaf4342199faa8e10dd69) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 205df4b194d84b1bd345ce6bccd6e89eba09bcd2) @@ -1903,12 +1903,12 @@ @return: 1 if successful, zero otherwise """ - field_type_unit = 1 + field_type_uint = 1 alarm = integer_to_bytearray(alarm_id) - data_type1 = integer_to_bytearray(field_type_unit) + data_type1 = integer_to_bytearray(field_type_uint) dat1 = integer_to_bytearray(data_field1) - data_type2 = integer_to_bytearray(field_type_unit) + data_type2 = integer_to_bytearray(field_type_uint) dat2 = integer_to_bytearray(data_field2) payload = alarm + data_type1 + dat1 + data_type2 + dat2