- fix: No longer smfix .bin files

- fix: Find the printer in the default broadcast address
- fix: disable CGO for linux

Author: macdylan

Makefile

@@ -19,13 +19,13 @@ darwin-amd64: $(SRC)
 	GOOS=darwin GOARCH=amd64 $(CMD) -o $(DIST)$(NAME)-$@ $^
 
 linux-amd64: $(SRC)
-	GOOS=linux GOARCH=amd64 $(CMD) -o $(DIST)$(NAME)-$@ $^
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(CMD) -o $(DIST)$(NAME)-$@ $^
 
 linux-arm7: $(SRC)
-	GOOS=linux GOARCH=arm GOARM=7 $(CMD) -o $(DIST)$(NAME)-$@ $^
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 $(CMD) -o $(DIST)$(NAME)-$@ $^
 
 linux-arm6: $(SRC)
-	GOOS=linux GOARCH=arm GOARM=6 $(CMD) -o $(DIST)$(NAME)-$@ $^
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 $(CMD) -o $(DIST)$(NAME)-$@ $^
 
 win64: $(SRC)
 	GOOS=windows GOARCH=amd64 $(CMD) -o $(DIST)$(NAME)-$@.exe $^

connector.go

@@ -32,13 +32,13 @@ func (p *Payload) ReadableSize() string {
 	return humanReadableSize(p.Size)
 }
 
-func (p *Payload) GetContent(fix bool) (cont []byte, err error) {
+func (p *Payload) GetContent(nofix bool) (cont []byte, err error) {
 	defer runtime.GC()
-	if fix {
+	if nofix || !shouldBeFix(p.Name) {
+		cont, err = io.ReadAll(p.File)
+	} else {
 		cont, err = postProcess(p.File)
 		p.Size = int64(len(cont))
-	} else {
-		cont, err = io.ReadAll(p.File)
 	}
 	return cont, err
 }

connector_http.go

@@ -140,8 +140,8 @@ func (hc *HTTPConnector) Upload(payload *Payload) (err error) {
 			pr, pw := io.Pipe()
 			go func() {
 				defer pw.Close()
-				content, err := payload.GetContent(SmFix)
-				if SmFix {
+				content, err := payload.GetContent(NoFix)
+				if !NoFix {
 					log.SetOutput(os.Stderr)
 					if err != nil {
 						log.Printf("G-Code fix error(ignored): %s", err)

connector_sacp.go

@@ -48,8 +48,8 @@ func (sc *SACPConnector) Disconnect() error {
 }
 
 func (sc *SACPConnector) Upload(payload *Payload) (err error) {
-	content, err := payload.GetContent(SmFix)
-	if SmFix {
+	content, err := payload.GetContent(NoFix)
+	if !NoFix {
 		if err != nil {
 			log.Printf("G-Code fix error(ignored): %s", err)
 		} else {

discover.go

@@ -83,28 +83,22 @@ func Discover(timeout time.Duration) ([]*Printer, error) {
 }
 
 func getBroadcastAddresses() ([]string, error) {
-	ifs, err := net.InterfaceAddrs()
+	ifs, err := net.Interfaces()
 	if err != nil {
 		return nil, err
 	}
 
-	addrs := make([]string, 0)
-	for _, address := range ifs {
-		var ip net.IP
-		switch typedAddress := address.(type) {
-		case *net.TCPAddr:
-			ip = typedAddress.IP.To4()
-		case *net.UDPAddr:
-			ip = typedAddress.IP.To4()
-		case *net.IPNet:
-			ip = typedAddress.IP.To4()
-		default:
+	baddrs := make([]string, 0, len(ifs))
+	for _, iface := range ifs {
+		addrs, err := iface.Addrs()
+		if err != nil {
+			continue
 		}
-
-		if ip != nil && len(ip) == net.IPv4len && ip.IsGlobalUnicast() {
-			ip[3] = 255
-			addrs = append(addrs, ip.String())
+		for _, addr := range addrs {
+			if n, ok := addr.(*net.IPNet); ok && !n.IP.IsLoopback() && n.IP.To4() != nil {
+				baddrs = append(baddrs, n.IP.Mask(n.IP.DefaultMask()).String())
+			}
 		}
 	}
-	return addrs, nil
+	return baddrs, nil
 }

go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/gosuri/uilive v0.0.4
 	github.com/imroc/req/v3 v3.11.0
-	github.com/macdylan/SMFix/fix v0.0.0-20230811055700-930d31056194
+	github.com/macdylan/SMFix/fix v0.0.0-20230904075958-62dd346d9d73
 	github.com/manifoldco/promptui v0.9.0
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -23,6 +23,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/macdylan/SMFix/fix v0.0.0-20230811055700-930d31056194 h1:BEwsonfRa4+0lJDSFAxh59aRtB4h434mJC2rx6V+2Yk=
 github.com/macdylan/SMFix/fix v0.0.0-20230811055700-930d31056194/go.mod h1:dnB1MevhW7tICqBpQ2aHpVClwLdmSBUNmfV7jpRmiWw=
+github.com/macdylan/SMFix/fix v0.0.0-20230904075958-62dd346d9d73 h1:fVzGqq2B1RyucrvZvz9KIfxpfsLVR92VpYARFqyCHaM=
+github.com/macdylan/SMFix/fix v0.0.0-20230904075958-62dd346d9d73/go.mod h1:dnB1MevhW7tICqBpQ2aHpVClwLdmSBUNmfV7jpRmiWw=
 github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
 github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=

main.go

@@ -17,10 +17,16 @@ var (
 	KnownHosts          string
 	DiscoverTimeout     time.Duration
 	OctoPrintListenAddr string
-	SmFix               bool
+	NoFix               bool
 	Debug               bool
 
-	_Payloads []*Payload
+	_Payloads       []*Payload
+	SmFixExtensions = map[string]bool{
+		".gcode": true,
+		".nc":    false,
+		".cnc":   false,
+		".bin":   false,
+	}
 )
 
 func main() {
@@ -44,7 +50,7 @@ func main() {
 	flag.StringVar(&KnownHosts, "knownhosts", defaultKnownHosts, "known hosts")
 	flag.DurationVar(&DiscoverTimeout, "timeout", time.Second*4, "printer discovery timeout")
 	flag.StringVar(&OctoPrintListenAddr, "octoprint", "", "octoprint listen address, e.g. '-octoprint :8844' then you can upload files to printer by http://localhost:8844")
-	flag.BoolVar(&SmFix, "fix", true, "enable SMFix(built-in), -fix=0 to disable.")
+	flag.BoolVar(&NoFix, "nofix", false, "disable SMFix(built-in)")
 	flag.BoolVar(&Debug, "debug", false, "debug mode")
 
 	flag.Usage = flag_usage
@@ -54,7 +60,7 @@ func main() {
 		log.Println("-- Debug mode")
 	}
 
-	if !SmFix {
+	if NoFix {
 		log.Println("smfix disabled")
 	}
 

start-octoprint.bat

@@ -16,8 +16,8 @@ set w64=sm2uploader-win64.exe
 set w32=sm2uploader-win32.exe
 set cmd=
 
-where /q %w64% && set "cmd=%w64%"
 where /q %w32% && set "cmd=%w32%"
+where /q %w64% && set "cmd=%w64%"
 
 if "%cmd%"=="" (
     echo Can not find %w64% or %w32%

utils.go

@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"os"
+	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -33,6 +33,7 @@ func normalizedFilename(filename string) string {
 	return reFilename.ReplaceAllString(filename, "")
 }
 
+/*
 func postProcessFile(file_path string) (out []byte, err error) {
 	var r *os.File
 	if r, err = os.Open(file_path); err != nil {
@@ -41,6 +42,7 @@ func postProcessFile(file_path string) (out []byte, err error) {
 	defer r.Close()
 	return postProcess(r)
 }
+*/
 
 func postProcess(r io.Reader) (out []byte, err error) {
 	header, errfix := fix.ExtractHeader(r)
@@ -59,17 +61,21 @@ func postProcess(r io.Reader) (out []byte, err error) {
 	}
 
 	if errfix == nil {
+		funcs := make([]func([]string) []string, 0, 4)
 		if !noTrim {
-			gcodes = fix.GcodeTrimLines(gcodes)
+			funcs = append(funcs, fix.GcodeTrimLines)
 		}
 		if !noShutoff {
-			gcodes = fix.GcodeFixShutoff(gcodes)
+			funcs = append(funcs, fix.GcodeFixShutoff)
 		}
 		if !noPreheat {
-			gcodes = fix.GcodeFixPreheat(gcodes)
+			funcs = append(funcs, fix.GcodeFixPreheat)
 		}
 		if !noReinforceTower {
-			gcodes = fix.GcodeReinforceTower(gcodes)
+			funcs = append(funcs, fix.GcodeReinforceTower)
+		}
+		for _, fn := range funcs {
+			gcodes = fn(gcodes)
 		}
 	}
 
@@ -81,3 +87,8 @@ func postProcess(r io.Reader) (out []byte, err error) {
 		return out, errfix
 	}
 }
+
+func shouldBeFix(fpath string) bool {
+	ext := strings.ToLower(filepath.Ext(fpath))
+	return SmFixExtensions[ext]
+}