Compare commits
2 Commits
15257ae6f2
...
review
| Author | SHA1 | Date | |
|---|---|---|---|
| d1e6d3dfe6 | |||
| 84449e5235 |
64
boot.py
Normal file
64
boot.py
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
"""
|
||||||
|
boot.py — runs before main.py on every ESP32 boot
|
||||||
|
|
||||||
|
Connects WiFi, runs OTA update, then hands off to main.py.
|
||||||
|
Keep this file as simple as possible — it is never OTA-updated itself
|
||||||
|
(it lives outside the repo folder) so bugs here require USB to fix.
|
||||||
|
"""
|
||||||
|
import gauge
|
||||||
|
import network
|
||||||
|
import gc
|
||||||
|
import utime
|
||||||
|
import sys
|
||||||
|
|
||||||
|
import ota
|
||||||
|
|
||||||
|
ota.load_config()
|
||||||
|
WIFI_SSID, WIFI_PASSWORD = ota.WIFI_SSID, ota.WIFI_PASSWORD
|
||||||
|
|
||||||
|
def _connect_wifi(timeout_s=20):
|
||||||
|
sta = network.WLAN(network.STA_IF)
|
||||||
|
sta.active(True)
|
||||||
|
sta.config(txpower=15)
|
||||||
|
if sta.isconnected():
|
||||||
|
return True
|
||||||
|
sta.connect(WIFI_SSID, WIFI_PASSWORD)
|
||||||
|
deadline = utime.time() + timeout_s
|
||||||
|
while not sta.isconnected():
|
||||||
|
if utime.time() > deadline:
|
||||||
|
return False
|
||||||
|
utime.sleep_ms(300)
|
||||||
|
return True
|
||||||
|
|
||||||
|
if WIFI_SSID is None:
|
||||||
|
print("[boot] No WiFi credentials — cannot connect, skipping OTA")
|
||||||
|
elif _connect_wifi():
|
||||||
|
ip = network.WLAN(network.STA_IF).ifconfig()[0]
|
||||||
|
print(f"[boot] WiFi connected — {ip}")
|
||||||
|
|
||||||
|
try:
|
||||||
|
ota.update()
|
||||||
|
except Exception as e:
|
||||||
|
print(f"[boot] OTA error: {e} — continuing with existing files")
|
||||||
|
sys.print_exception(e)
|
||||||
|
utime.sleep_ms(5000)
|
||||||
|
ota._fetch_commit_sha = None
|
||||||
|
ota._fetch_manifest = None
|
||||||
|
ota._fetch_dir = None
|
||||||
|
ota._api_get = None
|
||||||
|
ota._download = None
|
||||||
|
ota.urequests = None
|
||||||
|
del ota.urequests
|
||||||
|
del ota
|
||||||
|
gc.collect()
|
||||||
|
del sys.modules["ota"]
|
||||||
|
gc.collect()
|
||||||
|
|
||||||
|
else:
|
||||||
|
print("[boot] WiFi failed — skipping OTA, booting with existing files")
|
||||||
|
|
||||||
|
# main.py runs automatically after boot.py
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
15
gauge.py
15
gauge.py
@@ -930,19 +930,6 @@ _last_discovery_ms = 0
|
|||||||
_DISCOVERY_INTERVAL_MS = 350
|
_DISCOVERY_INTERVAL_MS = 350
|
||||||
|
|
||||||
|
|
||||||
def _compact_discovery_payload(payload):
|
|
||||||
"""Trim optional HA discovery fields when RAM is tight."""
|
|
||||||
compact = dict(payload)
|
|
||||||
|
|
||||||
# Light entities are the largest payloads because they repeat effect metadata.
|
|
||||||
# Keep core functionality, but omit optional effect declarations to reduce heap use.
|
|
||||||
if compact.get("schema") == "json":
|
|
||||||
compact.pop("effect", None)
|
|
||||||
compact.pop("effect_list", None)
|
|
||||||
|
|
||||||
return compact
|
|
||||||
|
|
||||||
|
|
||||||
def check_mqtt():
|
def check_mqtt():
|
||||||
global client_ref, _mqtt_connected, _last_mqtt_check
|
global client_ref, _mqtt_connected, _last_mqtt_check
|
||||||
now = utime.ticks_ms()
|
now = utime.ticks_ms()
|
||||||
@@ -997,7 +984,7 @@ def check_mqtt():
|
|||||||
|
|
||||||
def _publish_discovery_entity(client, topic, payload, log_msg):
|
def _publish_discovery_entity(client, topic, payload, log_msg):
|
||||||
gc.collect()
|
gc.collect()
|
||||||
client.publish(topic, ujson.dumps(_compact_discovery_payload(payload)), retain=True)
|
client.publish(topic, ujson.dumps(payload), retain=True)
|
||||||
info(log_msg)
|
info(log_msg)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user