diff --git a/internal/framing/framer.go b/internal/framer/framer.go similarity index 96% rename from internal/framing/framer.go rename to internal/framer/framer.go index 8ca6d28..f5f418f 100644 --- a/internal/framing/framer.go +++ b/internal/framer/framer.go @@ -1,4 +1,4 @@ -package framing +package framer import ( "fmt" diff --git a/internal/framing/separator.go b/internal/framer/separator.go similarity index 97% rename from internal/framing/separator.go rename to internal/framer/separator.go index d3a5ab9..b82d031 100644 --- a/internal/framing/separator.go +++ b/internal/framer/separator.go @@ -1,4 +1,4 @@ -package framing +package framer import ( "bytes" diff --git a/internal/framing/slip.go b/internal/framer/slip.go similarity index 98% rename from internal/framing/slip.go rename to internal/framer/slip.go index d322d6b..a0b067c 100644 --- a/internal/framing/slip.go +++ b/internal/framer/slip.go @@ -1,4 +1,4 @@ -package framing +package framer type SlipFramer struct { buffer []byte diff --git a/internal/module/serial-client.go b/internal/module/serial-client.go index 12d4922..a1cc9e1 100644 --- a/internal/module/serial-client.go +++ b/internal/module/serial-client.go @@ -9,7 +9,7 @@ import ( "time" "github.com/jwetzell/showbridge-go/internal/config" - "github.com/jwetzell/showbridge-go/internal/framing" + "github.com/jwetzell/showbridge-go/internal/framer" "github.com/jwetzell/showbridge-go/internal/route" "go.bug.st/serial" ) @@ -19,7 +19,7 @@ type SerialClient struct { ctx context.Context router route.RouteIO Port string - Framer framing.Framer + Framer framer.Framer Mode *serial.Mode port serial.Port } @@ -53,7 +53,7 @@ func init() { return nil, fmt.Errorf("misc.serial.client framing method must be a string") } - framer, err := framing.GetFramer(framingMethodString) + framer, err := framer.GetFramer(framingMethodString) if err != nil { return nil, err diff --git a/internal/module/tcp-client.go b/internal/module/tcp-client.go index 6c88b21..2f26724 100644 --- a/internal/module/tcp-client.go +++ b/internal/module/tcp-client.go @@ -8,13 +8,13 @@ import ( "time" "github.com/jwetzell/showbridge-go/internal/config" - "github.com/jwetzell/showbridge-go/internal/framing" + "github.com/jwetzell/showbridge-go/internal/framer" "github.com/jwetzell/showbridge-go/internal/route" ) type TCPClient struct { config config.ModuleConfig - framer framing.Framer + framer framer.Framer conn *net.TCPConn ctx context.Context router route.RouteIO @@ -65,7 +65,7 @@ func init() { return nil, fmt.Errorf("net.tcp.client framing method must be a string") } - framer, err := framing.GetFramer(framingMethodString) + framer, err := framer.GetFramer(framingMethodString) if err != nil { return nil, err diff --git a/internal/module/tcp-server.go b/internal/module/tcp-server.go index baa1a68..a752bb3 100644 --- a/internal/module/tcp-server.go +++ b/internal/module/tcp-server.go @@ -12,14 +12,14 @@ import ( "time" "github.com/jwetzell/showbridge-go/internal/config" - "github.com/jwetzell/showbridge-go/internal/framing" + "github.com/jwetzell/showbridge-go/internal/framer" "github.com/jwetzell/showbridge-go/internal/route" ) type TCPServer struct { config config.ModuleConfig Addr *net.TCPAddr - Framer framing.Framer + Framer framer.Framer ctx context.Context router route.RouteIO quit chan interface{} @@ -55,7 +55,7 @@ func init() { return nil, fmt.Errorf("net.tcp.server framing method must be a string") } - framer, err := framing.GetFramer(framingMethodString) + framer, err := framer.GetFramer(framingMethodString) if err != nil { return nil, err