Index: leahi_dialin/td/modules/alarms.py =================================================================== diff -u -r862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f -r7678b50f98ede4ca151d3fdfa4180da03c57ce2b --- leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f) +++ leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 7678b50f98ede4ca151d3fdfa4180da03c57ce2b) @@ -651,7 +651,7 @@ key = integer_to_bytearray(-758926171) # 0xD2C3B4A5 payload = key - return cmd_generic_override( + resp = cmd_generic_override( payload = payload, reset = NO_RESET, channel_id = CanChannels.dialin_to_td_ch_id, @@ -661,7 +661,10 @@ logger = self.logger, can_interface = self.can_interface) + self.clear_dialin_alarms() + return resp + def cmd_alarm_time_override(self, alarm: int, time_ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the alarm time override command Index: leahi_dialin/td/proxies/ui_proxy.py =================================================================== diff -u -r862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f -r7678b50f98ede4ca151d3fdfa4180da03c57ce2b --- leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision 862daa5b6357ddaba02aa7d1fb9d0952e4a16e6f) +++ leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision 7678b50f98ede4ca151d3fdfa4180da03c57ce2b) @@ -441,15 +441,16 @@ can_interface = self.can_interface) - def cmd_send_ui_initiate_treatment(self, accepted:int = ACCEPTED ) -> None: + def cmd_send_ui_initiate_treatment(self, modularity: int, accepted: int = ACCEPTED ) -> None: """ Constructs and sends a UI initiate treatment message. + :param modularity: (int) The treatment mode. HD = 0, HDF = 1, HD with HDF cartridge = 2 :param accepted: (int) the acceptance value :return: none """ - acc = integer_to_bytearray(accepted) - payload = acc + payload = integer_to_bytearray(accepted) + payload += integer_to_bytearray(modularity) cmd_generic_override(payload = payload, reset = None,