Scott Petersen
11 years ago
2 changed files with 5 additions and 5 deletions
Unified View
Diff Options
-
+2 -2pyad2usb/ad2usb.py
-
+3 -3pyad2usb/devices.py
+ 2
- 2
pyad2usb/ad2usb.py
View File
| @@ -421,12 +421,12 @@ class AD2USB(object): | |||||
| args = (msg.partition, msg.event_type, msg.event_data) | args = (msg.partition, msg.event_type, msg.event_data) | ||||
| if msg._event_type == 'ALARM_PANIC': | if msg._event_type == 'ALARM_PANIC': | ||||
| self._panic_status = True | self._panic_status = True | ||||
| self.on_panic(args + (True,)) | |||||
| self.on_panic(True) | |||||
| elif msg._event_type == 'CANCEL': | elif msg._event_type == 'CANCEL': | ||||
| if self._panic_status == True: | if self._panic_status == True: | ||||
| self._panic_status = False | self._panic_status = False | ||||
| self.on_panic(args + (False,)) | |||||
| self.on_panic(False) | |||||
| self.on_lrr_message(args) | self.on_lrr_message(args) | ||||
+ 3
- 3
pyad2usb/devices.py
View File
| @@ -271,7 +271,7 @@ class USBDevice(Device): | |||||
| if not no_reader_thread: | if not no_reader_thread: | ||||
| self._read_thread.start() | self._read_thread.start() | ||||
| self.on_open((self._serial_number, self._description)) | |||||
| self.on_open() | |||||
| def close(self): | def close(self): | ||||
| """ | """ | ||||
| @@ -489,7 +489,7 @@ class SerialDevice(Device): | |||||
| else: | else: | ||||
| self._running = True | self._running = True | ||||
| self.on_open(('N/A', "AD2SERIAL")) | |||||
| self.on_open() | |||||
| if not no_reader_thread: | if not no_reader_thread: | ||||
| self._read_thread.start() | self._read_thread.start() | ||||
| @@ -751,7 +751,7 @@ class SocketDevice(Device): | |||||
| else: | else: | ||||
| self._running = True | self._running = True | ||||
| self.on_open(('N/A', "AD2SOCKET")) | |||||
| self.on_open() | |||||
| if not no_reader_thread: | if not no_reader_thread: | ||||
| self._read_thread.start() | self._read_thread.start() | ||||