Skip to content

Commit 9e5cd1e

Browse files
cmagliecmaglie
committed
Updated go-serial libs and moved main.go into root dir
1 parent be48f59 commit 9e5cd1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+55
-3608
lines changed

‎README.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@ The full list of command line options can be obtained with the `-h` option: `./u
4848

4949
== How to build the tools from source file ==
5050

51-
go get github.com/arduino/FirmwareUpdater/cli
51+
From the sources root directory run:
5252

53-
This will create a bin folder with `cli` executable in it.
53+
go build -o updater
54+
55+
This will create the `updater` executable.
5456

5557
== License ==
5658

‎distrib.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#!/bin/bash
1+
#!/bin/bash -ex
22

3-
VERSION=`cd src/github.com/arduino/FirmwareUpdater/cli && git describe --tags`
3+
VERSION=`git describe --tags`
44
FILENAME="FirmwareUpdater"
55

66
rm -rf distrib
@@ -13,22 +13,22 @@ mkdir -p distrib/windows
1313

1414
export CGO_ENABLED=0
1515

16-
GOOS=linux GOARCH=amd64 go build -o distrib/linux64/updater github.com/arduino/FirmwareUpdater/cli
17-
GOOS=linux GOARCH=386 GO386=387 go build -o distrib/linux32/updater github.com/arduino/FirmwareUpdater/cli
18-
GOOS=linux GOARCH=arm go build -o distrib/linuxarm/updater github.com/arduino/FirmwareUpdater/cli
19-
GOOS=linux GOARCH=arm64 go build -o distrib/linuxarm64/updater github.com/arduino/FirmwareUpdater/cli
20-
GOOS=windows GOARCH=386 GO386=387 go build -o distrib/windows/updater.exe github.com/arduino/FirmwareUpdater/cli
16+
GOOS=linux GOARCH=amd64 go build -o distrib/linux64/updater
17+
GOOS=linux GOARCH=386 GO386=387 go build -o distrib/linux32/updater
18+
GOOS=linux GOARCH=arm go build -o distrib/linuxarm/updater
19+
GOOS=linux GOARCH=arm64 go build -o distrib/linuxarm64/updater
20+
GOOS=windows GOARCH=386 GO386=387 go build -o distrib/windows/updater.exe
2121

2222
#export CGO_ENABLED=1
2323
# need osxcross in path
24-
GOOS=darwin GOARCH=amd64 go build -o distrib/osx/updater github.com/arduino/FirmwareUpdater/cli
24+
GOOS=darwin GOARCH=amd64 go build -o distrib/osx/updater
2525

26-
cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linux64
27-
cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linux32
28-
cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linuxarm
29-
cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linuxarm64
30-
cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/windows
31-
cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/osx
26+
cp -r firmwares distrib/linux64
27+
cp -r firmwares distrib/linux32
28+
cp -r firmwares distrib/linuxarm
29+
cp -r firmwares distrib/linuxarm64
30+
cp -r firmwares distrib/windows
31+
cp -r firmwares distrib/osx
3232

3333
cd distrib/linux64 && tar cjf ../${FILENAME}-${VERSION}-linux64.tar.bz2 * && cd -
3434
LINUX64_SHA=`sha256sum distrib/${FILENAME}-${VERSION}-linux64.tar.bz2 | cut -f1 -d " "`
@@ -59,7 +59,7 @@ echo "=============================="
5959
echo "BOARD MANAGER SNIPPET"
6060
echo "=============================="
6161

62-
cat $GOPATH/src/github.com/arduino/FirmwareUpdater/extras/package_index.json.template |
62+
cat extras/package_index.json.template |
6363
sed "s/%%VERSION%%/${VERSION}/" |
6464
sed "s/%%FILENAME%%/${FILENAME}/" |
6565
sed "s/%%LINUX64_SHA%%/${LINUX64_SHA}/" |
@@ -76,4 +76,4 @@ sed "s/%%WINDOWS_SHA%%/${WINDOWS_SHA}/" |
7676
sed "s/%%WINDOWS_SIZE%%/${WINDOWS_SIZE}/"
7777

7878
# call the tool with something like
79-
# ./linux64/updater -flasher firmwares/NINA/FirmwareUpdater.mkrwifi1010.ino.bin -firmware firmwares/NINA/1.2.1/NINA_W102.bin -port /dev/ttyACM0 -address arduino.cc:443 -restore_binary /tmp/arduino_build_619137/WiFiSSLClient.ino.bin -programmer {runtime.tools.bossac}/bossac
79+
# ./linux64/updater -flasher firmwares/NINA/FirmwareUpdater.mkrwifi1010.ino.bin -firmware firmwares/NINA/1.2.1/NINA_W102.bin -port /dev/ttyACM0 -address arduino.cc:443 -restore_binary /tmp/arduino_build_619137/WiFiSSLClient.ino.bin -programmer {runtime.tools.bossac}/bossac

‎go.mod

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@ module github.com/arduino/FirmwareUpdater
22

33
go 1.14
44

5-
require (
6-
github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d // indirect
7-
github.com/facchinm/go-serial v0.0.0-20190206110233-459a153afba0
8-
go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45
9-
golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 // indirect
10-
)
5+
require go.bug.st/serial v1.1.1

‎go.sum

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1-
github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d h1:6o8WW5zZ+Ny9sbk69epnAPmBzrBaRnvci+l4+pqleeY=
2-
github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d/go.mod h1:gHrIcH/9UZDn2qgeTUeW5K9eZsVYCH6/60J/FHysWyE=
3-
github.com/facchinm/go-serial v0.0.0-20190206110233-459a153afba0 h1:TmQMjEpI656fxIDUgWVNnAvFJ6eaHx2uCVOlrX07+Yc=
4-
github.com/facchinm/go-serial v0.0.0-20190206110233-459a153afba0/go.mod h1:082o96cvX/yKg1NvcnyT1HriTGUI5jLbCbtAVqbsTyw=
5-
go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45 h1:mACY1anK6HNCZtm/DK2Rf2ZPHggVqeB0+7rY9Gl6wyI=
6-
go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45/go.mod h1:dRSl/CVCTf56CkXgJMDOdSwNfo2g1orOGE/gBGdvjZw=
7-
golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 h1:aBlRBZoCuZNRDClvfkDoklQqdLzBaA3uViASg2z2p24=
8-
golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1+
github.com/creack/goselect v0.1.1 h1:tiSSgKE1eJtxs1h/VgGQWuXUP0YS4CDIFMp6vaI1ls0=
2+
github.com/creack/goselect v0.1.1/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
3+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
4+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
6+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
7+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
8+
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
9+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
10+
go.bug.st/serial v1.1.1 h1:5J1DpaIaSIruBi7jVnKXnhRS+YQ9+2PLJMtIZKoIgnc=
11+
go.bug.st/serial v1.1.1/go.mod h1:VmYBeyJWp5BnJ0tw2NUJHZdJTGl2ecBGABHlzRK1knY=
12+
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
13+
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
14+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
15+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
16+
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
17+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎cli/main.go renamed to ‎main.go

File renamed without changes.

‎modules/nina/flasher.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ package nina
2222
import (
2323
"crypto/md5"
2424
"encoding/binary"
25-
"github.com/arduino/FirmwareUpdater/utils"
2625
"log"
2726
"time"
2827

29-
serial "github.com/facchinm/go-serial"
28+
"github.com/arduino/FirmwareUpdater/utils"
29+
"go.bug.st/serial"
3030
)
3131

3232
type FlasherError struct {

‎modules/sara/flasher.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
package sara
2121

2222
import (
23-
"github.com/arduino/FirmwareUpdater/utils"
24-
serial "github.com/facchinm/go-serial"
2523
"log"
2624
"strings"
2725
"time"
28-
//"strconv"
26+
27+
"github.com/arduino/FirmwareUpdater/utils"
28+
"go.bug.st/serial"
2929
)
3030

3131
type FlasherError struct {

‎modules/winc/flasher.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ package winc
2121

2222
import (
2323
"encoding/binary"
24-
"github.com/arduino/FirmwareUpdater/utils"
25-
serial "github.com/facchinm/go-serial"
2624
"log"
2725
"time"
26+
27+
"github.com/arduino/FirmwareUpdater/utils"
28+
"go.bug.st/serial"
2829
)
2930

3031
type FlasherError struct {

‎programmers/avrdude/avrdude.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ import (
77
"log"
88
"os/exec"
99
"path/filepath"
10+
"time"
1011

1112
"github.com/arduino/FirmwareUpdater/utils/context"
12-
serial "go.bug.st/serial.v1"
13-
//"go.bug.st/serial.v1/enumerator"
14-
"time"
13+
"go.bug.st/serial"
1514
)
1615

1716
type Avrdude struct {

‎programmers/bossac/bossac.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package bossac
33
import (
44
"bytes"
55
"errors"
6-
"github.com/arduino/FirmwareUpdater/utils/context"
7-
serial "go.bug.st/serial.v1"
86
"io/ioutil"
97
"log"
108
"os/exec"
119
"path/filepath"
12-
//"go.bug.st/serial.v1/enumerator"
1310
"time"
11+
12+
"github.com/arduino/FirmwareUpdater/utils/context"
13+
"go.bug.st/serial"
1414
)
1515

1616
type Bossac struct {

‎utils/flasher.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package utils
22

33
import (
4-
"github.com/facchinm/go-serial"
54
"log"
5+
6+
"go.bug.st/serial"
67
)
78

89
// http://www.ni.com/product-documentation/54548/en/
@@ -20,8 +21,8 @@ func OpenSerial(portName string) (serial.Port, error) {
2021
for _, baudRate := range baudRates {
2122
mode := &serial.Mode{
2223
BaudRate: baudRate,
23-
Vtimeout: 255,
24-
Vmin: 0,
24+
// Vtimeout: 255,
25+
// Vmin: 0,
2526
}
2627
port, err := serial.Open(portName, mode)
2728
if err == nil {

‎vendor/github.com/facchinm/go-serial/.travis.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎vendor/github.com/facchinm/go-serial/LICENSE

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎vendor/github.com/facchinm/go-serial/README.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)