way/pigway-device-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

refactor: isolate OLED and RGB workers

Browse Source
This commit is contained in:
way
2026-09-27 15:07:16 +08:00
parent 38362be824
commit c3ed599198
3 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/pigway_pi_control.py
+34 -26
View File
@@ -582,10 +582,12 @@ class DisplayController:
self.page_started=now
self.batch_depth=0
self.stop_event=threading.Event()
self.oled_wake=threading.Event()
self.oled_thread=threading.Thread(target=self._oled_worker,name="oled",daemon=True)
self.rgb_thread=threading.Thread(target=self._rgb_worker,name="rgb",daemon=True)
def start(self):
oled_init(); self.refresh(); rgb_off(); self.rgb_thread.start()
oled_init(); rgb_off(); self.oled_thread.start(); self.rgb_thread.start()
def update_home(self,cpu,temp,mem,disk):
with self.lock:
@@ -623,7 +625,7 @@ class DisplayController:
if self.batch_depth==0:
self._arbitrate_locked()
if self.current_oled_page_id not in self.requests:
self._show_page_locked(self.current_owner_id)
self._select_page_locked(self.current_owner_id)
else: self._sync_rgb_locked()
def begin_update(self):
@@ -636,7 +638,7 @@ class DisplayController:
if self.batch_depth==0:
self._arbitrate_locked()
if self.current_oled_page_id not in self.requests:
self._show_page_locked(self.current_owner_id)
self._select_page_locked(self.current_owner_id)
else: self._sync_rgb_locked()
def _arbitrate_locked(self):
@@ -654,23 +656,18 @@ class DisplayController:
self.current_rgb_mode=request["rgb_mode"]
self.owner_since=time.monotonic()
log("INFO","DISPLAY_OWNER",old=old,new=request["id"],priority=request["priority"])
self._show_page_locked(request["id"])
self._select_page_locked(request["id"])
def _ordered_alerts_locked(self):
return sorted((r for r in self.requests.values() if r["id"]!="NORMAL_HOME"),
key=lambda r:(-r["priority"],r["first_seen"],r["id"]))
def _show_page_locked(self,page_id):
alerts=self._ordered_alerts_locked()
def _select_page_locked(self,page_id,wake=True):
request=self.requests.get(page_id,self.requests["NORMAL_HOME"])
self.current_oled_page_id=request["id"]
self.page_started=time.monotonic()
self._sync_rgb_locked()
if request["id"]=="NORMAL_HOME":
render_home(*request["metadata"]["home"])
else:
alert_ids=[a["id"] for a in alerts]
render_alert(request,alert_ids.index(request["id"])+1,len(alerts))
if wake: self.oled_wake.set()
def _sync_rgb_locked(self):
# Alert pages show that alert's object color. HOME keeps the highest-
@@ -680,24 +677,23 @@ class DisplayController:
rgb_request=self.requests.get(self.current_owner_id,self.requests["NORMAL_HOME"])
if rgb_request is None:
rgb_request=self.requests["NORMAL_HOME"]
self.current_rgb_mode=rgb_request["rgb_mode"]
wanted_mode=rgb_request["rgb_mode"]
if wanted_mode!=self.current_rgb_mode:
self.current_rgb_mode=wanted_mode
def refresh(self):
with self.lock:
alerts=self._ordered_alerts_locked()
pages=["NORMAL_HOME"]+[a["id"] for a in alerts]
if self.current_oled_page_id not in pages:
self._show_page_locked(self.current_owner_id)
return
if len(pages)>1 and time.monotonic()-self.page_started>=PAGE_INTERVAL:
self._select_page_locked(self.current_owner_id,wake=False)
elif len(pages)>1 and time.monotonic()-self.page_started>=PAGE_INTERVAL:
pos=pages.index(self.current_oled_page_id)
self._show_page_locked(pages[(pos+1)%len(pages)])
return
request=self.requests[self.current_oled_page_id]
if request["id"]=="NORMAL_HOME": render_home(*request["metadata"]["home"])
else:
alert_ids=[a["id"] for a in alerts]
render_alert(request,alert_ids.index(request["id"])+1,len(alerts))
self._select_page_locked(pages[(pos+1)%len(pages)],wake=False)
request=dict(self.requests[self.current_oled_page_id])
alert_ids=[a["id"] for a in alerts]
if request["id"]=="NORMAL_HOME": render_home(*request["metadata"]["home"])
else: render_alert(request,alert_ids.index(request["id"])+1,len(alerts))
def owner_snapshot(self):
with self.lock: return dict(self.requests[self.current_owner_id])
@@ -713,6 +709,19 @@ class DisplayController:
for a in alerts],
}
def _oled_worker(self):
previous_error=None
while not self.stop_event.is_set():
self.oled_wake.clear()
try:
self.refresh()
if previous_error is not None: log("INFO","OLED_RECOVERED")
previous_error=None
except Exception as e:
if repr(e)!=previous_error: log("ERROR","OLED_ERROR",error=repr(e))
previous_error=repr(e)
self.oled_wake.wait(OLED_REFRESH)
def _rgb_worker(self):
previous_error=None; applied_mode="OFF"; applied_flash=False
flash_on=None; animation_started=time.monotonic()
@@ -757,6 +766,8 @@ class DisplayController:
def shutdown(self):
self.stop_event.set()
self.oled_wake.set()
if self.oled_thread.is_alive(): self.oled_thread.join()
if self.rgb_thread.is_alive(): self.rgb_thread.join()
for name,action in (("rgb",rgb_off),("oled_clear",lambda:oled_show([("","")]*4)),
("oled_off",lambda:cmd(0xAE))):
@@ -811,7 +822,7 @@ args=parser.parse_args()
if args.diagnose: raise SystemExit(diagnose())
watch_state=[]
last_sensor=last_render=last_status=0.0
last_sensor=last_status=0.0
last_net=last_watch=last_health=0.0
health={}; fs_readonly=False
agent={"last_sensor_ok":0.0,"last_network_ok":0.0,"last_watch_ok":0.0,"last_health_ok":0.0,"loop_errors":0,"i2c_errors":0}
@@ -874,9 +885,6 @@ try:
display.begin_update()
try: update_active_alerts(c,t,m,d,sample_elapsed)
finally: display.end_update()
if now-last_render >= OLED_REFRESH:
display.refresh()
last_render=now
if now-last_status >= 1.0:
write_status(c,t,m,d); last_status=now