From 07f7fd486245c0b0c6092342e3bbd55d9d16e6a8 Mon Sep 17 00:00:00 2001 From: matteo porta Date: Tue, 12 Jul 2022 11:54:05 +0200 Subject: [PATCH] test leak --- config/machine_settings/defaults.ini | 4 ++-- src/components/modbus_component.py | 4 ++-- src/components/neo_pixels.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index 4bdc4ca..911da11 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -32,11 +32,11 @@ printer: [tecna_t3] -address: COM3 +port: COM3 baudrate: 115200 [neo_pixels] -address: COM1 +port: COM1 baudrate: 9600 [vision] diff --git a/src/components/modbus_component.py b/src/components/modbus_component.py index 55b89fe..70b987b 100644 --- a/src/components/modbus_component.py +++ b/src/components/modbus_component.py @@ -22,7 +22,7 @@ class ModbusComponent(Component): self.lock = QMutex() def config_changed(self): - self.address = self.config[self.name]["address"] + self.port = self.config[self.name]["port"] self.baudrate = int(self.config[self.name]["baudrate"]) self.stopbits = getattr(serial, self.config[self.name].get("stopbits", "stopbits_one").upper()) self.parity = getattr(serial, self.config[self.name].get("parity", "parity_none").upper()) @@ -33,7 +33,7 @@ class ModbusComponent(Component): self.lock.lock() self.client = ModbusClient( method="rtu", - port=self.address, + port=self.port, stopbits=self.stopbits, bytesize=self.bytesize, parity=self.parity, diff --git a/src/components/neo_pixels.py b/src/components/neo_pixels.py index a890f62..0eb67ae 100644 --- a/src/components/neo_pixels.py +++ b/src/components/neo_pixels.py @@ -18,7 +18,7 @@ class NeoPixels(Component): super().__init__(config=config, name=name, threaded=False) def config_changed(self): - self.address = self.config[self.name]["address"] + self.port = self.config[self.name]["port"] self.baudrate = int(self.config[self.name]["baudrate"]) self.stopbits = getattr(serial, self.config[self.name].get("stopbits", "stopbits_one").upper()) self.parity = getattr(serial, self.config[self.name].get("parity", "parity_none").upper()) @@ -31,7 +31,7 @@ class NeoPixels(Component): raise ValueError("the color parameter must be in the html hex format: '#RRGGBB'") try: conn = serial.Serial( - self.address, + self.port, baudrate=self.baudrate, stopbits=self.stopbits, parity=self.parity,