Merge remote-tracking branch 'origin/main'

# Conflicts:
#	messages.go

messages.go

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