new client connection logic
- esp32 requests for image when ready to receive - server serves initial image on request
This commit is contained in:
@@ -157,11 +157,14 @@ static void ws_event_handler(void *arg, esp_event_base_t event_base,
|
|||||||
case WEBSOCKET_EVENT_CONNECTED:
|
case WEBSOCKET_EVENT_CONNECTED:
|
||||||
ESP_LOGI(TAG, "Audio WS connected");
|
ESP_LOGI(TAG, "Audio WS connected");
|
||||||
s_state = AUDIO_CONNECTED;
|
s_state = AUDIO_CONNECTED;
|
||||||
|
s_img_pending = false;
|
||||||
|
esp_websocket_client_send_text(s_client, "{\"type\":\"request_image\"}", 23, pdMS_TO_TICKS(1000));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WEBSOCKET_EVENT_DISCONNECTED:
|
case WEBSOCKET_EVENT_DISCONNECTED:
|
||||||
ESP_LOGW(TAG, "Audio WS disconnected");
|
ESP_LOGW(TAG, "Audio WS disconnected");
|
||||||
s_playing = false;
|
s_playing = false;
|
||||||
|
s_img_pending = false;
|
||||||
flush_queue();
|
flush_queue();
|
||||||
s_state = AUDIO_IDLE;
|
s_state = AUDIO_IDLE;
|
||||||
break;
|
break;
|
||||||
@@ -275,9 +278,11 @@ const lv_img_dsc_t *audio_client_get_status_image(bool *updated)
|
|||||||
{
|
{
|
||||||
if (updated) {
|
if (updated) {
|
||||||
*updated = s_img_updated;
|
*updated = s_img_updated;
|
||||||
if (s_img_updated) {
|
|
||||||
s_img_updated = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return &s_img_dsc;
|
return &s_img_dsc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void audio_client_ack_status_image(void)
|
||||||
|
{
|
||||||
|
s_img_updated = false;
|
||||||
|
}
|
||||||
|
|||||||
@@ -40,11 +40,17 @@ void audio_client_set_image_notify_task(TaskHandle_t task);
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the latest status image descriptor.
|
* Get the latest status image descriptor.
|
||||||
* @param updated Set to true if a new image arrived since last call, then reset.
|
* @param updated Set to true if a new image arrived since last call.
|
||||||
* @return Pointer to the static image descriptor (always valid).
|
* @return Pointer to the static image descriptor (always valid).
|
||||||
*/
|
*/
|
||||||
const lv_img_dsc_t *audio_client_get_status_image(bool *updated);
|
const lv_img_dsc_t *audio_client_get_status_image(bool *updated);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Acknowledge that the status image was successfully rendered.
|
||||||
|
* Clears the updated flag so subsequent get_status_image calls return false.
|
||||||
|
*/
|
||||||
|
void audio_client_ack_status_image(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -200,6 +200,7 @@ static void sensor_task(void *arg)
|
|||||||
if (img_updated && Lvgl_lock(100)) {
|
if (img_updated && Lvgl_lock(100)) {
|
||||||
dashboard_ui_update_status_image(img);
|
dashboard_ui_update_status_image(img);
|
||||||
Lvgl_unlock();
|
Lvgl_unlock();
|
||||||
|
audio_client_ack_status_image();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Sensor + clock updates at ~1s cadence (skip if woken early) */
|
/* Sensor + clock updates at ~1s cadence (skip if woken early) */
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ Protocol:
|
|||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import asyncio
|
import asyncio
|
||||||
|
import json
|
||||||
import logging
|
import logging
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@@ -68,17 +69,17 @@ async def handler(ws):
|
|||||||
|
|
||||||
configs = load_config(_config_path)
|
configs = load_config(_config_path)
|
||||||
img_idle = load_status_image(IMG_DIR / "idle.png")
|
img_idle = load_status_image(IMG_DIR / "idle.png")
|
||||||
|
current_img = img_idle
|
||||||
|
|
||||||
try:
|
alarms = [_prepare_alarm(entry) for entry in configs] if configs else []
|
||||||
await send_status_image(ws, img_idle)
|
|
||||||
|
|
||||||
if not configs:
|
async def alarm_ticker():
|
||||||
|
nonlocal current_img
|
||||||
|
if not alarms:
|
||||||
log.info("No alarms configured — idling forever")
|
log.info("No alarms configured — idling forever")
|
||||||
await asyncio.Future()
|
await asyncio.Future()
|
||||||
return
|
return
|
||||||
|
|
||||||
alarms = [_prepare_alarm(entry) for entry in configs]
|
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
for alarm in alarms:
|
for alarm in alarms:
|
||||||
if should_fire(alarm["config"]):
|
if should_fire(alarm["config"]):
|
||||||
@@ -88,13 +89,28 @@ async def handler(ws):
|
|||||||
alarm["last_fired"] = current_minute
|
alarm["last_fired"] = current_minute
|
||||||
log.info("Alarm firing: %s at %s",
|
log.info("Alarm firing: %s at %s",
|
||||||
alarm["config"]["alarm_time"], current_minute)
|
alarm["config"]["alarm_time"], current_minute)
|
||||||
await send_status_image(ws, alarm["img"])
|
current_img = alarm["img"]
|
||||||
|
await send_status_image(ws, current_img)
|
||||||
await stream_alarm(ws, alarm["pcm"], alarm["sr"],
|
await stream_alarm(ws, alarm["pcm"], alarm["sr"],
|
||||||
alarm["ch"], alarm["bits"])
|
alarm["ch"], alarm["bits"])
|
||||||
await send_status_image(ws, img_idle)
|
current_img = img_idle
|
||||||
|
await send_status_image(ws, current_img)
|
||||||
|
|
||||||
await asyncio.sleep(TICK_INTERVAL)
|
await asyncio.sleep(TICK_INTERVAL)
|
||||||
|
|
||||||
|
async def receiver():
|
||||||
|
async for msg in ws:
|
||||||
|
try:
|
||||||
|
data = json.loads(msg)
|
||||||
|
except (json.JSONDecodeError, TypeError):
|
||||||
|
continue
|
||||||
|
if data.get("type") == "request_image":
|
||||||
|
log.info("Client requested image — sending current (%d bytes)",
|
||||||
|
len(current_img))
|
||||||
|
await send_status_image(ws, current_img)
|
||||||
|
|
||||||
|
try:
|
||||||
|
await asyncio.gather(alarm_ticker(), receiver())
|
||||||
except websockets.exceptions.ConnectionClosed:
|
except websockets.exceptions.ConnectionClosed:
|
||||||
log.info("Client disconnected: %s:%d", remote[0], remote[1])
|
log.info("Client disconnected: %s:%d", remote[0], remote[1])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user