From f409846eb4ed7126cea832d4b0273d950385bb54 Mon Sep 17 00:00:00 2001 From: Roberval Walsh Date: Tue, 1 Sep 2020 15:44:11 +0200 Subject: [PATCH 1/2] stop systemctl if sensor does not exist --- sensor_monitor.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sensor_monitor.py b/sensor_monitor.py index 9370472..79d998e 100644 --- a/sensor_monitor.py +++ b/sensor_monitor.py @@ -56,6 +56,12 @@ def load_sensors ( self, sensors ) : try: loaded_sensors.append ( sensor_class ( *sensor_opts ) ) except: + if sensor_name == 'BME680': + add = 'a' + if hex(sensor_opts[1])=='0x77': + add='b' + ctl_name = f'sensor_monitor_{sensor_opts[0]:02d}{add}' + os.system(f'sudo systemctl stop {ctl_name}') print(f'\033[93mWarning: The sensor {sensor_name}_i2c-{sensor_opts[0]}_{hex(sensor_opts[1])} does not exist!\033[0m') if len(loaded_sensors) == 0: print('\033[91mError: No sensor available!\033[0m') From 4c9fd2e54206cfe3ada1d84d3eb98048690e6c91 Mon Sep 17 00:00:00 2001 From: Roberval Walsh Date: Tue, 1 Sep 2020 16:21:07 +0200 Subject: [PATCH 2/2] pass port number from command line --- server.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server.py b/server.py index 3954ac6..614b50e 100644 --- a/server.py +++ b/server.py @@ -15,11 +15,13 @@ def signal_handler(signum, frame): #Handle stop process siginal signal.signal(signal.SIGINT, signal_handler) -if len(argv) < 2: - exit("Please input a file path.") +if len(argv) < 3: + exit("Please input a file path and a port number.") if not isfile(argv[1]): exit("Not a file: %s" % argv[1]) +PORT = int(argv[2]) + with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s: s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) s.bind((HOST, PORT)) @@ -27,7 +29,7 @@ def signal_handler(signum, frame): s.listen(10) while not finish: conn, addr = s.accept() - print("Got connection from %s:%i" % addr) + #print("Got connection from %s:%i" % addr) with conn: try: f = open(argv[1], "rb")