Browse Source

Removed some unnecessary changes

pyserial_fix
Ted Drain 7 years ago
parent
commit
c52a61bf9e
1 changed files with 1 additions and 3 deletions
  1. +1
    -3
      alarmdecoder/decoder.py

+ 1
- 3
alarmdecoder/decoder.py View File

@@ -152,7 +152,6 @@ class AlarmDecoder(object):
self._panic_status = False self._panic_status = False
self._relay_status = {} self._relay_status = {}
self._internal_address_mask = 0xFFFFFFFF self._internal_address_mask = 0xFFFFFFFF

self.last_fault_expansion = 0 self.last_fault_expansion = 0
self.fault_expansion_time_limit = 30 # Seconds self.fault_expansion_time_limit = 30 # Seconds


@@ -253,7 +252,7 @@ class AlarmDecoder(object):
def open(self, baudrate=None, no_reader_thread=False): def open(self, baudrate=None, no_reader_thread=False):
"""Opens the device. """Opens the device.


If the device cannot be opened, an except is thrown. In that
If the device cannot be opened, an exception is thrown. In that
case, open() can be called repeatedly to try and open the case, open() can be called repeatedly to try and open the
connection. connection.


@@ -796,7 +795,6 @@ class AlarmDecoder(object):
if fire_status == True: if fire_status == True:
self._fire_state = FireState.ALARM self._fire_state = FireState.ALARM
self._fire_status = (fire_status, time.time()) self._fire_status = (fire_status, time.time())

self.on_fire(status=FireState.ALARM) self.on_fire(status=FireState.ALARM)


elif self._fire_state == FireState.ALARM: elif self._fire_state == FireState.ALARM:


Loading…
Cancel
Save