Merge remote-tracking branch 'origin/main'

Cleaning up BLE messages
2024-12-17 20:36:55 -08:00 · 2024-12-17 20:36:50 -08:00
1 changed files with 4 additions and 9 deletions
--- a/messages.go
+++ b/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"`
-	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 {
Author	SHA1	Message	Date
Henry Seurer	88ddf0d9c0	Merge remote-tracking branch 'origin/main'	2024-12-17 20:36:55 -08:00
Henry Seurer	95d3db9196	Cleaning up BLE messages	2024-12-17 20:36:50 -08:00