feat: sequences v2, driver frame sync and submodule updates
- Sequences v2, bridges and sim-controller changes from the working tree. - Records the led-driver, led-tool and led-simulator commits above. - Includes dmx-driver/ and graphify-out/. Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
3f8f67823b
commit
50ca46fee6
657 files changed
+15818
-1107
No files matched your search
+2
-16
@@ -21,7 +21,6 @@
|
||||
#define M_DIGEST 0x22
|
||||
#define M_RESYNC 0x23
|
||||
#define M_ECHO 0x24
|
||||
#define M_OTA_STATUS 0x26
|
||||
#define M_PING_RSP 0x06
|
||||
#define F_ACK 1
|
||||
#define F_COMMIT 2
|
||||
@@ -51,7 +50,7 @@ typedef struct {
|
||||
typedef struct {
|
||||
uint8_t mac[6];
|
||||
uint8_t len;
|
||||
uint8_t data[96];
|
||||
uint8_t data[250]; // ESP-NOW maximum: announces and ping replies carry the driver's settings
|
||||
} rx_t;
|
||||
|
||||
typedef struct {
|
||||
@@ -272,12 +271,6 @@ int rel_peer_status(const uint8_t mac[6], int *fails)
|
||||
}
|
||||
|
||||
static rel_announce_cb_t s_announce_cb;
|
||||
static rel_ota_status_cb_t s_ota_status_cb;
|
||||
|
||||
void rel_set_ota_status_cb(rel_ota_status_cb_t cb)
|
||||
{
|
||||
s_ota_status_cb = cb;
|
||||
}
|
||||
|
||||
static rel_ping_cb_t s_ping_cb;
|
||||
|
||||
@@ -301,8 +294,7 @@ static void recv_cb(const uint8_t *src_mac, const uint8_t *data, int len)
|
||||
// care about is a link reply inside 0x4C
|
||||
bool announce = (data[0] == WIRE_MAGIC && data[1] == M_ANNOUNCE) || data[0] == '{';
|
||||
bool reply = data[0] == WIRE_MAGIC &&
|
||||
(data[1] == M_ACK || data[1] == M_RESYNC || data[1] == M_ECHO || data[1] == M_OTA_STATUS ||
|
||||
data[1] == M_PING_RSP);
|
||||
(data[1] == M_ACK || data[1] == M_RESYNC || data[1] == M_ECHO || data[1] == M_PING_RSP);
|
||||
if (!announce && !reply) {
|
||||
return;
|
||||
}
|
||||
@@ -334,12 +326,6 @@ static void handle_rx(const rx_t *rx)
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (rx->data[1] == M_OTA_STATUS) {
|
||||
if (s_ota_status_cb) {
|
||||
s_ota_status_cb(rx->mac, rx->data, rx->len);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (rx->data[1] == M_PING_RSP) {
|
||||
// The driver is there: count it as heard, so group updates go to it again
|
||||
xSemaphoreTake(s_lock, portMAX_DELAY);
|
||||
|
||||
Reference in new issue
Block a user