Merge remote-tracking branch 'origin/main'

messages.go

@@ -973,16 +973,11 @@ type BleManufacturerData struct {
 	Data      []byte   `json:"data,omitempty"`
 }
 
-type BleAdvertisementPayload struct {
-	LocalName        string                `json:"localName,omitempty"`
-	ManufacturerData []BleManufacturerData `json:"companies,omitempty"`
-}
-
 type BleDevice struct {
-	Address       string                  `json:"address,omitempty"`
+	Address          string                `json:"address,omitempty"`
-	RSSI          int16                   `json:"rssi,omitempty"`
+	RSSI             int16                 `json:"rssi,omitempty"`
-	Name          string                  `json:"name,omitempty"`
+	Name             string                `json:"name,omitempty"`
-	Advertisement BleAdvertisementPayload `json:"advertisement,omitempty"`
+	ManufacturerData []BleManufacturerData `json:"companies,omitempty"`
 }
 
 type BleAdvertisementMessage struct {