Skip to content
Snippets Groups Projects
Commit 05201652 authored by Adrien Lescourt's avatar Adrien Lescourt
Browse files

Merge branch 'ui_fix' into 'master'

parents 47cdea30 1a1c128a
Branches
No related tags found
No related merge requests found
...@@ -150,7 +150,12 @@ class Actuasim(QMainWindow): ...@@ -150,7 +150,12 @@ class Actuasim(QMainWindow):
def frame_received(self, frame): def frame_received(self, frame):
self.logger.info('Frame received:' + str([hex(h) for h in frame[0]])) self.logger.info('Frame received:' + str([hex(h) for h in frame[0]]))
try:
decoded_frame = knxnet.decode_frame(frame[0]) decoded_frame = knxnet.decode_frame(frame[0])
except Exception as e:
self.logger.info('Bad frame: {}'.format(e))
return
if decoded_frame.header.service_type_descriptor == knxnet.ServiceTypeDescriptor.CONNECTION_REQUEST: if decoded_frame.header.service_type_descriptor == knxnet.ServiceTypeDescriptor.CONNECTION_REQUEST:
self.logger.info('= Connection request:\n' + str(decoded_frame)) self.logger.info('= Connection request:\n' + str(decoded_frame))
conn_resp = knxnet.create_frame(knxnet.ServiceTypeDescriptor.CONNECTION_RESPONSE, conn_resp = knxnet.create_frame(knxnet.ServiceTypeDescriptor.CONNECTION_RESPONSE,
......
...@@ -23,14 +23,14 @@ class BlindWidget(QWidget): ...@@ -23,14 +23,14 @@ class BlindWidget(QWidget):
def __init__(self, individual_address, group_address, blind_position=0, animation_speed_ms=1500): def __init__(self, individual_address, group_address, blind_position=0, animation_speed_ms=1500):
super(BlindWidget, self).__init__() super(BlindWidget, self).__init__()
self.ui = Ui_Blind()
self.ui.setupUi(self)
self.logger = logging.getLogger() self.logger = logging.getLogger()
self.individual_address = individual_address self.individual_address = individual_address
self.group_address = group_address self.group_address = group_address
self.ui = Ui_Blind()
self.ui.setupUi(self)
# Progressbar init # Progressbar init
self.is_moving = False self.is_moving = False
self.animation_speed = animation_speed_ms self.animation_speed = animation_speed_ms
......
...@@ -25,14 +25,18 @@ class ValveWidget(QWidget): ...@@ -25,14 +25,18 @@ class ValveWidget(QWidget):
def __init__(self, individual_address, group_address, valve_position=45, animation_speed_ms=1500): def __init__(self, individual_address, group_address, valve_position=45, animation_speed_ms=1500):
super(ValveWidget, self).__init__() super(ValveWidget, self).__init__()
self.ui = Ui_Valve()
self.ui.setupUi(self)
self.logger = logging.getLogger() self.logger = logging.getLogger()
self.individual_address = individual_address self.individual_address = individual_address
self.group_address = group_address self.group_address = group_address
self._position = 0 self._position = 0
self.ui = Ui_Valve()
self.ui.setupUi(self)
self.position = valve_position self.position = valve_position
self.setFixedWidth(220) self.setFixedWidth(220)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment