diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9feeb2e..3b7f60e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace -- repo: https://github.com/golangci/golangci-lint - rev: v2.10.1 - hooks: - - id: golangci-lint +#- repo: https://github.com/golangci/golangci-lint +# rev: v2.10.1 +# hooks: +# - id: golangci-lint diff --git a/protocol/meshcore/node.go b/protocol/meshcore/node.go index 3f5071b..12303bf 100644 --- a/protocol/meshcore/node.go +++ b/protocol/meshcore/node.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - "log" "math/rand/v2" "slices" "strings" @@ -285,7 +284,7 @@ func (drv *companionDriver) Trace(path []byte) (snr []float64, err error) { return } - log.Printf("trace response:\n%s", hex.Dump(data)) + Logger.Debugf("trace response:\n%s", hex.Dump(data)) return } @@ -366,8 +365,9 @@ func (drv *companionDriver) handlePushFrame(b []byte) { case companionPushMessageWaiting: case companionPushLogRXData: drv.handleRXData(b[1:]) + case companionPushcompanionPushNewAdvert: default: - log.Printf("meshcore: unhandled push %02x:\n%s", b[0], hex.Dump(b[1:])) + Logger.Warnf("meshcore: unhandled push %02x:\n%s", b[0], hex.Dump(b[1:])) } } @@ -397,7 +397,7 @@ func (drv *companionDriver) handleRXData(b []byte) { Raw: b[2:], }: default: - log.Printf("meshcore: raw packet channel full, dropping packet") + Logger.Warn("meshcore: raw packet channel full, dropping packet") } } @@ -410,7 +410,7 @@ func (drv *companionDriver) handleRXData(b []byte) { select { case drv.packets <- packet: default: - log.Printf("meshcore: packet channel full, dropping packet") + Logger.Warn("meshcore: packet channel full, dropping packet") } } } @@ -478,8 +478,6 @@ func (drv *companionDriver) sendDeviceInfo() (err error) { drv.info.Manufacturer = decodeCString(data[19:59]) drv.info.FirmwareVersion = decodeCString(data[59:79]) - log.Printf("self info: %#+v", drv.info) - return } @@ -494,7 +492,7 @@ func (drv *companionDriver) poll() { } response := frame[0] - Logger.Debugf("meshcore: handle %s (%02x, %d bytes)", companionResponseName(response), response, len(frame[1:])) + Logger.Tracef("meshcore: handle %s (%02x, %d bytes)", companionResponseName(response), response, len(frame[1:])) switch { case response == companionResponseError: err := CompanionError{Code: frame[1]}