Merge remote-tracking branch 'origin/main'

# Conflicts:
#	messages.go

messages.go

@@ -967,21 +967,17 @@ type StatusMessage struct {
 }
 
 type BleManufacturerData struct {
-	CompanyId   uint16 `json:"company_id,omitempty"`
-	CompanyName string `json:"company_name,omitempty"`
-	Data        []byte `json:"data,omitempty"`
-}
-
-type BleAdvertisementPayload struct {
-	LocalName        string                `json:"localName,omitempty"`
-	ManufacturerData []BleManufacturerData `json:"companies,omitempty"`
+	CompanyId uint16   `json:"company_id,omitempty"`
+	Name      string   `json:"name,omitempty"`
+	Services  []string `json:"services,omitempty"`
+	Data      []byte   `json:"data,omitempty"`
 }
 
 type BleDevice struct {
-	Address       string                  `json:"address,omitempty"`
-	RSSI          int16                   `json:"rssi,omitempty"`
-	Name          string                  `json:"name,omitempty"`
-	Advertisement BleAdvertisementPayload `json:"advertisement,omitempty"`
+	Address          string                `json:"address,omitempty"`
+	RSSI             int16                 `json:"rssi,omitempty"`
+	Name             string                `json:"name,omitempty"`
+	ManufacturerData []BleManufacturerData `json:"companies,omitempty"`
 }
 
 type BleAdvertisementMessage struct {