Skip to content

Sync main with dev/nick #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 2 commits into from
Oct 13, 2025
Merged

Sync main with dev/nick #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
390c5a2
Merge pull request #117 from tuftsceeo/dev/nick
NicK4rT Oct 13, 2025
a56c0e7
Release and Render
github-actions[bot] Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions software/release/all/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'adxl345.py': 3,
'am1.py': 1,
'hm1.py': 1,
'ssp_networking.py': 5,
'ssp_networking.py': 6,
'files.py': 2,
'icons.py': 2,
'prefs.py': 2,
Expand All @@ -13,7 +13,7 @@
'sm3.py': 1,
'sl1.py': 1,
'smartlight.py': 1,
'networking.py': 8,
'networking.py': 9,
'main.py': 2,
'boot.py': 0
}
Expand Down
2 changes: 2 additions & 0 deletions software/release/all/ssp_networking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import gc
import webrepl
from sys import implementation


class SSP_Networking:
Expand All @@ -14,6 +15,7 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti
print(f"{(time.ticks_ms() - inittime) / 1000:.3f} Initialising Smart System Platform Networking")
self.networking = Networking(infmsg, dbgmsg, errmsg, admin, inittime)
config["id"] = ubinascii.hexlify(machine.unique_id()).decode()
config["type"] = (implementation._machine if hasattr(implementation, "_machine") else implementation.name)
config["ap_mac"] = self.networking.ap.mac_decoded()
config["sta_mac"] = self.networking.sta.mac_decoded()
self.networking.config = config
Expand Down
6 changes: 3 additions & 3 deletions software/release/am1/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-13-221423'}
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'type': None, 'version': '2025-10-13-223628'}
version = {
'adxl345.py': 3,
'am1.py': 1,
'hm1.py': 1,
'ssp_networking.py': 5,
'ssp_networking.py': 6,
'files.py': 2,
'icons.py': 2,
'prefs.py': 2,
Expand All @@ -13,7 +13,7 @@
'sm3.py': 1,
'sl1.py': 1,
'smartlight.py': 1,
'networking.py': 8,
'networking.py': 9,
'main.py': 2,
'boot.py': 0
}
Expand Down
2 changes: 2 additions & 0 deletions software/release/am1/ssp_networking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import gc
import webrepl
from sys import implementation


class SSP_Networking:
Expand All @@ -14,6 +15,7 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti
print(f"{(time.ticks_ms() - inittime) / 1000:.3f} Initialising Smart System Platform Networking")
self.networking = Networking(infmsg, dbgmsg, errmsg, admin, inittime)
config["id"] = ubinascii.hexlify(machine.unique_id()).decode()
config["type"] = (implementation._machine if hasattr(implementation, "_machine") else implementation.name)
config["ap_mac"] = self.networking.ap.mac_decoded()
config["sta_mac"] = self.networking.sta.mac_decoded()
self.networking.config = config
Expand Down
6 changes: 3 additions & 3 deletions software/release/hm3/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-13-221423'}
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'type': None, 'version': '2025-10-13-223628'}
version = {
'adxl345.py': 3,
'am1.py': 1,
'hm1.py': 1,
'ssp_networking.py': 5,
'ssp_networking.py': 6,
'files.py': 2,
'icons.py': 2,
'prefs.py': 2,
Expand All @@ -13,7 +13,7 @@
'sm3.py': 1,
'sl1.py': 1,
'smartlight.py': 1,
'networking.py': 8,
'networking.py': 9,
'main.py': 2,
'boot.py': 0
}
Expand Down
2 changes: 2 additions & 0 deletions software/release/hm3/ssp_networking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import gc
import webrepl
from sys import implementation


class SSP_Networking:
Expand All @@ -14,6 +15,7 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti
print(f"{(time.ticks_ms() - inittime) / 1000:.3f} Initialising Smart System Platform Networking")
self.networking = Networking(infmsg, dbgmsg, errmsg, admin, inittime)
config["id"] = ubinascii.hexlify(machine.unique_id()).decode()
config["type"] = (implementation._machine if hasattr(implementation, "_machine") else implementation.name)
config["ap_mac"] = self.networking.ap.mac_decoded()
config["sta_mac"] = self.networking.sta.mac_decoded()
self.networking.config = config
Expand Down
6 changes: 3 additions & 3 deletions software/release/mm1/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-13-221423'}
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'type': None, 'version': '2025-10-13-223628'}
version = {
'adxl345.py': 3,
'am1.py': 1,
'hm1.py': 1,
'ssp_networking.py': 5,
'ssp_networking.py': 6,
'files.py': 2,
'icons.py': 2,
'prefs.py': 2,
Expand All @@ -13,7 +13,7 @@
'sm3.py': 1,
'sl1.py': 1,
'smartlight.py': 1,
'networking.py': 8,
'networking.py': 9,
'main.py': 2,
'boot.py': 0
}
Expand Down
2 changes: 2 additions & 0 deletions software/release/mm1/ssp_networking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import gc
import webrepl
from sys import implementation


class SSP_Networking:
Expand All @@ -14,6 +15,7 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti
print(f"{(time.ticks_ms() - inittime) / 1000:.3f} Initialising Smart System Platform Networking")
self.networking = Networking(infmsg, dbgmsg, errmsg, admin, inittime)
config["id"] = ubinascii.hexlify(machine.unique_id()).decode()
config["type"] = (implementation._machine if hasattr(implementation, "_machine") else implementation.name)
config["ap_mac"] = self.networking.ap.mac_decoded()
config["sta_mac"] = self.networking.sta.mac_decoded()
self.networking.config = config
Expand Down
6 changes: 3 additions & 3 deletions software/release/sl1/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-13-221423'}
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'type': None, 'version': '2025-10-13-223628'}
version = {
'adxl345.py': 3,
'am1.py': 1,
'hm1.py': 1,
'ssp_networking.py': 5,
'ssp_networking.py': 6,
'files.py': 2,
'icons.py': 2,
'prefs.py': 2,
Expand All @@ -13,7 +13,7 @@
'sm3.py': 1,
'sl1.py': 1,
'smartlight.py': 1,
'networking.py': 8,
'networking.py': 9,
'main.py': 2,
'boot.py': 0
}
Expand Down
2 changes: 2 additions & 0 deletions software/release/sl1/ssp_networking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import gc
import webrepl
from sys import implementation


class SSP_Networking:
Expand All @@ -14,6 +15,7 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti
print(f"{(time.ticks_ms() - inittime) / 1000:.3f} Initialising Smart System Platform Networking")
self.networking = Networking(infmsg, dbgmsg, errmsg, admin, inittime)
config["id"] = ubinascii.hexlify(machine.unique_id()).decode()
config["type"] = (implementation._machine if hasattr(implementation, "_machine") else implementation.name)
config["ap_mac"] = self.networking.ap.mac_decoded()
config["sta_mac"] = self.networking.sta.mac_decoded()
self.networking.config = config
Expand Down
6 changes: 3 additions & 3 deletions software/release/sp1/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'version': '2025-10-13-221423'}
config = {'ap_channel': 1, 'id': None, 'name': 'Nick', 'sta_mac': None, 'ap_mac': None, 'configuration': None, 'sta_channel': 1, 'type': None, 'version': '2025-10-13-223628'}
version = {
'adxl345.py': 3,
'am1.py': 1,
'hm1.py': 1,
'ssp_networking.py': 5,
'ssp_networking.py': 6,
'files.py': 2,
'icons.py': 2,
'prefs.py': 2,
Expand All @@ -13,7 +13,7 @@
'sm3.py': 1,
'sl1.py': 1,
'smartlight.py': 1,
'networking.py': 8,
'networking.py': 9,
'main.py': 2,
'boot.py': 0
}
Expand Down
2 changes: 2 additions & 0 deletions software/release/sp1/ssp_networking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import gc
import webrepl
from sys import implementation


class SSP_Networking:
Expand All @@ -14,6 +15,7 @@ def __init__(self, infmsg=False, dbgmsg=False, errmsg=False, admin=False, initti
print(f"{(time.ticks_ms() - inittime) / 1000:.3f} Initialising Smart System Platform Networking")
self.networking = Networking(infmsg, dbgmsg, errmsg, admin, inittime)
config["id"] = ubinascii.hexlify(machine.unique_id()).decode()
config["type"] = (implementation._machine if hasattr(implementation, "_machine") else implementation.name)
config["ap_mac"] = self.networking.ap.mac_decoded()
config["sta_mac"] = self.networking.sta.mac_decoded()
self.networking.config = config
Expand Down