Distribute master OTA images to slaves over ESP-NOW.
After UART OTA the master reads the staged partition in 4 KiB blocks (200 B ESP-NOW chunks), waits for per-slave block ACKs, and fixes the final partial block. Slaves reuse ota_uart; send pacing and logging improve reliability. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Cursor
@@ -18,6 +18,18 @@ PB_BIND(alox_EspNowSlavePresence, alox_EspNowSlavePresence, AUTO)
|
||||
PB_BIND(alox_EspNowAccelDeadzone, alox_EspNowAccelDeadzone, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_EspNowOtaStart, alox_EspNowOtaStart, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_EspNowOtaPayload, alox_EspNowOtaPayload, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_EspNowOtaEnd, alox_EspNowOtaEnd, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_EspNowOtaStatus, alox_EspNowOtaStatus, AUTO)
|
||||
|
||||
|
||||
PB_BIND(alox_EspNowMessage, alox_EspNowMessage, AUTO)
|
||||
|
||||
|
||||
|
||||
@@ -16,7 +16,11 @@ typedef enum _alox_EspNowMessageType {
|
||||
alox_EspNowMessageType_ESPNOW_SLAVE_INFO = 2,
|
||||
alox_EspNowMessageType_ESPNOW_HEARTBEAT = 3,
|
||||
alox_EspNowMessageType_ESPNOW_SET_ACCEL_DEADZONE = 4,
|
||||
alox_EspNowMessageType_ESPNOW_UNICAST_TEST = 5
|
||||
alox_EspNowMessageType_ESPNOW_UNICAST_TEST = 5,
|
||||
alox_EspNowMessageType_ESPNOW_OTA_START = 6,
|
||||
alox_EspNowMessageType_ESPNOW_OTA_PAYLOAD = 7,
|
||||
alox_EspNowMessageType_ESPNOW_OTA_END = 8,
|
||||
alox_EspNowMessageType_ESPNOW_OTA_STATUS = 9
|
||||
} alox_EspNowMessageType;
|
||||
|
||||
/* Struct definitions */
|
||||
@@ -42,6 +46,30 @@ typedef struct _alox_EspNowAccelDeadzone {
|
||||
uint32_t client_id; /* 0 = all slaves; otherwise only matching slave_id applies */
|
||||
} alox_EspNowAccelDeadzone;
|
||||
|
||||
/* Master → slave: begin OTA (erase inactive slot; slave replies ESPNOW_OTA_STATUS). */
|
||||
typedef struct _alox_EspNowOtaStart {
|
||||
uint32_t total_size;
|
||||
} alox_EspNowOtaStart;
|
||||
|
||||
typedef PB_BYTES_ARRAY_T(200) alox_EspNowOtaPayload_data_t;
|
||||
/* Master → slave: firmware chunk (up to 200 bytes); slave buffers 4 KiB before flash write. */
|
||||
typedef struct _alox_EspNowOtaPayload {
|
||||
uint32_t seq;
|
||||
alox_EspNowOtaPayload_data_t data;
|
||||
} alox_EspNowOtaPayload;
|
||||
|
||||
/* Master → slave: finalize OTA (flush, esp_ota_end, set boot partition). */
|
||||
typedef struct _alox_EspNowOtaEnd {
|
||||
char dummy_field;
|
||||
} alox_EspNowOtaEnd;
|
||||
|
||||
/* Slave → master: status / block ACK (same status codes as UART OtaStatusPayload). */
|
||||
typedef struct _alox_EspNowOtaStatus {
|
||||
uint32_t status;
|
||||
uint32_t bytes_written;
|
||||
uint32_t error;
|
||||
} alox_EspNowOtaStatus;
|
||||
|
||||
typedef struct _alox_EspNowMessage {
|
||||
alox_EspNowMessageType type;
|
||||
pb_size_t which_payload;
|
||||
@@ -51,6 +79,10 @@ typedef struct _alox_EspNowMessage {
|
||||
alox_EspNowSlavePresence heartbeat;
|
||||
alox_EspNowAccelDeadzone accel_deadzone;
|
||||
alox_EspNowUnicastTest unicast_test;
|
||||
alox_EspNowOtaStart ota_start;
|
||||
alox_EspNowOtaPayload ota_payload;
|
||||
alox_EspNowOtaEnd ota_end;
|
||||
alox_EspNowOtaStatus ota_status;
|
||||
} payload;
|
||||
} alox_EspNowMessage;
|
||||
|
||||
@@ -61,8 +93,12 @@ extern "C" {
|
||||
|
||||
/* Helper constants for enums */
|
||||
#define _alox_EspNowMessageType_MIN alox_EspNowMessageType_ESPNOW_UNKNOWN
|
||||
#define _alox_EspNowMessageType_MAX alox_EspNowMessageType_ESPNOW_UNICAST_TEST
|
||||
#define _alox_EspNowMessageType_ARRAYSIZE ((alox_EspNowMessageType)(alox_EspNowMessageType_ESPNOW_UNICAST_TEST+1))
|
||||
#define _alox_EspNowMessageType_MAX alox_EspNowMessageType_ESPNOW_OTA_STATUS
|
||||
#define _alox_EspNowMessageType_ARRAYSIZE ((alox_EspNowMessageType)(alox_EspNowMessageType_ESPNOW_OTA_STATUS+1))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -76,11 +112,19 @@ extern "C" {
|
||||
#define alox_EspNowDiscover_init_default {0}
|
||||
#define alox_EspNowSlavePresence_init_default {0, {{NULL}, NULL}, 0, 0, 0, 0}
|
||||
#define alox_EspNowAccelDeadzone_init_default {0, 0}
|
||||
#define alox_EspNowOtaStart_init_default {0}
|
||||
#define alox_EspNowOtaPayload_init_default {0, {0, {0}}}
|
||||
#define alox_EspNowOtaEnd_init_default {0}
|
||||
#define alox_EspNowOtaStatus_init_default {0, 0, 0}
|
||||
#define alox_EspNowMessage_init_default {_alox_EspNowMessageType_MIN, 0, {alox_EspNowDiscover_init_default}}
|
||||
#define alox_EspNowUnicastTest_init_zero {0}
|
||||
#define alox_EspNowDiscover_init_zero {0}
|
||||
#define alox_EspNowSlavePresence_init_zero {0, {{NULL}, NULL}, 0, 0, 0, 0}
|
||||
#define alox_EspNowAccelDeadzone_init_zero {0, 0}
|
||||
#define alox_EspNowOtaStart_init_zero {0}
|
||||
#define alox_EspNowOtaPayload_init_zero {0, {0, {0}}}
|
||||
#define alox_EspNowOtaEnd_init_zero {0}
|
||||
#define alox_EspNowOtaStatus_init_zero {0, 0, 0}
|
||||
#define alox_EspNowMessage_init_zero {_alox_EspNowMessageType_MIN, 0, {alox_EspNowDiscover_init_zero}}
|
||||
|
||||
/* Field tags (for use in manual encoding/decoding) */
|
||||
@@ -94,12 +138,22 @@ extern "C" {
|
||||
#define alox_EspNowSlavePresence_used_tag 6
|
||||
#define alox_EspNowAccelDeadzone_deadzone_tag 1
|
||||
#define alox_EspNowAccelDeadzone_client_id_tag 2
|
||||
#define alox_EspNowOtaStart_total_size_tag 1
|
||||
#define alox_EspNowOtaPayload_seq_tag 1
|
||||
#define alox_EspNowOtaPayload_data_tag 2
|
||||
#define alox_EspNowOtaStatus_status_tag 1
|
||||
#define alox_EspNowOtaStatus_bytes_written_tag 2
|
||||
#define alox_EspNowOtaStatus_error_tag 3
|
||||
#define alox_EspNowMessage_type_tag 1
|
||||
#define alox_EspNowMessage_discover_tag 2
|
||||
#define alox_EspNowMessage_slave_info_tag 3
|
||||
#define alox_EspNowMessage_heartbeat_tag 4
|
||||
#define alox_EspNowMessage_accel_deadzone_tag 5
|
||||
#define alox_EspNowMessage_unicast_test_tag 6
|
||||
#define alox_EspNowMessage_ota_start_tag 7
|
||||
#define alox_EspNowMessage_ota_payload_tag 8
|
||||
#define alox_EspNowMessage_ota_end_tag 9
|
||||
#define alox_EspNowMessage_ota_status_tag 10
|
||||
|
||||
/* Struct field encoding specification for nanopb */
|
||||
#define alox_EspNowUnicastTest_FIELDLIST(X, a) \
|
||||
@@ -128,13 +182,40 @@ X(a, STATIC, SINGULAR, UINT32, client_id, 2)
|
||||
#define alox_EspNowAccelDeadzone_CALLBACK NULL
|
||||
#define alox_EspNowAccelDeadzone_DEFAULT NULL
|
||||
|
||||
#define alox_EspNowOtaStart_FIELDLIST(X, a) \
|
||||
X(a, STATIC, SINGULAR, UINT32, total_size, 1)
|
||||
#define alox_EspNowOtaStart_CALLBACK NULL
|
||||
#define alox_EspNowOtaStart_DEFAULT NULL
|
||||
|
||||
#define alox_EspNowOtaPayload_FIELDLIST(X, a) \
|
||||
X(a, STATIC, SINGULAR, UINT32, seq, 1) \
|
||||
X(a, STATIC, SINGULAR, BYTES, data, 2)
|
||||
#define alox_EspNowOtaPayload_CALLBACK NULL
|
||||
#define alox_EspNowOtaPayload_DEFAULT NULL
|
||||
|
||||
#define alox_EspNowOtaEnd_FIELDLIST(X, a) \
|
||||
|
||||
#define alox_EspNowOtaEnd_CALLBACK NULL
|
||||
#define alox_EspNowOtaEnd_DEFAULT NULL
|
||||
|
||||
#define alox_EspNowOtaStatus_FIELDLIST(X, a) \
|
||||
X(a, STATIC, SINGULAR, UINT32, status, 1) \
|
||||
X(a, STATIC, SINGULAR, UINT32, bytes_written, 2) \
|
||||
X(a, STATIC, SINGULAR, UINT32, error, 3)
|
||||
#define alox_EspNowOtaStatus_CALLBACK NULL
|
||||
#define alox_EspNowOtaStatus_DEFAULT NULL
|
||||
|
||||
#define alox_EspNowMessage_FIELDLIST(X, a) \
|
||||
X(a, STATIC, SINGULAR, UENUM, type, 1) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,discover,payload.discover), 2) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,slave_info,payload.slave_info), 3) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,heartbeat,payload.heartbeat), 4) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,accel_deadzone,payload.accel_deadzone), 5) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,unicast_test,payload.unicast_test), 6)
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,unicast_test,payload.unicast_test), 6) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,ota_start,payload.ota_start), 7) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,ota_payload,payload.ota_payload), 8) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,ota_end,payload.ota_end), 9) \
|
||||
X(a, STATIC, ONEOF, MESSAGE, (payload,ota_status,payload.ota_status), 10)
|
||||
#define alox_EspNowMessage_CALLBACK NULL
|
||||
#define alox_EspNowMessage_DEFAULT NULL
|
||||
#define alox_EspNowMessage_payload_discover_MSGTYPE alox_EspNowDiscover
|
||||
@@ -142,11 +223,19 @@ X(a, STATIC, ONEOF, MESSAGE, (payload,unicast_test,payload.unicast_test),
|
||||
#define alox_EspNowMessage_payload_heartbeat_MSGTYPE alox_EspNowSlavePresence
|
||||
#define alox_EspNowMessage_payload_accel_deadzone_MSGTYPE alox_EspNowAccelDeadzone
|
||||
#define alox_EspNowMessage_payload_unicast_test_MSGTYPE alox_EspNowUnicastTest
|
||||
#define alox_EspNowMessage_payload_ota_start_MSGTYPE alox_EspNowOtaStart
|
||||
#define alox_EspNowMessage_payload_ota_payload_MSGTYPE alox_EspNowOtaPayload
|
||||
#define alox_EspNowMessage_payload_ota_end_MSGTYPE alox_EspNowOtaEnd
|
||||
#define alox_EspNowMessage_payload_ota_status_MSGTYPE alox_EspNowOtaStatus
|
||||
|
||||
extern const pb_msgdesc_t alox_EspNowUnicastTest_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowDiscover_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowSlavePresence_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowAccelDeadzone_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowOtaStart_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowOtaPayload_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowOtaEnd_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowOtaStatus_msg;
|
||||
extern const pb_msgdesc_t alox_EspNowMessage_msg;
|
||||
|
||||
/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
|
||||
@@ -154,14 +243,22 @@ extern const pb_msgdesc_t alox_EspNowMessage_msg;
|
||||
#define alox_EspNowDiscover_fields &alox_EspNowDiscover_msg
|
||||
#define alox_EspNowSlavePresence_fields &alox_EspNowSlavePresence_msg
|
||||
#define alox_EspNowAccelDeadzone_fields &alox_EspNowAccelDeadzone_msg
|
||||
#define alox_EspNowOtaStart_fields &alox_EspNowOtaStart_msg
|
||||
#define alox_EspNowOtaPayload_fields &alox_EspNowOtaPayload_msg
|
||||
#define alox_EspNowOtaEnd_fields &alox_EspNowOtaEnd_msg
|
||||
#define alox_EspNowOtaStatus_fields &alox_EspNowOtaStatus_msg
|
||||
#define alox_EspNowMessage_fields &alox_EspNowMessage_msg
|
||||
|
||||
/* Maximum encoded size of messages (where known) */
|
||||
/* alox_EspNowSlavePresence_size depends on runtime parameters */
|
||||
/* alox_EspNowMessage_size depends on runtime parameters */
|
||||
#define ALOX_MAIN_PROTO_ESP_NOW_MESSAGES_PB_H_MAX_SIZE alox_EspNowAccelDeadzone_size
|
||||
#define ALOX_MAIN_PROTO_ESP_NOW_MESSAGES_PB_H_MAX_SIZE alox_EspNowOtaPayload_size
|
||||
#define alox_EspNowAccelDeadzone_size 12
|
||||
#define alox_EspNowDiscover_size 6
|
||||
#define alox_EspNowOtaEnd_size 0
|
||||
#define alox_EspNowOtaPayload_size 209
|
||||
#define alox_EspNowOtaStart_size 6
|
||||
#define alox_EspNowOtaStatus_size 18
|
||||
#define alox_EspNowUnicastTest_size 6
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
syntax = "proto3";
|
||||
|
||||
import "nanopb.proto";
|
||||
|
||||
package alox;
|
||||
|
||||
enum EspNowMessageType {
|
||||
@@ -9,6 +11,10 @@ enum EspNowMessageType {
|
||||
ESPNOW_HEARTBEAT = 3;
|
||||
ESPNOW_SET_ACCEL_DEADZONE = 4;
|
||||
ESPNOW_UNICAST_TEST = 5;
|
||||
ESPNOW_OTA_START = 6;
|
||||
ESPNOW_OTA_PAYLOAD = 7;
|
||||
ESPNOW_OTA_END = 8;
|
||||
ESPNOW_OTA_STATUS = 9;
|
||||
}
|
||||
|
||||
message EspNowUnicastTest {
|
||||
@@ -33,6 +39,27 @@ message EspNowAccelDeadzone {
|
||||
uint32 client_id = 2; // 0 = all slaves; otherwise only matching slave_id applies
|
||||
}
|
||||
|
||||
// Master → slave: begin OTA (erase inactive slot; slave replies ESPNOW_OTA_STATUS).
|
||||
message EspNowOtaStart {
|
||||
uint32 total_size = 1;
|
||||
}
|
||||
|
||||
// Master → slave: firmware chunk (up to 200 bytes); slave buffers 4 KiB before flash write.
|
||||
message EspNowOtaPayload {
|
||||
uint32 seq = 1;
|
||||
bytes data = 2 [(nanopb).max_size = 200];
|
||||
}
|
||||
|
||||
// Master → slave: finalize OTA (flush, esp_ota_end, set boot partition).
|
||||
message EspNowOtaEnd {}
|
||||
|
||||
// Slave → master: status / block ACK (same status codes as UART OtaStatusPayload).
|
||||
message EspNowOtaStatus {
|
||||
uint32 status = 1;
|
||||
uint32 bytes_written = 2;
|
||||
uint32 error = 3;
|
||||
}
|
||||
|
||||
message EspNowMessage {
|
||||
EspNowMessageType type = 1;
|
||||
oneof payload {
|
||||
@@ -41,5 +68,9 @@ message EspNowMessage {
|
||||
EspNowSlavePresence heartbeat = 4;
|
||||
EspNowAccelDeadzone accel_deadzone = 5;
|
||||
EspNowUnicastTest unicast_test = 6;
|
||||
EspNowOtaStart ota_start = 7;
|
||||
EspNowOtaPayload ota_payload = 8;
|
||||
EspNowOtaEnd ota_end = 9;
|
||||
EspNowOtaStatus ota_status = 10;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user