cleanup unused functions and structs

Author: alessio-perugini

cli/common/common.go

@@ -18,22 +18,15 @@
 package common
 
 import (
-	"bytes"
 	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
 
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
-	"github.com/arduino/arduino-cli/arduino/serialutils"
 	"github.com/arduino/arduino-fwuploader/cli/feedback"
 	"github.com/arduino/arduino-fwuploader/cli/globals"
 	"github.com/arduino/arduino-fwuploader/indexes"
 	"github.com/arduino/arduino-fwuploader/indexes/download"
 	"github.com/arduino/arduino-fwuploader/indexes/firmwareindex"
-	programmer "github.com/arduino/arduino-fwuploader/programmers"
 	"github.com/arduino/go-paths-helper"
-	"github.com/arduino/go-properties-orderedmap"
 	"github.com/sirupsen/logrus"
 )
 
@@ -128,56 +121,3 @@ func downloadTool(pm *packagemanager.PackageManager, tool string) *paths.Path {
 	logrus.Debugf("upload tool downloaded in %s", toolDir.String())
 	return toolDir
 }
-
-// FlashSketch is the business logic that handles the flashing procedure,
-// it returns using a buffer the stdout and the stderr of the programmer
-func FlashSketch(board *firmwareindex.IndexBoard, sketch string, uploadToolDir *paths.Path, address string) (programmerOut, programmerErr *bytes.Buffer, err error) {
-	bootloaderPort, err := GetNewAddress(board, address)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	uploaderCommand := board.GetUploaderCommand()
-	uploaderCommand = strings.ReplaceAll(uploaderCommand, "{tool_dir}", filepath.FromSlash(uploadToolDir.String()))
-	uploaderCommand = strings.ReplaceAll(uploaderCommand, "{serial.port.file}", bootloaderPort)
-	uploaderCommand = strings.ReplaceAll(uploaderCommand, "{loader.sketch}", sketch) // we leave that name here because it's only a template,
-
-	logrus.Debugf("uploading with command: %s", uploaderCommand)
-	commandLine, err := properties.SplitQuotedString(uploaderCommand, "\"", false)
-	if err != nil {
-		feedback.Fatal(fmt.Sprintf(`Error splitting command line "%s": %s`, uploaderCommand, err), feedback.ErrGeneric)
-	}
-
-	// Flash the actual sketch
-	programmerOut = new(bytes.Buffer)
-	programmerErr = new(bytes.Buffer)
-	if feedback.GetFormat() == feedback.JSON {
-		err = programmer.Flash(commandLine, programmerOut, programmerErr)
-	} else {
-		err = programmer.Flash(commandLine, os.Stdout, os.Stderr)
-	}
-	if err != nil {
-		return nil, nil, fmt.Errorf("error during sketch flashing: %s", err)
-	}
-	return programmerOut, programmerErr, err
-}
-
-// GetNewAddress is a function used to reset a board and put it in bootloader mode
-// it could happen that the board is assigned to a different serial port, after the reset,
-// this fuction handles also this possibility
-func GetNewAddress(board *firmwareindex.IndexBoard, oldAddress string) (string, error) {
-	// Check if board needs a 1200bps touch for upload
-	bootloaderPort := oldAddress
-	if board.UploadTouch {
-		logrus.Info("Putting board into bootloader mode")
-		newUploadPort, err := serialutils.Reset(oldAddress, board.UploadWait, nil, false)
-		if err != nil {
-			return "", fmt.Errorf("error during sketch flashing: missing board address. %s", err)
-		}
-		if newUploadPort != "" {
-			logrus.Infof("Found port to upload: %s", newUploadPort)
-			bootloaderPort = newUploadPort
-		}
-	}
-	return bootloaderPort, nil
-}

flasher/flasher.go

@@ -18,66 +18,6 @@
 
 package flasher
 
-import (
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/arduino/go-paths-helper"
-	"github.com/sirupsen/logrus"
-	"go.bug.st/serial"
-)
-
-type CommandData struct {
-	Command byte
-	Address uint32
-	Value   uint32
-	Payload []byte
-}
-
-func (d CommandData) String() string {
-	return fmt.Sprintf("%+v, %+v, %+v, %+v", d.Command, d.Address, d.Value, d.Payload)
-}
-
-type FlasherError struct {
-	err string
-}
-
-func (e FlasherError) Error() string {
-	return e.err
-}
-
-type Flasher interface {
-	FlashFirmware(firmwareFile *paths.Path, flasherOut io.Writer) error
-	FlashCertificates(certificatePaths *paths.PathList, URLs []string, flasherOut io.Writer) error
-	Close() error
-	SetProgressCallback(func(progress int))
-
-	hello() error
-	write(address uint32, buffer []byte) error
-	flashChunk(offset int, buffer []byte) error
-	getMaximumPayloadSize() (uint16, error)
-	serialFillBuffer(buffer []byte) error
-	sendCommand(data CommandData) error
-}
-
-// OpenSerial opens a new serial connection with the specified portAddress
-func OpenSerial(portAddress string, baudRate int, readTimeout int) (serial.Port, error) {
-
-	port, err := serial.Open(portAddress, &serial.Mode{BaudRate: baudRate})
-	if err != nil {
-		return nil, err
-	}
-	logrus.Infof("Opened port %s at %d", portAddress, baudRate)
-
-	if err := port.SetReadTimeout(time.Duration(readTimeout) * time.Second); err != nil {
-		err = fmt.Errorf("could not set timeout on serial port: %s", err)
-		logrus.Error(err)
-		return nil, err
-	}
-	return port, nil
-}
-
 // FlashResult contains the result of the flashing procedure
 type FlashResult struct {
 	Programmer *ExecOutput `json:"programmer"`