Add per-slave ESP-NOW OTA progress over UART and fix dashboard updates.

Expose OTA_SLAVE_PROGRESS on the master, track per-slave state during distribution, run ESP-NOW OTA in a background task so the host can poll while slaves update, and show master/slave progress in the dashboard with table layout and faster WebSocket refresh during uploads. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-19 21:07:46 +02:00
parent 5a948a5c8c
commit a0f4a81a55
23 changed files with 1467 additions and 146 deletions
@@ -37,6 +37,7 @@ const (
 	MessageType_OTA_END             MessageType = 18
 	MessageType_OTA_STATUS          MessageType = 19
 	MessageType_OTA_START_ESPNOW    MessageType = 20
+	MessageType_OTA_SLAVE_PROGRESS  MessageType = 21
 )

 // Enum value maps for MessageType.
@@ -55,6 +56,7 @@ var (
 		18: "OTA_END",
 		19: "OTA_STATUS",
 		20: "OTA_START_ESPNOW",
+		21: "OTA_SLAVE_PROGRESS",
 	}
 	MessageType_value = map[string]int32{
 		"UNKNOWN":             0,
@@ -70,6 +72,7 @@ var (
 		"OTA_END":             18,
 		"OTA_STATUS":          19,
 		"OTA_START_ESPNOW":    20,
+		"OTA_SLAVE_PROGRESS":  21,
 	}
 )

@@ -118,6 +121,8 @@ type UartMessage struct {
 	//	*UartMessage_AccelDeadzoneResponse
 	//	*UartMessage_EspnowUnicastTestRequest
 	//	*UartMessage_EspnowUnicastTestResponse
+	//	*UartMessage_OtaSlaveProgressRequest
+	//	*UartMessage_OtaSlaveProgressResponse
 	Payload       isUartMessage_Payload `protobuf_oneof:"payload"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
@@ -284,6 +289,24 @@ func (x *UartMessage) GetEspnowUnicastTestResponse() *EspNowUnicastTestResponse
 	return nil
 }

+func (x *UartMessage) GetOtaSlaveProgressRequest() *OtaSlaveProgressRequest {
+	if x != nil {
+		if x, ok := x.Payload.(*UartMessage_OtaSlaveProgressRequest); ok {
+			return x.OtaSlaveProgressRequest
+		}
+	}
+	return nil
+}
+
+func (x *UartMessage) GetOtaSlaveProgressResponse() *OtaSlaveProgressResponse {
+	if x != nil {
+		if x, ok := x.Payload.(*UartMessage_OtaSlaveProgressResponse); ok {
+			return x.OtaSlaveProgressResponse
+		}
+	}
+	return nil
+}
+
 type isUartMessage_Payload interface {
 	isUartMessage_Payload()
 }
@@ -340,6 +363,14 @@ type UartMessage_EspnowUnicastTestResponse struct {
 	EspnowUnicastTestResponse *EspNowUnicastTestResponse `protobuf:"bytes,14,opt,name=espnow_unicast_test_response,json=espnowUnicastTestResponse,proto3,oneof"`
 }

+type UartMessage_OtaSlaveProgressRequest struct {
+	OtaSlaveProgressRequest *OtaSlaveProgressRequest `protobuf:"bytes,15,opt,name=ota_slave_progress_request,json=otaSlaveProgressRequest,proto3,oneof"`
+}
+
+type UartMessage_OtaSlaveProgressResponse struct {
+	OtaSlaveProgressResponse *OtaSlaveProgressResponse `protobuf:"bytes,16,opt,name=ota_slave_progress_response,json=otaSlaveProgressResponse,proto3,oneof"`
+}
+
 func (*UartMessage_AckPayload) isUartMessage_Payload() {}

 func (*UartMessage_EchoPayload) isUartMessage_Payload() {}
@@ -366,6 +397,10 @@ func (*UartMessage_EspnowUnicastTestRequest) isUartMessage_Payload() {}

 func (*UartMessage_EspnowUnicastTestResponse) isUartMessage_Payload() {}

+func (*UartMessage_OtaSlaveProgressRequest) isUartMessage_Payload() {}
+
+func (*UartMessage_OtaSlaveProgressResponse) isUartMessage_Payload() {}
+
 type Ack struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
@@ -1134,7 +1169,7 @@ func (*OtaEndPayload) Descriptor() ([]byte, []int) {
 }

 // Device → host status (also used as ACK after each 4 KiB written).
-// status: 1=preparing, 2=ready, 3=block_ack, 4=success, 5=failed
+// status: 1=preparing, 2=ready, 3=block_ack, 4=success, 5=failed, 6=distributing
 type OtaStatusPayload struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Status        uint32                 `protobuf:"varint,1,opt,name=status,proto3" json:"status,omitempty"`
@@ -1203,11 +1238,209 @@ func (x *OtaStatusPayload) GetError() uint32 {
 	return 0
 }

+// Host → master: query ESP-NOW slave OTA progress (client_id 0 = all slaves in session).
+type OtaSlaveProgressRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ClientId      uint32                 `protobuf:"varint,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *OtaSlaveProgressRequest) Reset() {
+	*x = OtaSlaveProgressRequest{}
+	mi := &file_uart_messages_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *OtaSlaveProgressRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OtaSlaveProgressRequest) ProtoMessage() {}
+
+func (x *OtaSlaveProgressRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_uart_messages_proto_msgTypes[16]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use OtaSlaveProgressRequest.ProtoReflect.Descriptor instead.
+func (*OtaSlaveProgressRequest) Descriptor() ([]byte, []int) {
+	return file_uart_messages_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *OtaSlaveProgressRequest) GetClientId() uint32 {
+	if x != nil {
+		return x.ClientId
+	}
+	return 0
+}
+
+type OtaSlaveProgressEntry struct {
+	state        protoimpl.MessageState `protogen:"open.v1"`
+	ClientId     uint32                 `protobuf:"varint,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
+	BytesWritten uint32                 `protobuf:"varint,2,opt,name=bytes_written,json=bytesWritten,proto3" json:"bytes_written,omitempty"`
+	TotalBytes   uint32                 `protobuf:"varint,3,opt,name=total_bytes,json=totalBytes,proto3" json:"total_bytes,omitempty"`
+	// * 0=idle, 1=preparing, 2=ready, 3=distributing, 4=success, 5=failed
+	Status        uint32 `protobuf:"varint,4,opt,name=status,proto3" json:"status,omitempty"`
+	Error         uint32 `protobuf:"varint,5,opt,name=error,proto3" json:"error,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *OtaSlaveProgressEntry) Reset() {
+	*x = OtaSlaveProgressEntry{}
+	mi := &file_uart_messages_proto_msgTypes[17]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *OtaSlaveProgressEntry) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OtaSlaveProgressEntry) ProtoMessage() {}
+
+func (x *OtaSlaveProgressEntry) ProtoReflect() protoreflect.Message {
+	mi := &file_uart_messages_proto_msgTypes[17]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use OtaSlaveProgressEntry.ProtoReflect.Descriptor instead.
+func (*OtaSlaveProgressEntry) Descriptor() ([]byte, []int) {
+	return file_uart_messages_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *OtaSlaveProgressEntry) GetClientId() uint32 {
+	if x != nil {
+		return x.ClientId
+	}
+	return 0
+}
+
+func (x *OtaSlaveProgressEntry) GetBytesWritten() uint32 {
+	if x != nil {
+		return x.BytesWritten
+	}
+	return 0
+}
+
+func (x *OtaSlaveProgressEntry) GetTotalBytes() uint32 {
+	if x != nil {
+		return x.TotalBytes
+	}
+	return 0
+}
+
+func (x *OtaSlaveProgressEntry) GetStatus() uint32 {
+	if x != nil {
+		return x.Status
+	}
+	return 0
+}
+
+func (x *OtaSlaveProgressEntry) GetError() uint32 {
+	if x != nil {
+		return x.Error
+	}
+	return 0
+}
+
+type OtaSlaveProgressResponse struct {
+	state          protoimpl.MessageState   `protogen:"open.v1"`
+	Active         bool                     `protobuf:"varint,1,opt,name=active,proto3" json:"active,omitempty"`
+	TotalBytes     uint32                   `protobuf:"varint,2,opt,name=total_bytes,json=totalBytes,proto3" json:"total_bytes,omitempty"`
+	AggregateBytes uint32                   `protobuf:"varint,3,opt,name=aggregate_bytes,json=aggregateBytes,proto3" json:"aggregate_bytes,omitempty"`
+	SlaveCount     uint32                   `protobuf:"varint,4,opt,name=slave_count,json=slaveCount,proto3" json:"slave_count,omitempty"`
+	Slaves         []*OtaSlaveProgressEntry `protobuf:"bytes,5,rep,name=slaves,proto3" json:"slaves,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
+}
+
+func (x *OtaSlaveProgressResponse) Reset() {
+	*x = OtaSlaveProgressResponse{}
+	mi := &file_uart_messages_proto_msgTypes[18]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *OtaSlaveProgressResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OtaSlaveProgressResponse) ProtoMessage() {}
+
+func (x *OtaSlaveProgressResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_uart_messages_proto_msgTypes[18]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use OtaSlaveProgressResponse.ProtoReflect.Descriptor instead.
+func (*OtaSlaveProgressResponse) Descriptor() ([]byte, []int) {
+	return file_uart_messages_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *OtaSlaveProgressResponse) GetActive() bool {
+	if x != nil {
+		return x.Active
+	}
+	return false
+}
+
+func (x *OtaSlaveProgressResponse) GetTotalBytes() uint32 {
+	if x != nil {
+		return x.TotalBytes
+	}
+	return 0
+}
+
+func (x *OtaSlaveProgressResponse) GetAggregateBytes() uint32 {
+	if x != nil {
+		return x.AggregateBytes
+	}
+	return 0
+}
+
+func (x *OtaSlaveProgressResponse) GetSlaveCount() uint32 {
+	if x != nil {
+		return x.SlaveCount
+	}
+	return 0
+}
+
+func (x *OtaSlaveProgressResponse) GetSlaves() []*OtaSlaveProgressEntry {
+	if x != nil {
+		return x.Slaves
+	}
+	return nil
+}
+
 var File_uart_messages_proto protoreflect.FileDescriptor

 const file_uart_messages_proto_rawDesc = "" +
 	"\n" +
-	"\x13uart_messages.proto\x12\x04alox\"\xcc\a\n" +
+	"\x13uart_messages.proto\x12\x04alox\x1a\fnanopb.proto\"\x8b\t\n" +
 	"\vUartMessage\x12%\n" +
 	"\x04type\x18\x01 \x01(\x0e2\x11.alox.MessageTypeR\x04type\x12,\n" +
 	"\vack_payload\x18\x02 \x01(\v2\t.alox.AckH\x00R\n" +
@@ -1226,7 +1459,9 @@ const file_uart_messages_proto_rawDesc = "" +
 	"\x16accel_deadzone_request\x18\v \x01(\v2\x1a.alox.AccelDeadzoneRequestH\x00R\x14accelDeadzoneRequest\x12U\n" +
 	"\x17accel_deadzone_response\x18\f \x01(\v2\x1b.alox.AccelDeadzoneResponseH\x00R\x15accelDeadzoneResponse\x12_\n" +
 	"\x1bespnow_unicast_test_request\x18\r \x01(\v2\x1e.alox.EspNowUnicastTestRequestH\x00R\x18espnowUnicastTestRequest\x12b\n" +
-	"\x1cespnow_unicast_test_response\x18\x0e \x01(\v2\x1f.alox.EspNowUnicastTestResponseH\x00R\x19espnowUnicastTestResponseB\t\n" +
+	"\x1cespnow_unicast_test_response\x18\x0e \x01(\v2\x1f.alox.EspNowUnicastTestResponseH\x00R\x19espnowUnicastTestResponse\x12\\\n" +
+	"\x1aota_slave_progress_request\x18\x0f \x01(\v2\x1d.alox.OtaSlaveProgressRequestH\x00R\x17otaSlaveProgressRequest\x12_\n" +
+	"\x1bota_slave_progress_response\x18\x10 \x01(\v2\x1e.alox.OtaSlaveProgressResponseH\x00R\x18otaSlaveProgressResponseB\t\n" +
 	"\apayload\"\x05\n" +
 	"\x03Ack\"!\n" +
 	"\vEchoPayload\x12\x12\n" +
@@ -1272,18 +1507,35 @@ const file_uart_messages_proto_rawDesc = "" +
 	"\x03seq\x18\x02 \x01(\rR\x03seq\"0\n" +
 	"\x0fOtaStartPayload\x12\x1d\n" +
 	"\n" +
-	"total_size\x18\x01 \x01(\rR\ttotalSize\"2\n" +
+	"total_size\x18\x01 \x01(\rR\ttotalSize\":\n" +
 	"\n" +
 	"OtaPayload\x12\x10\n" +
-	"\x03seq\x18\x01 \x01(\rR\x03seq\x12\x12\n" +
-	"\x04data\x18\x02 \x01(\fR\x04data\"\x0f\n" +
+	"\x03seq\x18\x01 \x01(\rR\x03seq\x12\x1a\n" +
+	"\x04data\x18\x02 \x01(\fB\x06\x92?\x03\b\xc8\x01R\x04data\"\x0f\n" +
 	"\rOtaEndPayload\"\x86\x01\n" +
 	"\x10OtaStatusPayload\x12\x16\n" +
 	"\x06status\x18\x01 \x01(\rR\x06status\x12#\n" +
 	"\rbytes_written\x18\x02 \x01(\rR\fbytesWritten\x12\x1f\n" +
 	"\vtarget_slot\x18\x03 \x01(\rR\n" +
 	"targetSlot\x12\x14\n" +
-	"\x05error\x18\x04 \x01(\rR\x05error*\xdd\x01\n" +
+	"\x05error\x18\x04 \x01(\rR\x05error\"6\n" +
+	"\x17OtaSlaveProgressRequest\x12\x1b\n" +
+	"\tclient_id\x18\x01 \x01(\rR\bclientId\"\xa8\x01\n" +
+	"\x15OtaSlaveProgressEntry\x12\x1b\n" +
+	"\tclient_id\x18\x01 \x01(\rR\bclientId\x12#\n" +
+	"\rbytes_written\x18\x02 \x01(\rR\fbytesWritten\x12\x1f\n" +
+	"\vtotal_bytes\x18\x03 \x01(\rR\n" +
+	"totalBytes\x12\x16\n" +
+	"\x06status\x18\x04 \x01(\rR\x06status\x12\x14\n" +
+	"\x05error\x18\x05 \x01(\rR\x05error\"\xd9\x01\n" +
+	"\x18OtaSlaveProgressResponse\x12\x16\n" +
+	"\x06active\x18\x01 \x01(\bR\x06active\x12\x1f\n" +
+	"\vtotal_bytes\x18\x02 \x01(\rR\n" +
+	"totalBytes\x12'\n" +
+	"\x0faggregate_bytes\x18\x03 \x01(\rR\x0eaggregateBytes\x12\x1f\n" +
+	"\vslave_count\x18\x04 \x01(\rR\n" +
+	"slaveCount\x12:\n" +
+	"\x06slaves\x18\x05 \x03(\v2\x1b.alox.OtaSlaveProgressEntryB\x05\x92?\x02\x10\x10R\x06slaves*\xf5\x01\n" +
 	"\vMessageType\x12\v\n" +
 	"\aUNKNOWN\x10\x00\x12\a\n" +
 	"\x03ACK\x10\x01\x12\b\n" +
@@ -1298,7 +1550,8 @@ const file_uart_messages_proto_rawDesc = "" +
 	"\aOTA_END\x10\x12\x12\x0e\n" +
 	"\n" +
 	"OTA_STATUS\x10\x13\x12\x14\n" +
-	"\x10OTA_START_ESPNOW\x10\x14b\x06proto3"
+	"\x10OTA_START_ESPNOW\x10\x14\x12\x16\n" +
+	"\x12OTA_SLAVE_PROGRESS\x10\x15b\x06proto3"

 var (
 	file_uart_messages_proto_rawDescOnce sync.Once
@@ -1313,7 +1566,7 @@ func file_uart_messages_proto_rawDescGZIP() []byte {
 }

 var file_uart_messages_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_uart_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_uart_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
 var file_uart_messages_proto_goTypes = []any{
 	(MessageType)(0),                  // 0: alox.MessageType
 	(*UartMessage)(nil),               // 1: alox.UartMessage
@@ -1332,6 +1585,9 @@ var file_uart_messages_proto_goTypes = []any{
 	(*OtaPayload)(nil),                // 14: alox.OtaPayload
 	(*OtaEndPayload)(nil),             // 15: alox.OtaEndPayload
 	(*OtaStatusPayload)(nil),          // 16: alox.OtaStatusPayload
+	(*OtaSlaveProgressRequest)(nil),   // 17: alox.OtaSlaveProgressRequest
+	(*OtaSlaveProgressEntry)(nil),     // 18: alox.OtaSlaveProgressEntry
+	(*OtaSlaveProgressResponse)(nil),  // 19: alox.OtaSlaveProgressResponse
 }
 var file_uart_messages_proto_depIdxs = []int32{
 	0,  // 0: alox.UartMessage.type:type_name -> alox.MessageType
@@ -1348,13 +1604,16 @@ var file_uart_messages_proto_depIdxs = []int32{
 	10, // 11: alox.UartMessage.accel_deadzone_response:type_name -> alox.AccelDeadzoneResponse
 	11, // 12: alox.UartMessage.espnow_unicast_test_request:type_name -> alox.EspNowUnicastTestRequest
 	12, // 13: alox.UartMessage.espnow_unicast_test_response:type_name -> alox.EspNowUnicastTestResponse
-	5,  // 14: alox.ClientInfoResponse.clients:type_name -> alox.ClientInfo
-	7,  // 15: alox.ClientInputResponse.clients:type_name -> alox.ClientInput
-	16, // [16:16] is the sub-list for method output_type
-	16, // [16:16] is the sub-list for method input_type
-	16, // [16:16] is the sub-list for extension type_name
-	16, // [16:16] is the sub-list for extension extendee
-	0,  // [0:16] is the sub-list for field type_name
+	17, // 14: alox.UartMessage.ota_slave_progress_request:type_name -> alox.OtaSlaveProgressRequest
+	19, // 15: alox.UartMessage.ota_slave_progress_response:type_name -> alox.OtaSlaveProgressResponse
+	5,  // 16: alox.ClientInfoResponse.clients:type_name -> alox.ClientInfo
+	7,  // 17: alox.ClientInputResponse.clients:type_name -> alox.ClientInput
+	18, // 18: alox.OtaSlaveProgressResponse.slaves:type_name -> alox.OtaSlaveProgressEntry
+	19, // [19:19] is the sub-list for method output_type
+	19, // [19:19] is the sub-list for method input_type
+	19, // [19:19] is the sub-list for extension type_name
+	19, // [19:19] is the sub-list for extension extendee
+	0,  // [0:19] is the sub-list for field type_name
 }

 func init() { file_uart_messages_proto_init() }
@@ -1376,6 +1635,8 @@ func file_uart_messages_proto_init() {
 		(*UartMessage_AccelDeadzoneResponse)(nil),
 		(*UartMessage_EspnowUnicastTestRequest)(nil),
 		(*UartMessage_EspnowUnicastTestResponse)(nil),
+		(*UartMessage_OtaSlaveProgressRequest)(nil),
+		(*UartMessage_OtaSlaveProgressResponse)(nil),
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -1383,7 +1644,7 @@ func file_uart_messages_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_uart_messages_proto_rawDesc), len(file_uart_messages_proto_rawDesc)),
 			NumEnums:      1,
-			NumMessages:   16,
+			NumMessages:   19,
 			NumExtensions: 0,
 			NumServices:   0,
 		},