Merge remote-tracking branch 'origin/main'

# Conflicts: # messages.go
Added Services
2024-12-08 08:51:38 -08:00 · 2024-12-08 08:50:20 -08:00
1 changed files with 4 additions and 3 deletions
--- a/messages.go
+++ b/messages.go
@ -967,9 +967,10 @@ type StatusMessage struct {
 }

 type BleManufacturerData struct {
-	CompanyId   uint16 `json:"company_id,omitempty"`
-	CompanyName string `json:"company_name,omitempty"`
-	Data        []byte `json:"data,omitempty"`
+	CompanyId uint16   `json:"company_id,omitempty"`
+	Name      string   `json:"name,omitempty"`
+	Services  []string `json:"services,omitempty"`
+	Data      []byte   `json:"data,omitempty"`
 }

 type BleAdvertisementPayload struct {
Author	SHA1	Message	Date
henry	b52c585528	Merge remote-tracking branch 'origin/main' # Conflicts: # messages.go	2024-12-08 08:51:38 -08:00
henry	7810772cb5	Added Services	2024-12-08 08:50:20 -08:00