From 4f6ee2ffde2f53a1a945f5038ba8dab4a883c6c1 Mon Sep 17 00:00:00 2001 From: Daniel Pupius Date: Fri, 2 May 2025 13:50:28 -0700 Subject: [PATCH] go fmt --- decoder/decoder.go | 2 +- decoder/formatter.go | 30 +++++++++++++++--------------- mqtt/client_test.go | 2 +- mqtt/packet.go | 2 +- mqtt/subscriber.go | 14 +++++++------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/decoder/decoder.go b/decoder/decoder.go index a40b1f2..2d6e377 100644 --- a/decoder/decoder.go +++ b/decoder/decoder.go @@ -328,4 +328,4 @@ func IsASCII(data []byte) bool { } } return true -} \ No newline at end of file +} diff --git a/decoder/formatter.go b/decoder/formatter.go index 9bdb276..1feb0ea 100644 --- a/decoder/formatter.go +++ b/decoder/formatter.go @@ -23,7 +23,7 @@ func FormatTopicAndPacket(topic *meshtreampb.TopicInfo, data *meshtreampb.Data) // Packet information sb.WriteString("\n===== Packet Info =====\n") - + // Check if we have a decode error if data.DecodeError != "" { sb.WriteString(fmt.Sprintf("ERROR: %s\n", data.DecodeError)) @@ -39,49 +39,49 @@ func FormatTopicAndPacket(topic *meshtreampb.TopicInfo, data *meshtreampb.Data) sb.WriteString(fmt.Sprintf("Port: %s\n", data.PortNum.String())) sb.WriteString(fmt.Sprintf("Hop Limit: %d\n", data.HopLimit)) sb.WriteString(fmt.Sprintf("Request ID: %d\n", data.RequestId)) - + // Payload type-specific information sb.WriteString("\n===== Payload Info =====\n") - + switch data.Payload.(type) { case *meshtreampb.Data_TextMessage: sb.WriteString(fmt.Sprintf("Type: Text Message\nContent: %s\n", data.GetTextMessage())) - + case *meshtreampb.Data_Position: pos := data.GetPosition() lat := float64(pos.GetLatitudeI()) / 10000000.0 lon := float64(pos.GetLongitudeI()) / 10000000.0 - sb.WriteString(fmt.Sprintf("Type: Position\nLatitude: %.6f\nLongitude: %.6f\nAltitude: %d\n", + sb.WriteString(fmt.Sprintf("Type: Position\nLatitude: %.6f\nLongitude: %.6f\nAltitude: %d\n", lat, lon, pos.GetAltitude())) - + case *meshtreampb.Data_Telemetry: telemetry := data.GetTelemetry() sb.WriteString("Type: Telemetry\n") if telemetry.GetEnvironmentMetrics() != nil { env := telemetry.GetEnvironmentMetrics() - sb.WriteString(fmt.Sprintf("Environment: Temp %.1f°C, Rel Humidity %.1f%%\n", + sb.WriteString(fmt.Sprintf("Environment: Temp %.1f°C, Rel Humidity %.1f%%\n", env.GetTemperature(), env.GetRelativeHumidity())) } if telemetry.GetDeviceMetrics() != nil { dev := telemetry.GetDeviceMetrics() - sb.WriteString(fmt.Sprintf("Device: Battery %d%%, Voltage %.1fV\n", + sb.WriteString(fmt.Sprintf("Device: Battery %d%%, Voltage %.1fV\n", dev.GetBatteryLevel(), dev.GetVoltage())) } - + case *meshtreampb.Data_NodeInfo: user := data.GetNodeInfo() - sb.WriteString(fmt.Sprintf("Type: User Info\nID: %s\nLongName: %s\nShortName: %s\n", + sb.WriteString(fmt.Sprintf("Type: User Info\nID: %s\nLongName: %s\nShortName: %s\n", user.GetId(), user.GetLongName(), user.GetShortName())) - + case *meshtreampb.Data_MapReport: sb.WriteString(fmt.Sprintf("Type: Map Report\n")) - + case *meshtreampb.Data_BinaryData: sb.WriteString(fmt.Sprintf("Type: Binary Data\nLength: %d bytes\n", len(data.GetBinaryData()))) - + default: sb.WriteString("Type: Unknown\n") } - + return sb.String() -} \ No newline at end of file +} diff --git a/mqtt/client_test.go b/mqtt/client_test.go index 309f98f..694a1c7 100644 --- a/mqtt/client_test.go +++ b/mqtt/client_test.go @@ -71,4 +71,4 @@ func TestMessagesChannel(t *testing.T) { case <-time.After(100 * time.Millisecond): t.Fatal("Timed out waiting for message from channel") } -} \ No newline at end of file +} diff --git a/mqtt/packet.go b/mqtt/packet.go index 14e6c0b..58d568c 100644 --- a/mqtt/packet.go +++ b/mqtt/packet.go @@ -10,4 +10,4 @@ func NewPacket(data *meshtreampb.Data, topicInfo *meshtreampb.TopicInfo) *meshtr Data: data, Info: topicInfo, } -} \ No newline at end of file +} diff --git a/mqtt/subscriber.go b/mqtt/subscriber.go index 924ff8b..77054df 100644 --- a/mqtt/subscriber.go +++ b/mqtt/subscriber.go @@ -9,13 +9,13 @@ import ( // SubscriberConfig holds configuration for creating a subscriber type SubscriberConfig struct { - Name string // Descriptive name for the subscriber - Broker *Broker // The broker to subscribe to - BufferSize int // Channel buffer size - Processor func(*meshtreampb.Packet) // Function to process each packet - StartHook func() // Optional hook called when starting - CloseHook func() // Optional hook called when closing - Logger logging.Logger // Logger instance to use + Name string // Descriptive name for the subscriber + Broker *Broker // The broker to subscribe to + BufferSize int // Channel buffer size + Processor func(*meshtreampb.Packet) // Function to process each packet + StartHook func() // Optional hook called when starting + CloseHook func() // Optional hook called when closing + Logger logging.Logger // Logger instance to use } // BaseSubscriber implements common subscriber functionality