Fuck you, python
This commit is contained in:
@@ -28,11 +28,11 @@ class SerialReader:
|
|||||||
def subscribe(self, listener : Callable) -> None:
|
def subscribe(self, listener : Callable) -> None:
|
||||||
self.__listeners.append(listener)
|
self.__listeners.append(listener)
|
||||||
|
|
||||||
def __notify(self, data : str):
|
def _notify(self, data : str):
|
||||||
for listener in self.__listeners:
|
for listener in self.__listeners:
|
||||||
listener(data)
|
listener(data)
|
||||||
|
|
||||||
def __read(self):
|
def _read(self):
|
||||||
while self._run_event.is_set():
|
while self._run_event.is_set():
|
||||||
line = self.serial.readline()
|
line = self.serial.readline()
|
||||||
if line:
|
if line:
|
||||||
|
|||||||
@@ -22,6 +22,6 @@ class LoraLightSensorReader(SerialReader):
|
|||||||
if match:
|
if match:
|
||||||
try:
|
try:
|
||||||
data = json.loads(match.group())
|
data = json.loads(match.group())
|
||||||
self.__notify(str(data))
|
self._notify(str(data))
|
||||||
except json.JSONDecodeError:
|
except json.JSONDecodeError:
|
||||||
print("Received invalid JSON:", match.group())
|
print("Received invalid JSON:", match.group())
|
||||||
@@ -7,7 +7,7 @@ class RfidReader(SerialReader):
|
|||||||
def __init__(self, port : str, baudrate: int):
|
def __init__(self, port : str, baudrate: int):
|
||||||
super().__init__(port, baudrate)
|
super().__init__(port, baudrate)
|
||||||
|
|
||||||
def __read(self):
|
def _read(self):
|
||||||
while self._run_event.is_set():
|
while self._run_event.is_set():
|
||||||
data = b""
|
data = b""
|
||||||
while len(data) < 14 and self._run_event.is_set():
|
while len(data) < 14 and self._run_event.is_set():
|
||||||
@@ -19,7 +19,7 @@ class RfidReader(SerialReader):
|
|||||||
hex_value = data[5:11].decode(errors='ignore')
|
hex_value = data[5:11].decode(errors='ignore')
|
||||||
try:
|
try:
|
||||||
res = int(hex_value, 16)
|
res = int(hex_value, 16)
|
||||||
self.__notify(str(res))
|
self._notify(str(res))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
print("Invalid hex:", hex_value)
|
print("Invalid hex:", hex_value)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user