diff --git a/goTool/README.md b/goTool/README.md index da75324..ccd70a3 100644 --- a/goTool/README.md +++ b/goTool/README.md @@ -29,7 +29,8 @@ go run . -port /dev/ttyUSB0 clients | `serve` | — | Web dashboard at `http://localhost:8080` (WebSocket live updates) | | `ota` | 16–19 | UART firmware upload to master; firmware then pushes to slaves via ESP-NOW | | `ota-progress` | 21 | Query per-slave ESP-NOW OTA progress on the master (`-client N`, default all) | -| `led-ring` | 8 | LED ring: `-mode clear\|progress\|digit\|blink`, `-progress`, `-digit`, RGB, `-intensity` (0 = ~5 %), `-blink-ms`, `-blink-count` | +| `led-ring` | 8 | LED ring: `-mode clear\|progress\|digit\|blink\|find-me`, … | +| `find-me` | 22 | Locate pod (`-client 0` master, `>0` slave via ESP-NOW) | `clients` requires slaves to have responded to master discover broadcasts first. @@ -70,7 +71,7 @@ The dashboard can configure nodes using the same UART commands as the CLI: | Alle Slaves | per-slave ESP-NOW (Master bleibt unverändert; CLI `-all` setzt auch den Master) | | Unicast test | `unicast-test -client ID` | -HTTP API (used by the web UI): `GET/POST /api/deadzone`, `POST /api/unicast-test`, `POST /api/ota` (multipart field `firmware`, max 2 MiB). +HTTP API (used by the web UI): `GET/POST /api/deadzone`, `POST /api/unicast-test`, `POST /api/find-me`, `POST /api/ota` (multipart field `firmware`, max 2 MiB). | UI / API | Behaviour | |----------|-----------| diff --git a/goTool/api_serve.go b/goTool/api_serve.go index d51ade7..bb637d7 100644 --- a/goTool/api_serve.go +++ b/goTool/api_serve.go @@ -40,6 +40,16 @@ type unicastAPIResponse struct { Error string `json:"error,omitempty"` } +type findMeAPIRequest struct { + ClientID uint32 `json:"client_id"` +} + +type findMeAPIResponse struct { + Success bool `json:"success"` + ClientID uint32 `json:"client_id,omitempty"` + Error string `json:"error,omitempty"` +} + type otaAPIResponse struct { Success bool `json:"success"` BytesWritten uint32 `json:"bytes_written,omitempty"` @@ -65,6 +75,13 @@ func mountServeAPI(mux *http.ServeMux, link *managedSerial, hub *wsHub) { } serveUnicastTest(w, r, link) }) + mux.HandleFunc("/api/find-me", func(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + serveFindMe(w, r, link) + }) mux.HandleFunc("/api/ota", func(w http.ResponseWriter, r *http.Request) { if r.Method != http.MethodPost { http.Error(w, "method not allowed", http.StatusMethodNotAllowed) @@ -216,6 +233,22 @@ func applyDeadzoneToSlaves(link *managedSerial, deadzone uint32) (uint32, error) return updated, nil } +func serveFindMe(w http.ResponseWriter, r *http.Request, link *managedSerial) { + var body findMeAPIRequest + if err := json.NewDecoder(r.Body).Decode(&body); err != nil { + writeJSON(w, http.StatusBadRequest, findMeAPIResponse{Error: "invalid JSON"}) + return + } + if err := link.FindMe(body.ClientID); err != nil { + writeJSON(w, http.StatusServiceUnavailable, findMeAPIResponse{ + ClientID: body.ClientID, + Error: err.Error(), + }) + return + } + writeJSON(w, http.StatusOK, findMeAPIResponse{Success: true, ClientID: body.ClientID}) +} + func serveUnicastTest(w http.ResponseWriter, r *http.Request, link *managedSerial) { var body unicastAPIRequest if err := json.NewDecoder(r.Body).Decode(&body); err != nil { diff --git a/goTool/client_api.go b/goTool/client_api.go index 62340a1..b36aae3 100644 --- a/goTool/client_api.go +++ b/goTool/client_api.go @@ -172,6 +172,12 @@ func (s *serialPort) espnowUnicastTest(clientID, seq uint32) (*pb.EspNowUnicastT return r, nil } +func (m *managedSerial) FindMe(clientID uint32) error { + return m.withPort(func(sp *serialPort) error { + return runFindMeClient(sp, clientID) + }) +} + func (s *serialPort) ledRingProgress(req *pb.LedRingProgressRequest) (*pb.LedRingProgressResponse, error) { msg := &pb.UartMessage{ Type: pb.MessageType_LED_RING, diff --git a/goTool/cmd_find_me.go b/goTool/cmd_find_me.go new file mode 100644 index 0000000..745cd8e --- /dev/null +++ b/goTool/cmd_find_me.go @@ -0,0 +1,61 @@ +package main + +import ( + "flag" + "fmt" + + "google.golang.org/protobuf/proto" + "powerpod/gotool/pb" +) + +func runFindMe(sp *serialPort, args []string) error { + fs := flag.NewFlagSet("find-me", flag.ExitOnError) + clientID := fs.Uint("client", 0, "0=master LED ring, >0=ESP-NOW unicast to slave id") + if err := fs.Parse(args); err != nil { + return err + } + return runFindMeClient(sp, uint32(*clientID)) +} + +func runFindMeClient(sp *serialPort, clientID uint32) error { + resp, err := sp.espnowFindMe(clientID) + if err != nil { + return err + } + if !resp.GetSuccess() { + return fmt.Errorf("find-me rejected (client_id=%d)", resp.GetClientId()) + } + if clientID == 0 { + fmt.Println("find-me started on master") + } else { + fmt.Printf("find-me sent to slave %d\n", clientID) + } + return nil +} + +func (s *serialPort) espnowFindMe(clientID uint32) (*pb.EspNowFindMeResponse, error) { + msg := &pb.UartMessage{ + Type: pb.MessageType_FIND_ME, + Payload: &pb.UartMessage_EspnowFindMeRequest{ + EspnowFindMeRequest: &pb.EspNowFindMeRequest{ClientId: clientID}, + }, + } + body, err := proto.Marshal(msg) + if err != nil { + return nil, fmt.Errorf("encode: %w", err) + } + payload := append([]byte{byte(pb.MessageType_FIND_ME)}, body...) + respPayload, err := s.exchangePayload(payload, "FIND_ME") + if err != nil { + return nil, err + } + var respMsg pb.UartMessage + if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil { + return nil, fmt.Errorf("decode: %w", err) + } + r := respMsg.GetEspnowFindMeResponse() + if r == nil { + return nil, fmt.Errorf("missing espnow_find_me_response") + } + return r, nil +} diff --git a/goTool/cmd_led_ring.go b/goTool/cmd_led_ring.go index 7dd2dac..d131845 100644 --- a/goTool/cmd_led_ring.go +++ b/goTool/cmd_led_ring.go @@ -12,11 +12,12 @@ const ( ledRingModeProgress = 1 ledRingModeDigit = 2 ledRingModeBlink = 3 + ledRingModeFindMe = 4 ) func runLedRing(sp *serialPort, args []string) error { fs := flag.NewFlagSet("led-ring", flag.ExitOnError) - mode := fs.String("mode", "progress", "clear, progress, digit, or blink") + mode := fs.String("mode", "progress", "clear, progress, digit, blink, or find-me") progress := fs.Uint("progress", 0, "fill level 0–100 (mode=progress)") digit := fs.Uint("digit", 0, "digit 0–10 (mode=digit)") r := fs.Uint("r", 0, "red 0–255") @@ -39,8 +40,10 @@ func runLedRing(sp *serialPort, args []string) error { modeVal = ledRingModeDigit case "blink": modeVal = ledRingModeBlink + case "find-me", "find_me", "findme": + modeVal = ledRingModeFindMe default: - return fmt.Errorf("unknown -mode %q (clear, progress, digit, blink)", *mode) + return fmt.Errorf("unknown -mode %q (clear, progress, digit, blink, find-me)", *mode) } resp, err := sp.ledRingProgress(&pb.LedRingProgressRequest{ diff --git a/goTool/main.go b/goTool/main.go index 31da6fa..c7e24a6 100644 --- a/goTool/main.go +++ b/goTool/main.go @@ -21,7 +21,8 @@ func usage() { fmt.Fprintf(os.Stderr, " serve web dashboard (Bootstrap + WebSocket)\n") fmt.Fprintf(os.Stderr, " ota UART OTA upload (A/B partitions)\n") fmt.Fprintf(os.Stderr, " ota-progress query per-slave ESP-NOW OTA progress on master\n") - fmt.Fprintf(os.Stderr, " led-ring set LED ring progress bar (0–100%%, rgb, intensity)\n\n") + fmt.Fprintf(os.Stderr, " led-ring set LED ring progress bar (0–100%%, rgb, intensity)\n") + fmt.Fprintf(os.Stderr, " find-me blink LED ring red/green/blue (3× each, full brightness)\n\n") flag.PrintDefaults() } @@ -48,7 +49,7 @@ func main() { os.Exit(2) } runErr = runServe(*portName, *baud, flag.Args()[1:]) - case "version", "clients", "client-info", "deadzone", "accel-deadzone", "unicast-test", "unicast_test", "led-ring", "led_ring", "ota", "ota-progress", "ota_progress": + case "version", "clients", "client-info", "deadzone", "accel-deadzone", "unicast-test", "unicast_test", "led-ring", "led_ring", "find-me", "find_me", "ota", "ota-progress", "ota_progress": if *portName == "" { fmt.Fprintf(os.Stderr, "command %q requires -port\n\n", cmd) usage() @@ -70,6 +71,8 @@ func main() { runErr = runUnicastTest(sp, flag.Args()[1:]) case "led-ring", "led_ring": runErr = runLedRing(sp, flag.Args()[1:]) + case "find-me", "find_me": + runErr = runFindMe(sp, flag.Args()[1:]) case "ota": runErr = runOTA(sp, flag.Args()[1:]) case "ota-progress", "ota_progress": diff --git a/goTool/pb/uart_messages.pb.go b/goTool/pb/uart_messages.pb.go index e9c8a11..a7ff111 100644 --- a/goTool/pb/uart_messages.pb.go +++ b/goTool/pb/uart_messages.pb.go @@ -39,6 +39,7 @@ const ( MessageType_OTA_STATUS MessageType = 19 MessageType_OTA_START_ESPNOW MessageType = 20 MessageType_OTA_SLAVE_PROGRESS MessageType = 21 + MessageType_FIND_ME MessageType = 22 ) // Enum value maps for MessageType. @@ -59,6 +60,7 @@ var ( 19: "OTA_STATUS", 20: "OTA_START_ESPNOW", 21: "OTA_SLAVE_PROGRESS", + 22: "FIND_ME", } MessageType_value = map[string]int32{ "UNKNOWN": 0, @@ -76,6 +78,7 @@ var ( "OTA_STATUS": 19, "OTA_START_ESPNOW": 20, "OTA_SLAVE_PROGRESS": 21, + "FIND_ME": 22, } ) @@ -128,6 +131,8 @@ type UartMessage struct { // *UartMessage_OtaSlaveProgressResponse // *UartMessage_LedRingProgressRequest // *UartMessage_LedRingProgressResponse + // *UartMessage_EspnowFindMeRequest + // *UartMessage_EspnowFindMeResponse Payload isUartMessage_Payload `protobuf_oneof:"payload"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -330,6 +335,24 @@ func (x *UartMessage) GetLedRingProgressResponse() *LedRingProgressResponse { return nil } +func (x *UartMessage) GetEspnowFindMeRequest() *EspNowFindMeRequest { + if x != nil { + if x, ok := x.Payload.(*UartMessage_EspnowFindMeRequest); ok { + return x.EspnowFindMeRequest + } + } + return nil +} + +func (x *UartMessage) GetEspnowFindMeResponse() *EspNowFindMeResponse { + if x != nil { + if x, ok := x.Payload.(*UartMessage_EspnowFindMeResponse); ok { + return x.EspnowFindMeResponse + } + } + return nil +} + type isUartMessage_Payload interface { isUartMessage_Payload() } @@ -402,6 +425,14 @@ type UartMessage_LedRingProgressResponse struct { LedRingProgressResponse *LedRingProgressResponse `protobuf:"bytes,18,opt,name=led_ring_progress_response,json=ledRingProgressResponse,proto3,oneof"` } +type UartMessage_EspnowFindMeRequest struct { + EspnowFindMeRequest *EspNowFindMeRequest `protobuf:"bytes,19,opt,name=espnow_find_me_request,json=espnowFindMeRequest,proto3,oneof"` +} + +type UartMessage_EspnowFindMeResponse struct { + EspnowFindMeResponse *EspNowFindMeResponse `protobuf:"bytes,20,opt,name=espnow_find_me_response,json=espnowFindMeResponse,proto3,oneof"` +} + func (*UartMessage_AckPayload) isUartMessage_Payload() {} func (*UartMessage_EchoPayload) isUartMessage_Payload() {} @@ -436,6 +467,10 @@ func (*UartMessage_LedRingProgressRequest) isUartMessage_Payload() {} func (*UartMessage_LedRingProgressResponse) isUartMessage_Payload() {} +func (*UartMessage_EspnowFindMeRequest) isUartMessage_Payload() {} + +func (*UartMessage_EspnowFindMeResponse) isUartMessage_Payload() {} + type Ack struct { state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields @@ -1068,8 +1103,8 @@ func (x *EspNowUnicastTestResponse) GetSeq() uint32 { return 0 } -// Host → device: LED ring display (progress bar, digit, clear, or blink). -// mode: 0=clear, 1=progress (0–100 %), 2=digit (0–10), 3=blink full ring. +// Host → device: LED ring display (progress bar, digit, clear, blink, or find-me). +// mode: 0=clear, 1=progress (0–100 %), 2=digit (0–10), 3=blink full ring, 4=find-me (R/G/B ×3 @ full brightness). type LedRingProgressRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Mode uint32 `protobuf:"varint,1,opt,name=mode,proto3" json:"mode,omitempty"` @@ -1251,6 +1286,103 @@ func (x *LedRingProgressResponse) GetDigit() uint32 { return 0 } +// * Host → master: find-me on local ring (client_id=0) or ESP-NOW unicast to one slave. +type EspNowFindMeRequest 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 *EspNowFindMeRequest) Reset() { + *x = EspNowFindMeRequest{} + mi := &file_uart_messages_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *EspNowFindMeRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EspNowFindMeRequest) ProtoMessage() {} + +func (x *EspNowFindMeRequest) ProtoReflect() protoreflect.Message { + mi := &file_uart_messages_proto_msgTypes[14] + 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 EspNowFindMeRequest.ProtoReflect.Descriptor instead. +func (*EspNowFindMeRequest) Descriptor() ([]byte, []int) { + return file_uart_messages_proto_rawDescGZIP(), []int{14} +} + +func (x *EspNowFindMeRequest) GetClientId() uint32 { + if x != nil { + return x.ClientId + } + return 0 +} + +type EspNowFindMeResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` + ClientId uint32 `protobuf:"varint,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *EspNowFindMeResponse) Reset() { + *x = EspNowFindMeResponse{} + mi := &file_uart_messages_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *EspNowFindMeResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EspNowFindMeResponse) ProtoMessage() {} + +func (x *EspNowFindMeResponse) ProtoReflect() protoreflect.Message { + mi := &file_uart_messages_proto_msgTypes[15] + 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 EspNowFindMeResponse.ProtoReflect.Descriptor instead. +func (*EspNowFindMeResponse) Descriptor() ([]byte, []int) { + return file_uart_messages_proto_rawDescGZIP(), []int{15} +} + +func (x *EspNowFindMeResponse) GetSuccess() bool { + if x != nil { + return x.Success + } + return false +} + +func (x *EspNowFindMeResponse) GetClientId() uint32 { + if x != nil { + return x.ClientId + } + return 0 +} + // Host → device: begin UART OTA (erase inactive OTA slot; device replies OTA_STATUS). type OtaStartPayload struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -1261,7 +1393,7 @@ type OtaStartPayload struct { func (x *OtaStartPayload) Reset() { *x = OtaStartPayload{} - mi := &file_uart_messages_proto_msgTypes[14] + mi := &file_uart_messages_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1273,7 +1405,7 @@ func (x *OtaStartPayload) String() string { func (*OtaStartPayload) ProtoMessage() {} func (x *OtaStartPayload) ProtoReflect() protoreflect.Message { - mi := &file_uart_messages_proto_msgTypes[14] + mi := &file_uart_messages_proto_msgTypes[16] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1286,7 +1418,7 @@ func (x *OtaStartPayload) ProtoReflect() protoreflect.Message { // Deprecated: Use OtaStartPayload.ProtoReflect.Descriptor instead. func (*OtaStartPayload) Descriptor() ([]byte, []int) { - return file_uart_messages_proto_rawDescGZIP(), []int{14} + return file_uart_messages_proto_rawDescGZIP(), []int{16} } func (x *OtaStartPayload) GetTotalSize() uint32 { @@ -1307,7 +1439,7 @@ type OtaPayload struct { func (x *OtaPayload) Reset() { *x = OtaPayload{} - mi := &file_uart_messages_proto_msgTypes[15] + mi := &file_uart_messages_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1319,7 +1451,7 @@ func (x *OtaPayload) String() string { func (*OtaPayload) ProtoMessage() {} func (x *OtaPayload) ProtoReflect() protoreflect.Message { - mi := &file_uart_messages_proto_msgTypes[15] + mi := &file_uart_messages_proto_msgTypes[17] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1332,7 +1464,7 @@ func (x *OtaPayload) ProtoReflect() protoreflect.Message { // Deprecated: Use OtaPayload.ProtoReflect.Descriptor instead. func (*OtaPayload) Descriptor() ([]byte, []int) { - return file_uart_messages_proto_rawDescGZIP(), []int{15} + return file_uart_messages_proto_rawDescGZIP(), []int{17} } func (x *OtaPayload) GetSeq() uint32 { @@ -1358,7 +1490,7 @@ type OtaEndPayload struct { func (x *OtaEndPayload) Reset() { *x = OtaEndPayload{} - mi := &file_uart_messages_proto_msgTypes[16] + mi := &file_uart_messages_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1370,7 +1502,7 @@ func (x *OtaEndPayload) String() string { func (*OtaEndPayload) ProtoMessage() {} func (x *OtaEndPayload) ProtoReflect() protoreflect.Message { - mi := &file_uart_messages_proto_msgTypes[16] + mi := &file_uart_messages_proto_msgTypes[18] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1383,7 +1515,7 @@ func (x *OtaEndPayload) ProtoReflect() protoreflect.Message { // Deprecated: Use OtaEndPayload.ProtoReflect.Descriptor instead. func (*OtaEndPayload) Descriptor() ([]byte, []int) { - return file_uart_messages_proto_rawDescGZIP(), []int{16} + return file_uart_messages_proto_rawDescGZIP(), []int{18} } // Device → host status (also used as ACK after each 4 KiB written). @@ -1400,7 +1532,7 @@ type OtaStatusPayload struct { func (x *OtaStatusPayload) Reset() { *x = OtaStatusPayload{} - mi := &file_uart_messages_proto_msgTypes[17] + mi := &file_uart_messages_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1412,7 +1544,7 @@ func (x *OtaStatusPayload) String() string { func (*OtaStatusPayload) ProtoMessage() {} func (x *OtaStatusPayload) ProtoReflect() protoreflect.Message { - mi := &file_uart_messages_proto_msgTypes[17] + mi := &file_uart_messages_proto_msgTypes[19] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1425,7 +1557,7 @@ func (x *OtaStatusPayload) ProtoReflect() protoreflect.Message { // Deprecated: Use OtaStatusPayload.ProtoReflect.Descriptor instead. func (*OtaStatusPayload) Descriptor() ([]byte, []int) { - return file_uart_messages_proto_rawDescGZIP(), []int{17} + return file_uart_messages_proto_rawDescGZIP(), []int{19} } func (x *OtaStatusPayload) GetStatus() uint32 { @@ -1466,7 +1598,7 @@ type OtaSlaveProgressRequest struct { func (x *OtaSlaveProgressRequest) Reset() { *x = OtaSlaveProgressRequest{} - mi := &file_uart_messages_proto_msgTypes[18] + mi := &file_uart_messages_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1478,7 +1610,7 @@ func (x *OtaSlaveProgressRequest) String() string { func (*OtaSlaveProgressRequest) ProtoMessage() {} func (x *OtaSlaveProgressRequest) ProtoReflect() protoreflect.Message { - mi := &file_uart_messages_proto_msgTypes[18] + mi := &file_uart_messages_proto_msgTypes[20] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1491,7 +1623,7 @@ func (x *OtaSlaveProgressRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use OtaSlaveProgressRequest.ProtoReflect.Descriptor instead. func (*OtaSlaveProgressRequest) Descriptor() ([]byte, []int) { - return file_uart_messages_proto_rawDescGZIP(), []int{18} + return file_uart_messages_proto_rawDescGZIP(), []int{20} } func (x *OtaSlaveProgressRequest) GetClientId() uint32 { @@ -1515,7 +1647,7 @@ type OtaSlaveProgressEntry struct { func (x *OtaSlaveProgressEntry) Reset() { *x = OtaSlaveProgressEntry{} - mi := &file_uart_messages_proto_msgTypes[19] + mi := &file_uart_messages_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1527,7 +1659,7 @@ func (x *OtaSlaveProgressEntry) String() string { func (*OtaSlaveProgressEntry) ProtoMessage() {} func (x *OtaSlaveProgressEntry) ProtoReflect() protoreflect.Message { - mi := &file_uart_messages_proto_msgTypes[19] + mi := &file_uart_messages_proto_msgTypes[21] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1540,7 +1672,7 @@ func (x *OtaSlaveProgressEntry) ProtoReflect() protoreflect.Message { // Deprecated: Use OtaSlaveProgressEntry.ProtoReflect.Descriptor instead. func (*OtaSlaveProgressEntry) Descriptor() ([]byte, []int) { - return file_uart_messages_proto_rawDescGZIP(), []int{19} + return file_uart_messages_proto_rawDescGZIP(), []int{21} } func (x *OtaSlaveProgressEntry) GetClientId() uint32 { @@ -1591,7 +1723,7 @@ type OtaSlaveProgressResponse struct { func (x *OtaSlaveProgressResponse) Reset() { *x = OtaSlaveProgressResponse{} - mi := &file_uart_messages_proto_msgTypes[20] + mi := &file_uart_messages_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1603,7 +1735,7 @@ func (x *OtaSlaveProgressResponse) String() string { func (*OtaSlaveProgressResponse) ProtoMessage() {} func (x *OtaSlaveProgressResponse) ProtoReflect() protoreflect.Message { - mi := &file_uart_messages_proto_msgTypes[20] + mi := &file_uart_messages_proto_msgTypes[22] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1616,7 +1748,7 @@ func (x *OtaSlaveProgressResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use OtaSlaveProgressResponse.ProtoReflect.Descriptor instead. func (*OtaSlaveProgressResponse) Descriptor() ([]byte, []int) { - return file_uart_messages_proto_rawDescGZIP(), []int{20} + return file_uart_messages_proto_rawDescGZIP(), []int{22} } func (x *OtaSlaveProgressResponse) GetActive() bool { @@ -1658,8 +1790,7 @@ var File_uart_messages_proto protoreflect.FileDescriptor const file_uart_messages_proto_rawDesc = "" + "\n" + - "\x13uart_messages.proto\x12\x04alox\x1a\fnanopb.proto\"\xc4\n" + - "\n" + + "\x13uart_messages.proto\x12\x04alox\x1a\fnanopb.proto\"\xeb\v\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" + @@ -1682,7 +1813,9 @@ const file_uart_messages_proto_rawDesc = "" + "\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\x18otaSlaveProgressResponse\x12Y\n" + "\x19led_ring_progress_request\x18\x11 \x01(\v2\x1c.alox.LedRingProgressRequestH\x00R\x16ledRingProgressRequest\x12\\\n" + - "\x1aled_ring_progress_response\x18\x12 \x01(\v2\x1d.alox.LedRingProgressResponseH\x00R\x17ledRingProgressResponseB\t\n" + + "\x1aled_ring_progress_response\x18\x12 \x01(\v2\x1d.alox.LedRingProgressResponseH\x00R\x17ledRingProgressResponse\x12P\n" + + "\x16espnow_find_me_request\x18\x13 \x01(\v2\x19.alox.EspNowFindMeRequestH\x00R\x13espnowFindMeRequest\x12S\n" + + "\x17espnow_find_me_response\x18\x14 \x01(\v2\x1a.alox.EspNowFindMeResponseH\x00R\x14espnowFindMeResponseB\t\n" + "\apayload\"\x05\n" + "\x03Ack\"!\n" + "\vEchoPayload\x12\x12\n" + @@ -1741,7 +1874,12 @@ const file_uart_messages_proto_rawDesc = "" + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x12\n" + "\x04mode\x18\x02 \x01(\rR\x04mode\x12\x1a\n" + "\bprogress\x18\x03 \x01(\rR\bprogress\x12\x14\n" + - "\x05digit\x18\x04 \x01(\rR\x05digit\"0\n" + + "\x05digit\x18\x04 \x01(\rR\x05digit\"2\n" + + "\x13EspNowFindMeRequest\x12\x1b\n" + + "\tclient_id\x18\x01 \x01(\rR\bclientId\"M\n" + + "\x14EspNowFindMeResponse\x12\x18\n" + + "\asuccess\x18\x01 \x01(\bR\asuccess\x12\x1b\n" + + "\tclient_id\x18\x02 \x01(\rR\bclientId\"0\n" + "\x0fOtaStartPayload\x12\x1d\n" + "\n" + "total_size\x18\x01 \x01(\rR\ttotalSize\":\n" + @@ -1772,7 +1910,7 @@ const file_uart_messages_proto_rawDesc = "" + "\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*\x83\x02\n" + + "\x06slaves\x18\x05 \x03(\v2\x1b.alox.OtaSlaveProgressEntryB\x05\x92?\x02\x10\x10R\x06slaves*\x90\x02\n" + "\vMessageType\x12\v\n" + "\aUNKNOWN\x10\x00\x12\a\n" + "\x03ACK\x10\x01\x12\b\n" + @@ -1789,7 +1927,8 @@ const file_uart_messages_proto_rawDesc = "" + "\n" + "OTA_STATUS\x10\x13\x12\x14\n" + "\x10OTA_START_ESPNOW\x10\x14\x12\x16\n" + - "\x12OTA_SLAVE_PROGRESS\x10\x15b\x06proto3" + "\x12OTA_SLAVE_PROGRESS\x10\x15\x12\v\n" + + "\aFIND_ME\x10\x16b\x06proto3" var ( file_uart_messages_proto_rawDescOnce sync.Once @@ -1804,7 +1943,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, 21) +var file_uart_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 23) var file_uart_messages_proto_goTypes = []any{ (MessageType)(0), // 0: alox.MessageType (*UartMessage)(nil), // 1: alox.UartMessage @@ -1821,13 +1960,15 @@ var file_uart_messages_proto_goTypes = []any{ (*EspNowUnicastTestResponse)(nil), // 12: alox.EspNowUnicastTestResponse (*LedRingProgressRequest)(nil), // 13: alox.LedRingProgressRequest (*LedRingProgressResponse)(nil), // 14: alox.LedRingProgressResponse - (*OtaStartPayload)(nil), // 15: alox.OtaStartPayload - (*OtaPayload)(nil), // 16: alox.OtaPayload - (*OtaEndPayload)(nil), // 17: alox.OtaEndPayload - (*OtaStatusPayload)(nil), // 18: alox.OtaStatusPayload - (*OtaSlaveProgressRequest)(nil), // 19: alox.OtaSlaveProgressRequest - (*OtaSlaveProgressEntry)(nil), // 20: alox.OtaSlaveProgressEntry - (*OtaSlaveProgressResponse)(nil), // 21: alox.OtaSlaveProgressResponse + (*EspNowFindMeRequest)(nil), // 15: alox.EspNowFindMeRequest + (*EspNowFindMeResponse)(nil), // 16: alox.EspNowFindMeResponse + (*OtaStartPayload)(nil), // 17: alox.OtaStartPayload + (*OtaPayload)(nil), // 18: alox.OtaPayload + (*OtaEndPayload)(nil), // 19: alox.OtaEndPayload + (*OtaStatusPayload)(nil), // 20: alox.OtaStatusPayload + (*OtaSlaveProgressRequest)(nil), // 21: alox.OtaSlaveProgressRequest + (*OtaSlaveProgressEntry)(nil), // 22: alox.OtaSlaveProgressEntry + (*OtaSlaveProgressResponse)(nil), // 23: alox.OtaSlaveProgressResponse } var file_uart_messages_proto_depIdxs = []int32{ 0, // 0: alox.UartMessage.type:type_name -> alox.MessageType @@ -1836,26 +1977,28 @@ var file_uart_messages_proto_depIdxs = []int32{ 4, // 3: alox.UartMessage.version_response:type_name -> alox.VersionResponse 6, // 4: alox.UartMessage.client_info_response:type_name -> alox.ClientInfoResponse 8, // 5: alox.UartMessage.client_input_response:type_name -> alox.ClientInputResponse - 15, // 6: alox.UartMessage.ota_start:type_name -> alox.OtaStartPayload - 16, // 7: alox.UartMessage.ota_payload:type_name -> alox.OtaPayload - 17, // 8: alox.UartMessage.ota_end:type_name -> alox.OtaEndPayload - 18, // 9: alox.UartMessage.ota_status:type_name -> alox.OtaStatusPayload + 17, // 6: alox.UartMessage.ota_start:type_name -> alox.OtaStartPayload + 18, // 7: alox.UartMessage.ota_payload:type_name -> alox.OtaPayload + 19, // 8: alox.UartMessage.ota_end:type_name -> alox.OtaEndPayload + 20, // 9: alox.UartMessage.ota_status:type_name -> alox.OtaStatusPayload 9, // 10: alox.UartMessage.accel_deadzone_request:type_name -> alox.AccelDeadzoneRequest 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 - 19, // 14: alox.UartMessage.ota_slave_progress_request:type_name -> alox.OtaSlaveProgressRequest - 21, // 15: alox.UartMessage.ota_slave_progress_response:type_name -> alox.OtaSlaveProgressResponse + 21, // 14: alox.UartMessage.ota_slave_progress_request:type_name -> alox.OtaSlaveProgressRequest + 23, // 15: alox.UartMessage.ota_slave_progress_response:type_name -> alox.OtaSlaveProgressResponse 13, // 16: alox.UartMessage.led_ring_progress_request:type_name -> alox.LedRingProgressRequest 14, // 17: alox.UartMessage.led_ring_progress_response:type_name -> alox.LedRingProgressResponse - 5, // 18: alox.ClientInfoResponse.clients:type_name -> alox.ClientInfo - 7, // 19: alox.ClientInputResponse.clients:type_name -> alox.ClientInput - 20, // 20: alox.OtaSlaveProgressResponse.slaves:type_name -> alox.OtaSlaveProgressEntry - 21, // [21:21] is the sub-list for method output_type - 21, // [21:21] is the sub-list for method input_type - 21, // [21:21] is the sub-list for extension type_name - 21, // [21:21] is the sub-list for extension extendee - 0, // [0:21] is the sub-list for field type_name + 15, // 18: alox.UartMessage.espnow_find_me_request:type_name -> alox.EspNowFindMeRequest + 16, // 19: alox.UartMessage.espnow_find_me_response:type_name -> alox.EspNowFindMeResponse + 5, // 20: alox.ClientInfoResponse.clients:type_name -> alox.ClientInfo + 7, // 21: alox.ClientInputResponse.clients:type_name -> alox.ClientInput + 22, // 22: alox.OtaSlaveProgressResponse.slaves:type_name -> alox.OtaSlaveProgressEntry + 23, // [23:23] is the sub-list for method output_type + 23, // [23:23] is the sub-list for method input_type + 23, // [23:23] is the sub-list for extension type_name + 23, // [23:23] is the sub-list for extension extendee + 0, // [0:23] is the sub-list for field type_name } func init() { file_uart_messages_proto_init() } @@ -1881,6 +2024,8 @@ func file_uart_messages_proto_init() { (*UartMessage_OtaSlaveProgressResponse)(nil), (*UartMessage_LedRingProgressRequest)(nil), (*UartMessage_LedRingProgressResponse)(nil), + (*UartMessage_EspnowFindMeRequest)(nil), + (*UartMessage_EspnowFindMeResponse)(nil), } type x struct{} out := protoimpl.TypeBuilder{ @@ -1888,7 +2033,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: 21, + NumMessages: 23, NumExtensions: 0, NumServices: 0, }, diff --git a/goTool/webui/index.html b/goTool/webui/index.html index a18f3bf..ea9cbd4 100644 --- a/goTool/webui/index.html +++ b/goTool/webui/index.html @@ -227,6 +227,12 @@ :disabled="busy || !state.uart_connected"> Setzen +
UART nicht verbunden — Eingabe gesperrt.
@@ -300,6 +306,12 @@
title="ESP-NOW Unicast-Test">
Test
+
@@ -726,6 +738,27 @@
} finally {
this.busy = false;
}
+ },
+ async findMe(clientId = 0) {
+ this.busy = true;
+ try {
+ const r = await fetch('/api/find-me', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ client_id: clientId })
+ });
+ const data = await r.json();
+ if (!r.ok || !data.success) {
+ this.flash(data.error || 'Find me fehlgeschlagen', false);
+ return;
+ }
+ const label = clientId === 0 ? 'Master' : `Slave ${clientId}`;
+ this.flash(`Find me gestartet (${label})`, true);
+ } catch (e) {
+ this.flash(String(e), false);
+ } finally {
+ this.busy = false;
+ }
}
};
}
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index bb0050c..0950436 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -19,6 +19,7 @@ idf_component_register(
"cmd_client_info.c"
"cmd_accel_deadzone.c"
"cmd_espnow_unicast_test.c"
+ "cmd_espnow_find_me.c"
"cmd_led_ring.c"
"cmd_ota.c"
"cmd_ota_slave_progress.c"
diff --git a/main/README.md b/main/README.md
index fd6aa7c..8549530 100644
--- a/main/README.md
+++ b/main/README.md
@@ -110,6 +110,8 @@ Schema: `proto/esp_now_messages.proto`. Encode/decode: `esp_now_proto.c`. The ES
| `ESPNOW_SLAVE_INFO` | Slave → master | `EspNowSlavePresence` |
| `ESPNOW_HEARTBEAT` | Slave → master | `EspNowSlavePresence` (same fields) |
| `ESPNOW_SET_ACCEL_DEADZONE` | Master → slave | `EspNowAccelDeadzone` (`deadzone` LSB) |
+| `ESPNOW_UNICAST_TEST` | Master → slave | `EspNowUnicastTest` (`seq`) |
+| `ESPNOW_FIND_ME` | Master → slave | `EspNowFindMe` (`client_id` filter) — LED locate sequence |
| `ESPNOW_OTA_START` | Master → slave (unicast) | `EspNowOtaStart` (`total_size`) |
| `ESPNOW_OTA_PAYLOAD` | Master → slave | `EspNowOtaPayload` (`seq`, up to 200 B `data`) |
| `ESPNOW_OTA_END` | Master → slave | `EspNowOtaEnd` |
@@ -210,6 +212,7 @@ Host and master speak nanopb-encoded `UartMessage` inside UART frames (byte 0 =
| 19 | `OTA_STATUS` | Device → host (prepare/ready/block ACK/success/failed) |
| 20 | `OTA_START_ESPNOW` | Implemented — re-distribute staged image to slaves only |
| 21 | `OTA_SLAVE_PROGRESS` | Implemented (`cmd_ota_slave_progress.c`) — query per-slave ESP-NOW OTA progress |
+| 22 | `FIND_ME` | Implemented (`cmd_espnow_find_me.c`) — `client_id=0` local ring, `>0` ESP-NOW to slave |
Regenerate C code:
@@ -313,6 +316,19 @@ Minimal master→slave ESP-NOW unicast check (no BMA456). Use this before debugg
**Firmware logs:** master `unicast TEST to … seq=N`; slave `UNICAST TEST OK from master … seq=N`.
+### FIND_ME command
+
+Locate a pod: the LED ring blinks **3× red, 3× green, 3× blue** at full brightness.
+
+**Request:** framed `22` + `espnow_find_me_request` (`client_id`: `0` = master only, `>0` = ESP-NOW unicast to that slave).
+
+**Response:** `espnow_find_me_response` (`success`, `client_id`).
+
+```bash
+go run . -port /dev/ttyUSB0 find-me
+go run . -port /dev/ttyUSB0 find-me -client 16
+```
+
### LED_RING command
Control the 95-LED ring from the host. The firmware **does not** animate digits locally; only UART updates the display.
@@ -321,7 +337,7 @@ Control the 95-LED ring from the host. The firmware **does not** animate digits
| Field | Meaning |
|-------|---------|
-| `mode` | `0` = clear, `1` = progress bar, `2` = digit, `3` = blink full ring |
+| `mode` | `0` = clear, `1` = progress bar, `2` = digit, `3` = blink full ring, `4` = find-me (R/G/B ×3 @ full brightness) |
| `progress` | 0–100 (% of ring lit, mode `1`) |
| `digit` | 0–10 (mode `2`, same segment maps as built-in digits) |
| `r`, `g`, `b` | Color 0–255 |
@@ -335,6 +351,9 @@ go run . -port /dev/ttyUSB0 led-ring -mode progress -progress 75 -g 80 -b 255
go run . -port /dev/ttyUSB0 led-ring -mode digit -digit 7 -r 255 -g 200
go run . -port /dev/ttyUSB0 led-ring -mode clear
go run . -port /dev/ttyUSB0 led-ring -mode blink -g 255 -blink-count 2
+go run . -port /dev/ttyUSB0 find-me
+go run . -port /dev/ttyUSB0 find-me -client 16
+go run . -port /dev/ttyUSB0 led-ring -mode find-me
```
### CLIENT_INFO command
diff --git a/main/cmd_espnow_find_me.c b/main/cmd_espnow_find_me.c
new file mode 100644
index 0000000..0e88224
--- /dev/null
+++ b/main/cmd_espnow_find_me.c
@@ -0,0 +1,64 @@
+#include "client_registry.h"
+#include "cmd_espnow_find_me.h"
+#include "esp_log.h"
+#include "esp_now_comm.h"
+#include "led_ring.h"
+#include "uart_cmd.h"
+
+static const char *TAG = "[FIND_ME]";
+
+static void reply(bool success, uint32_t client_id) {
+ alox_UartMessage response;
+ uart_cmd_init_response(&response, alox_MessageType_FIND_ME,
+ alox_UartMessage_espnow_find_me_response_tag);
+ response.payload.espnow_find_me_response.success = success;
+ response.payload.espnow_find_me_response.client_id = client_id;
+ uart_cmd_send(&response, TAG);
+}
+
+static void handle_find_me(const uint8_t *data, size_t len) {
+ alox_UartMessage uart_msg;
+
+ if (uart_cmd_decode(data, len, &uart_msg) != ESP_OK) {
+ ESP_LOGW(TAG, "decode failed");
+ reply(false, 0);
+ return;
+ }
+
+ const alox_EspNowFindMeRequest *req = UART_CMD_REQ(
+ &uart_msg, alox_UartMessage_espnow_find_me_request_tag,
+ espnow_find_me_request);
+ if (req == NULL) {
+ ESP_LOGW(TAG, "missing find_me request");
+ reply(false, 0);
+ return;
+ }
+
+ if (req->client_id == 0) {
+ led_ring_find_me();
+ ESP_LOGI(TAG, "find-me on master");
+ reply(true, 0);
+ return;
+ }
+
+ const client_info_t *client = client_registry_find_by_id(req->client_id);
+ if (client == NULL) {
+ ESP_LOGW(TAG, "client id %lu not in registry",
+ (unsigned long)req->client_id);
+ reply(false, req->client_id);
+ return;
+ }
+
+ esp_err_t err = esp_now_comm_send_find_me(client->mac, req->client_id);
+ if (err == ESP_OK) {
+ ESP_LOGI(TAG, "find-me sent to slave %lu", (unsigned long)req->client_id);
+ } else {
+ ESP_LOGW(TAG, "find-me to slave %lu failed: %s",
+ (unsigned long)req->client_id, esp_err_to_name(err));
+ }
+ reply(err == ESP_OK, req->client_id);
+}
+
+void cmd_espnow_find_me_register(void) {
+ uart_cmd_register(alox_MessageType_FIND_ME, handle_find_me);
+}
diff --git a/main/cmd_espnow_find_me.h b/main/cmd_espnow_find_me.h
new file mode 100644
index 0000000..0769f68
--- /dev/null
+++ b/main/cmd_espnow_find_me.h
@@ -0,0 +1,6 @@
+#ifndef CMD_ESPNOW_FIND_ME_H
+#define CMD_ESPNOW_FIND_ME_H
+
+void cmd_espnow_find_me_register(void);
+
+#endif
diff --git a/main/cmd_handler.c b/main/cmd_handler.c
index 630dae0..011dc0b 100644
--- a/main/cmd_handler.c
+++ b/main/cmd_handler.c
@@ -44,6 +44,8 @@ static const char *message_type_name(uint16_t id) {
return "OTA_START_ESPNOW";
case alox_MessageType_OTA_SLAVE_PROGRESS:
return "OTA_SLAVE_PROGRESS";
+ case alox_MessageType_FIND_ME:
+ return "FIND_ME";
default:
return "UNKNOWN";
}
diff --git a/main/cmd_led_ring.c b/main/cmd_led_ring.c
index 8036f5b..5672ecd 100644
--- a/main/cmd_led_ring.c
+++ b/main/cmd_led_ring.c
@@ -9,6 +9,7 @@ static const char *TAG = "[LED_RING_CMD]";
#define LED_RING_MODE_PROGRESS 1
#define LED_RING_MODE_DIGIT 2
#define LED_RING_MODE_BLINK 3
+#define LED_RING_MODE_FIND_ME 4
static uint8_t clamp_u8(uint32_t v) {
if (v > 255) {
@@ -109,6 +110,12 @@ static void handle_led_ring(const uint8_t *data, size_t len) {
return;
}
+ case LED_RING_MODE_FIND_ME:
+ led_ring_find_me();
+ ESP_LOGI(TAG, "find-me");
+ reply(true, mode, 0, 0);
+ return;
+
case LED_RING_MODE_BLINK: {
cmd.mode = LED_CMD_BLINK;
cmd.r = r;
diff --git a/main/esp_now_comm.c b/main/esp_now_comm.c
index 93c9da9..15d7076 100644
--- a/main/esp_now_comm.c
+++ b/main/esp_now_comm.c
@@ -1,6 +1,7 @@
#include "bosch456.h"
#include "client_registry.h"
#include "esp_now_comm.h"
+#include "led_ring.h"
#include "ota_espnow.h"
#include "esp_now_proto.h"
#include "esp_err.h"
@@ -171,6 +172,16 @@ static esp_err_t send_unicast_test(const uint8_t *dest_mac, uint32_t seq) {
return send_message(dest_mac, &msg);
}
+static esp_err_t send_find_me(const uint8_t *dest_mac, uint32_t client_id) {
+ alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
+
+ msg.type = alox_EspNowMessageType_ESPNOW_FIND_ME;
+ msg.which_payload = alox_EspNowMessage_find_me_tag;
+ msg.payload.find_me.client_id = client_id;
+
+ return send_message(dest_mac, &msg);
+}
+
static esp_err_t send_ota_start(const uint8_t *dest_mac, uint32_t total_size) {
alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
@@ -261,6 +272,25 @@ bool esp_now_comm_get_master_mac(uint8_t mac_out[CLIENT_MAC_LEN]) {
return true;
}
+esp_err_t esp_now_comm_send_find_me(const uint8_t mac[CLIENT_MAC_LEN],
+ uint32_t client_id) {
+ if (mac == NULL || !s_config.master) {
+ return ESP_ERR_INVALID_STATE;
+ }
+
+ char mac_str[18];
+ mac_to_str(mac, mac_str, sizeof(mac_str));
+ esp_err_t err = send_find_me(mac, client_id);
+ if (err == ESP_OK) {
+ ESP_LOGI(TAG, "unicast FIND_ME to %s client_id=%lu", mac_str,
+ (unsigned long)client_id);
+ } else {
+ ESP_LOGW(TAG, "unicast FIND_ME to %s failed: %s", mac_str,
+ esp_err_to_name(err));
+ }
+ return err;
+}
+
esp_err_t esp_now_comm_send_unicast_test(const uint8_t mac[CLIENT_MAC_LEN],
uint32_t seq) {
if (mac == NULL || !s_config.master) {
@@ -330,6 +360,24 @@ static void handle_slave_unicast_test(const uint8_t *master_mac,
mac_str, (unsigned long)test->seq, (int)s_slave_joined);
}
+static void handle_slave_find_me(const uint8_t *master_mac,
+ const alox_EspNowFindMe *req) {
+ uint32_t my_id = s_own_mac[5];
+
+ if (req->client_id != 0 && req->client_id != my_id) {
+ return;
+ }
+
+ if (s_slave_joined && !mac_equal(master_mac, s_master_mac)) {
+ return;
+ }
+
+ char mac_str[18];
+ mac_to_str(master_mac, mac_str, sizeof(mac_str));
+ ESP_LOGI(TAG, "FIND_ME from master %s (id=%lu)", mac_str, (unsigned long)my_id);
+ led_ring_find_me();
+}
+
static void handle_slave_accel_deadzone(const uint8_t *master_mac,
const alox_EspNowAccelDeadzone *cfg) {
uint32_t my_id = s_own_mac[5];
@@ -492,6 +540,12 @@ static void espnow_recv_cb(const esp_now_recv_info_t *info, const uint8_t *data,
case alox_EspNowMessage_accel_deadzone_tag:
handle_slave_accel_deadzone(info->src_addr, &msg.payload.accel_deadzone);
break;
+ case alox_EspNowMessage_find_me_tag:
+ if (!s_slave_joined || !mac_equal(info->src_addr, s_master_mac)) {
+ break;
+ }
+ handle_slave_find_me(info->src_addr, &msg.payload.find_me);
+ break;
case alox_EspNowMessage_ota_start_tag:
case alox_EspNowMessage_ota_payload_tag:
case alox_EspNowMessage_ota_end_tag:
diff --git a/main/esp_now_comm.h b/main/esp_now_comm.h
index 9b68a94..64a06ba 100644
--- a/main/esp_now_comm.h
+++ b/main/esp_now_comm.h
@@ -15,6 +15,10 @@ esp_err_t esp_now_comm_send_accel_deadzone(const uint8_t mac[CLIENT_MAC_LEN],
esp_err_t esp_now_comm_send_unicast_test(const uint8_t mac[CLIENT_MAC_LEN],
uint32_t seq);
+/** Master: trigger find-me LED sequence on one slave. */
+esp_err_t esp_now_comm_send_find_me(const uint8_t mac[CLIENT_MAC_LEN],
+ uint32_t client_id);
+
/** Master → slave OTA (unicast). */
esp_err_t esp_now_comm_send_ota_start(const uint8_t mac[CLIENT_MAC_LEN],
uint32_t total_size);
diff --git a/main/led_ring.c b/main/led_ring.c
index 70a065a..e0641b6 100644
--- a/main/led_ring.c
+++ b/main/led_ring.c
@@ -20,6 +20,9 @@ static led_strip_handle_t led_ring;
#define LED_RING_PIN 7
#define LED_RING_BLINK_ON_MS 350
#define LED_RING_BLINK_OFF_MS 150
+#define LED_RING_FIND_ME_ON_MS 300
+#define LED_RING_FIND_ME_OFF_MS 150
+#define LED_RING_FIND_ME_BLINKS_PER_COLOR 3
static QueueHandle_t led_queue;
@@ -67,6 +70,21 @@ static void ring_fill_color(uint8_t r, uint8_t g, uint8_t b) {
}
}
+static void ring_blink_scaled(uint8_t r, uint8_t g, uint8_t b, uint8_t intensity,
+ uint8_t count, uint16_t on_ms, uint16_t off_ms) {
+ led_ring_scale_rgb(&r, &g, &b, intensity);
+ for (uint8_t n = 0; n < count; n++) {
+ ring_fill_color(r, g, b);
+ led_strip_refresh(led_ring);
+ vTaskDelay(pdMS_TO_TICKS(on_ms));
+ led_strip_clear(led_ring);
+ led_strip_refresh(led_ring);
+ if (n + 1 < count) {
+ vTaskDelay(pdMS_TO_TICKS(off_ms));
+ }
+ }
+}
+
void vTaskLedRing(void *pvParameters) {
led_strip_config_t ring_config = {
.strip_gpio_num = LED_RING_PIN,
@@ -109,15 +127,19 @@ void vTaskLedRing(void *pvParameters) {
} else if (cmd.mode == LED_CMD_BLINK) {
uint16_t on_ms = cmd.blink_ms > 0 ? cmd.blink_ms : LED_RING_BLINK_ON_MS;
uint8_t count = cmd.blink_count > 0 ? cmd.blink_count : 1;
-
- for (uint8_t n = 0; n < count; n++) {
- ring_fill_color(r, g, b);
- led_strip_refresh(led_ring);
- vTaskDelay(pdMS_TO_TICKS(on_ms));
- led_strip_clear(led_ring);
- led_strip_refresh(led_ring);
- if (n + 1 < count) {
- vTaskDelay(pdMS_TO_TICKS(LED_RING_BLINK_OFF_MS));
+ ring_blink_scaled(cmd.r, cmd.g, cmd.b, cmd.intensity, count, on_ms,
+ LED_RING_BLINK_OFF_MS);
+ continue;
+ } else if (cmd.mode == LED_CMD_FIND_ME) {
+ static const struct {
+ uint8_t r, g, b;
+ } colors[] = {{255, 0, 0}, {0, 255, 0}, {0, 0, 255}};
+ for (size_t c = 0; c < sizeof(colors) / sizeof(colors[0]); c++) {
+ ring_blink_scaled(colors[c].r, colors[c].g, colors[c].b,
+ LED_RING_FULL_INTENSITY, LED_RING_FIND_ME_BLINKS_PER_COLOR,
+ LED_RING_FIND_ME_ON_MS, LED_RING_FIND_ME_OFF_MS);
+ if (c + 1 < sizeof(colors) / sizeof(colors[0])) {
+ vTaskDelay(pdMS_TO_TICKS(LED_RING_FIND_ME_OFF_MS));
}
}
continue;
@@ -195,3 +217,8 @@ void led_ring_blink_once(uint8_t r, uint8_t g, uint8_t b) {
void led_ring_ota_success(void) { led_ring_blink_once(0, 255, 0); }
void led_ring_ota_failed(void) { led_ring_blink_once(255, 0, 0); }
+
+void led_ring_find_me(void) {
+ led_command_t cmd = {.mode = LED_CMD_FIND_ME};
+ led_ring_send_command(&cmd);
+}
diff --git a/main/led_ring.h b/main/led_ring.h
index c5dc1ca..d982881 100644
--- a/main/led_ring.h
+++ b/main/led_ring.h
@@ -5,13 +5,16 @@
/** Default RGB scale (~5 % of full brightness). */
#define LED_RING_DEFAULT_INTENSITY 13
+/** Full brightness for find-me and similar alerts. */
+#define LED_RING_FULL_INTENSITY 255
typedef enum {
LED_CMD_CLEAR,
LED_CMD_SET_DIGIT,
LED_CMD_SET_COLOR,
LED_CMD_PROGRESS,
- LED_CMD_BLINK
+ LED_CMD_BLINK,
+ LED_CMD_FIND_ME
} led_mode_t;
typedef struct {
@@ -39,4 +42,7 @@ void led_ring_blink_once(uint8_t r, uint8_t g, uint8_t b);
void led_ring_ota_success(void);
void led_ring_ota_failed(void);
+/** Red / green / blue: 3 blinks each at full intensity. */
+void led_ring_find_me(void);
+
#endif
diff --git a/main/powerpod.c b/main/powerpod.c
index adc42d0..8c33868 100644
--- a/main/powerpod.c
+++ b/main/powerpod.c
@@ -2,6 +2,7 @@
#include "cmd_handler.h"
#include "cmd_accel_deadzone.h"
#include "cmd_espnow_unicast_test.h"
+#include "cmd_espnow_find_me.h"
#include "cmd_client_info.h"
#include "cmd_version.h"
#include "cmd_ota.h"
@@ -169,6 +170,7 @@ void app_main(void) {
cmd_client_info_register();
cmd_accel_deadzone_register();
cmd_espnow_unicast_test_register();
+ cmd_espnow_find_me_register();
cmd_led_ring_register();
cmd_ota_register();
cmd_ota_slave_progress_register();
diff --git a/main/proto/esp_now_messages.pb.c b/main/proto/esp_now_messages.pb.c
index 3af93e2..cdaab45 100644
--- a/main/proto/esp_now_messages.pb.c
+++ b/main/proto/esp_now_messages.pb.c
@@ -9,6 +9,9 @@
PB_BIND(alox_EspNowUnicastTest, alox_EspNowUnicastTest, AUTO)
+PB_BIND(alox_EspNowFindMe, alox_EspNowFindMe, AUTO)
+
+
PB_BIND(alox_EspNowDiscover, alox_EspNowDiscover, AUTO)
diff --git a/main/proto/esp_now_messages.pb.h b/main/proto/esp_now_messages.pb.h
index 8d54848..5fcbe4c 100644
--- a/main/proto/esp_now_messages.pb.h
+++ b/main/proto/esp_now_messages.pb.h
@@ -1,8 +1,8 @@
/* Automatically generated nanopb header */
/* Generated by nanopb-1.0.0-dev */
-#ifndef PB_ALOX_MAIN_PROTO_ESP_NOW_MESSAGES_PB_H_INCLUDED
-#define PB_ALOX_MAIN_PROTO_ESP_NOW_MESSAGES_PB_H_INCLUDED
+#ifndef PB_ALOX_ESP_NOW_MESSAGES_PB_H_INCLUDED
+#define PB_ALOX_ESP_NOW_MESSAGES_PB_H_INCLUDED
#include