From ce7f97d629f4af0b3ee9f2a85cd579ba80fe0173 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 12 Oct 2025 19:27:53 +0000 Subject: [PATCH] Release and Render --- software/release/all/config.py | 2 +- software/release/all/networking.py | 8 ++++---- software/release/am1/boot.py | 20 ++++++++++---------- software/release/am1/config.py | 6 ++++-- software/release/am1/networking.py | 8 ++++---- software/release/hm3/boot.py | 20 ++++++++++---------- software/release/hm3/config.py | 5 +++-- software/release/hm3/networking.py | 8 ++++---- software/release/mm1/boot.py | 20 ++++++++++---------- software/release/mm1/config.py | 5 +++-- software/release/mm1/networking.py | 8 ++++---- software/release/sl1/boot.py | 20 ++++++++++---------- software/release/sl1/config.py | 5 +++-- software/release/sl1/networking.py | 8 ++++---- software/release/sp1/boot.py | 20 ++++++++++---------- software/release/sp1/config.py | 5 +++-- software/release/sp1/networking.py | 8 ++++---- 17 files changed, 91 insertions(+), 85 deletions(-) diff --git a/software/release/all/config.py b/software/release/all/config.py index f71b8c6..e9bb77f 100644 --- a/software/release/all/config.py +++ b/software/release/all/config.py @@ -13,7 +13,7 @@ 'sm3.py': 1, 'sl1.py': 1, 'smartlight.py': 1, - 'networking.py': 6, + 'networking.py': 7, 'main.py': 2, 'boot.py': 0 } diff --git a/software/release/all/networking.py b/software/release/all/networking.py index 9fcf948..85e555e 100644 --- a/software/release/all/networking.py +++ b/software/release/all/networking.py @@ -19,10 +19,10 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti self.dbgmsg = dbgmsg self.errmsg = errmsg self.admin = admin - self.config = {"Name": None, - "Configuration": None, + self.config = {"name": None, + "configuration": None, "id": None, - "Version": None, + "version": None, } #Just as an example, can include more information here, but for interoperability purposes please keep the basic four attributes self._staif = network.WLAN(network.STA_IF) @@ -693,7 +693,7 @@ def __handle_cmd(self, sender_mac, subtype, send_timestamp, receive_timestamp, p self.boops = self.boops + 1 self.master.iprint(f"{msg_subkey} ({subtype}) command received from {sender_mac} ({self.peer_name(sender_mac)}), Received total of {self.boops} boops!") try: - self._compose(sender_mac, [self.master.config, self.master.version, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] + self._compose(sender_mac, [self.master.config, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] except Exception as e: self.master.aen.__send_confirmation(self, "Fail", sender_mac, f"{msg_subkey} ({subtype})", payload, e) elif (msg_subkey := "Echo") and subtype == subtype == 0x02 or subtype == 0x15: # Echo diff --git a/software/release/am1/boot.py b/software/release/am1/boot.py index 5155c63..2bd9f2b 100644 --- a/software/release/am1/boot.py +++ b/software/release/am1/boot.py @@ -45,16 +45,16 @@ global timer print("{:.3f} Name: {}, ID: {}, Configuration: {}, Sta mac: {}, Sta channel: {}, Ap mac: {}, Ap channel: {}, Version: {}".format( - (time.ticks_ms() - networking.inittime) / 1000, - networking.config["name"], - networking.config["id"], - networking.config["configuration"], - networking.config["sta_mac"], - networking.config["sta_channel"], - networking.config["ap_mac"], - networking.config["ap_channel"], - networking.config["version"] - )) + (time.ticks_ms() - networking.inittime) / 1000, + networking.config["name"], + networking.config["id"], + networking.config["configuration"], + networking.config["sta_mac"], + networking.config["sta_channel"], + networking.config["ap_mac"], + networking.config["ap_channel"], + networking.config["version"] +)) def am1(): lastPressed = 0 diff --git a/software/release/am1/config.py b/software/release/am1/config.py index c88ebc8..a643056 100644 --- a/software/release/am1/config.py +++ b/software/release/am1/config.py @@ -1,4 +1,4 @@ -config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-175607'} +config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-192145'} version = { 'adxl345.py': 3, 'am1.py': 1, @@ -13,7 +13,7 @@ 'sm3.py': 1, 'sl1.py': 1, 'smartlight.py': 1, - 'networking.py': 6, + 'networking.py': 7, 'main.py': 2, 'boot.py': 0 } @@ -79,3 +79,5 @@ } #key is i2c address: ["device name", Output (0) or Input (1), "Description"] sensor_dict = {"sensor": [0,4095], "potentiometer": [0,180], "select": [0,1], "up": [0,1], "down": [0,1], "button": [0,1], "sw1": [0,1], "sw2": [0,1], "sw3": [0,1], "sw4": [0,1]} hive_config = {'hive': True, 'recipients': [b'd\xe83\x84\xd8\x18'], 'sender_sensor_list': [[b'd\xe83\x84\xd8\x18', 'None']], 'refreshrate': 200, 'mode': 'None'} + +networking = None diff --git a/software/release/am1/networking.py b/software/release/am1/networking.py index 9fcf948..85e555e 100644 --- a/software/release/am1/networking.py +++ b/software/release/am1/networking.py @@ -19,10 +19,10 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti self.dbgmsg = dbgmsg self.errmsg = errmsg self.admin = admin - self.config = {"Name": None, - "Configuration": None, + self.config = {"name": None, + "configuration": None, "id": None, - "Version": None, + "version": None, } #Just as an example, can include more information here, but for interoperability purposes please keep the basic four attributes self._staif = network.WLAN(network.STA_IF) @@ -693,7 +693,7 @@ def __handle_cmd(self, sender_mac, subtype, send_timestamp, receive_timestamp, p self.boops = self.boops + 1 self.master.iprint(f"{msg_subkey} ({subtype}) command received from {sender_mac} ({self.peer_name(sender_mac)}), Received total of {self.boops} boops!") try: - self._compose(sender_mac, [self.master.config, self.master.version, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] + self._compose(sender_mac, [self.master.config, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] except Exception as e: self.master.aen.__send_confirmation(self, "Fail", sender_mac, f"{msg_subkey} ({subtype})", payload, e) elif (msg_subkey := "Echo") and subtype == subtype == 0x02 or subtype == 0x15: # Echo diff --git a/software/release/hm3/boot.py b/software/release/hm3/boot.py index 5155c63..2bd9f2b 100644 --- a/software/release/hm3/boot.py +++ b/software/release/hm3/boot.py @@ -45,16 +45,16 @@ global timer print("{:.3f} Name: {}, ID: {}, Configuration: {}, Sta mac: {}, Sta channel: {}, Ap mac: {}, Ap channel: {}, Version: {}".format( - (time.ticks_ms() - networking.inittime) / 1000, - networking.config["name"], - networking.config["id"], - networking.config["configuration"], - networking.config["sta_mac"], - networking.config["sta_channel"], - networking.config["ap_mac"], - networking.config["ap_channel"], - networking.config["version"] - )) + (time.ticks_ms() - networking.inittime) / 1000, + networking.config["name"], + networking.config["id"], + networking.config["configuration"], + networking.config["sta_mac"], + networking.config["sta_channel"], + networking.config["ap_mac"], + networking.config["ap_channel"], + networking.config["version"] +)) def am1(): lastPressed = 0 diff --git a/software/release/hm3/config.py b/software/release/hm3/config.py index ef35e2f..a643056 100644 --- a/software/release/hm3/config.py +++ b/software/release/hm3/config.py @@ -1,4 +1,4 @@ -config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-175607'} +config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-192145'} version = { 'adxl345.py': 3, 'am1.py': 1, @@ -13,7 +13,7 @@ 'sm3.py': 1, 'sl1.py': 1, 'smartlight.py': 1, - 'networking.py': 6, + 'networking.py': 7, 'main.py': 2, 'boot.py': 0 } @@ -80,3 +80,4 @@ sensor_dict = {"sensor": [0,4095], "potentiometer": [0,180], "select": [0,1], "up": [0,1], "down": [0,1], "button": [0,1], "sw1": [0,1], "sw2": [0,1], "sw3": [0,1], "sw4": [0,1]} hive_config = {'hive': True, 'recipients': [b'd\xe83\x84\xd8\x18'], 'sender_sensor_list': [[b'd\xe83\x84\xd8\x18', 'None']], 'refreshrate': 200, 'mode': 'None'} +networking = None diff --git a/software/release/hm3/networking.py b/software/release/hm3/networking.py index 9fcf948..85e555e 100644 --- a/software/release/hm3/networking.py +++ b/software/release/hm3/networking.py @@ -19,10 +19,10 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti self.dbgmsg = dbgmsg self.errmsg = errmsg self.admin = admin - self.config = {"Name": None, - "Configuration": None, + self.config = {"name": None, + "configuration": None, "id": None, - "Version": None, + "version": None, } #Just as an example, can include more information here, but for interoperability purposes please keep the basic four attributes self._staif = network.WLAN(network.STA_IF) @@ -693,7 +693,7 @@ def __handle_cmd(self, sender_mac, subtype, send_timestamp, receive_timestamp, p self.boops = self.boops + 1 self.master.iprint(f"{msg_subkey} ({subtype}) command received from {sender_mac} ({self.peer_name(sender_mac)}), Received total of {self.boops} boops!") try: - self._compose(sender_mac, [self.master.config, self.master.version, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] + self._compose(sender_mac, [self.master.config, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] except Exception as e: self.master.aen.__send_confirmation(self, "Fail", sender_mac, f"{msg_subkey} ({subtype})", payload, e) elif (msg_subkey := "Echo") and subtype == subtype == 0x02 or subtype == 0x15: # Echo diff --git a/software/release/mm1/boot.py b/software/release/mm1/boot.py index 5155c63..2bd9f2b 100644 --- a/software/release/mm1/boot.py +++ b/software/release/mm1/boot.py @@ -45,16 +45,16 @@ global timer print("{:.3f} Name: {}, ID: {}, Configuration: {}, Sta mac: {}, Sta channel: {}, Ap mac: {}, Ap channel: {}, Version: {}".format( - (time.ticks_ms() - networking.inittime) / 1000, - networking.config["name"], - networking.config["id"], - networking.config["configuration"], - networking.config["sta_mac"], - networking.config["sta_channel"], - networking.config["ap_mac"], - networking.config["ap_channel"], - networking.config["version"] - )) + (time.ticks_ms() - networking.inittime) / 1000, + networking.config["name"], + networking.config["id"], + networking.config["configuration"], + networking.config["sta_mac"], + networking.config["sta_channel"], + networking.config["ap_mac"], + networking.config["ap_channel"], + networking.config["version"] +)) def am1(): lastPressed = 0 diff --git a/software/release/mm1/config.py b/software/release/mm1/config.py index ef35e2f..a643056 100644 --- a/software/release/mm1/config.py +++ b/software/release/mm1/config.py @@ -1,4 +1,4 @@ -config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-175607'} +config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-192145'} version = { 'adxl345.py': 3, 'am1.py': 1, @@ -13,7 +13,7 @@ 'sm3.py': 1, 'sl1.py': 1, 'smartlight.py': 1, - 'networking.py': 6, + 'networking.py': 7, 'main.py': 2, 'boot.py': 0 } @@ -80,3 +80,4 @@ sensor_dict = {"sensor": [0,4095], "potentiometer": [0,180], "select": [0,1], "up": [0,1], "down": [0,1], "button": [0,1], "sw1": [0,1], "sw2": [0,1], "sw3": [0,1], "sw4": [0,1]} hive_config = {'hive': True, 'recipients': [b'd\xe83\x84\xd8\x18'], 'sender_sensor_list': [[b'd\xe83\x84\xd8\x18', 'None']], 'refreshrate': 200, 'mode': 'None'} +networking = None diff --git a/software/release/mm1/networking.py b/software/release/mm1/networking.py index 9fcf948..85e555e 100644 --- a/software/release/mm1/networking.py +++ b/software/release/mm1/networking.py @@ -19,10 +19,10 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti self.dbgmsg = dbgmsg self.errmsg = errmsg self.admin = admin - self.config = {"Name": None, - "Configuration": None, + self.config = {"name": None, + "configuration": None, "id": None, - "Version": None, + "version": None, } #Just as an example, can include more information here, but for interoperability purposes please keep the basic four attributes self._staif = network.WLAN(network.STA_IF) @@ -693,7 +693,7 @@ def __handle_cmd(self, sender_mac, subtype, send_timestamp, receive_timestamp, p self.boops = self.boops + 1 self.master.iprint(f"{msg_subkey} ({subtype}) command received from {sender_mac} ({self.peer_name(sender_mac)}), Received total of {self.boops} boops!") try: - self._compose(sender_mac, [self.master.config, self.master.version, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] + self._compose(sender_mac, [self.master.config, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] except Exception as e: self.master.aen.__send_confirmation(self, "Fail", sender_mac, f"{msg_subkey} ({subtype})", payload, e) elif (msg_subkey := "Echo") and subtype == subtype == 0x02 or subtype == 0x15: # Echo diff --git a/software/release/sl1/boot.py b/software/release/sl1/boot.py index 5155c63..2bd9f2b 100644 --- a/software/release/sl1/boot.py +++ b/software/release/sl1/boot.py @@ -45,16 +45,16 @@ global timer print("{:.3f} Name: {}, ID: {}, Configuration: {}, Sta mac: {}, Sta channel: {}, Ap mac: {}, Ap channel: {}, Version: {}".format( - (time.ticks_ms() - networking.inittime) / 1000, - networking.config["name"], - networking.config["id"], - networking.config["configuration"], - networking.config["sta_mac"], - networking.config["sta_channel"], - networking.config["ap_mac"], - networking.config["ap_channel"], - networking.config["version"] - )) + (time.ticks_ms() - networking.inittime) / 1000, + networking.config["name"], + networking.config["id"], + networking.config["configuration"], + networking.config["sta_mac"], + networking.config["sta_channel"], + networking.config["ap_mac"], + networking.config["ap_channel"], + networking.config["version"] +)) def am1(): lastPressed = 0 diff --git a/software/release/sl1/config.py b/software/release/sl1/config.py index ef35e2f..a643056 100644 --- a/software/release/sl1/config.py +++ b/software/release/sl1/config.py @@ -1,4 +1,4 @@ -config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-175607'} +config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-192145'} version = { 'adxl345.py': 3, 'am1.py': 1, @@ -13,7 +13,7 @@ 'sm3.py': 1, 'sl1.py': 1, 'smartlight.py': 1, - 'networking.py': 6, + 'networking.py': 7, 'main.py': 2, 'boot.py': 0 } @@ -80,3 +80,4 @@ sensor_dict = {"sensor": [0,4095], "potentiometer": [0,180], "select": [0,1], "up": [0,1], "down": [0,1], "button": [0,1], "sw1": [0,1], "sw2": [0,1], "sw3": [0,1], "sw4": [0,1]} hive_config = {'hive': True, 'recipients': [b'd\xe83\x84\xd8\x18'], 'sender_sensor_list': [[b'd\xe83\x84\xd8\x18', 'None']], 'refreshrate': 200, 'mode': 'None'} +networking = None diff --git a/software/release/sl1/networking.py b/software/release/sl1/networking.py index 9fcf948..85e555e 100644 --- a/software/release/sl1/networking.py +++ b/software/release/sl1/networking.py @@ -19,10 +19,10 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti self.dbgmsg = dbgmsg self.errmsg = errmsg self.admin = admin - self.config = {"Name": None, - "Configuration": None, + self.config = {"name": None, + "configuration": None, "id": None, - "Version": None, + "version": None, } #Just as an example, can include more information here, but for interoperability purposes please keep the basic four attributes self._staif = network.WLAN(network.STA_IF) @@ -693,7 +693,7 @@ def __handle_cmd(self, sender_mac, subtype, send_timestamp, receive_timestamp, p self.boops = self.boops + 1 self.master.iprint(f"{msg_subkey} ({subtype}) command received from {sender_mac} ({self.peer_name(sender_mac)}), Received total of {self.boops} boops!") try: - self._compose(sender_mac, [self.master.config, self.master.version, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] + self._compose(sender_mac, [self.master.config, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] except Exception as e: self.master.aen.__send_confirmation(self, "Fail", sender_mac, f"{msg_subkey} ({subtype})", payload, e) elif (msg_subkey := "Echo") and subtype == subtype == 0x02 or subtype == 0x15: # Echo diff --git a/software/release/sp1/boot.py b/software/release/sp1/boot.py index 5155c63..2bd9f2b 100644 --- a/software/release/sp1/boot.py +++ b/software/release/sp1/boot.py @@ -45,16 +45,16 @@ global timer print("{:.3f} Name: {}, ID: {}, Configuration: {}, Sta mac: {}, Sta channel: {}, Ap mac: {}, Ap channel: {}, Version: {}".format( - (time.ticks_ms() - networking.inittime) / 1000, - networking.config["name"], - networking.config["id"], - networking.config["configuration"], - networking.config["sta_mac"], - networking.config["sta_channel"], - networking.config["ap_mac"], - networking.config["ap_channel"], - networking.config["version"] - )) + (time.ticks_ms() - networking.inittime) / 1000, + networking.config["name"], + networking.config["id"], + networking.config["configuration"], + networking.config["sta_mac"], + networking.config["sta_channel"], + networking.config["ap_mac"], + networking.config["ap_channel"], + networking.config["version"] +)) def am1(): lastPressed = 0 diff --git a/software/release/sp1/config.py b/software/release/sp1/config.py index ef35e2f..a643056 100644 --- a/software/release/sp1/config.py +++ b/software/release/sp1/config.py @@ -1,4 +1,4 @@ -config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-175607'} +config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-12-192145'} version = { 'adxl345.py': 3, 'am1.py': 1, @@ -13,7 +13,7 @@ 'sm3.py': 1, 'sl1.py': 1, 'smartlight.py': 1, - 'networking.py': 6, + 'networking.py': 7, 'main.py': 2, 'boot.py': 0 } @@ -80,3 +80,4 @@ sensor_dict = {"sensor": [0,4095], "potentiometer": [0,180], "select": [0,1], "up": [0,1], "down": [0,1], "button": [0,1], "sw1": [0,1], "sw2": [0,1], "sw3": [0,1], "sw4": [0,1]} hive_config = {'hive': True, 'recipients': [b'd\xe83\x84\xd8\x18'], 'sender_sensor_list': [[b'd\xe83\x84\xd8\x18', 'None']], 'refreshrate': 200, 'mode': 'None'} +networking = None diff --git a/software/release/sp1/networking.py b/software/release/sp1/networking.py index 9fcf948..85e555e 100644 --- a/software/release/sp1/networking.py +++ b/software/release/sp1/networking.py @@ -19,10 +19,10 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti self.dbgmsg = dbgmsg self.errmsg = errmsg self.admin = admin - self.config = {"Name": None, - "Configuration": None, + self.config = {"name": None, + "configuration": None, "id": None, - "Version": None, + "version": None, } #Just as an example, can include more information here, but for interoperability purposes please keep the basic four attributes self._staif = network.WLAN(network.STA_IF) @@ -693,7 +693,7 @@ def __handle_cmd(self, sender_mac, subtype, send_timestamp, receive_timestamp, p self.boops = self.boops + 1 self.master.iprint(f"{msg_subkey} ({subtype}) command received from {sender_mac} ({self.peer_name(sender_mac)}), Received total of {self.boops} boops!") try: - self._compose(sender_mac, [self.master.config, self.master.version, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] + self._compose(sender_mac, [self.master.config, self.master.sta.mac, self.master.ap.mac, self.rssi()], 0x02, 0x20) # [ID, Name, Config, Version, sta mac, ap mac, rssi] except Exception as e: self.master.aen.__send_confirmation(self, "Fail", sender_mac, f"{msg_subkey} ({subtype})", payload, e) elif (msg_subkey := "Echo") and subtype == subtype == 0x02 or subtype == 0x15: # Echo