Skip to content

Commit be48f59

Browse files
facchinmfacchinm
committed
Merge remote-tracking branch 'origin/master' into master
2 parents 7d288f4 + 1e0d0ee commit be48f59

File tree

12 files changed

+36
-34
lines changed

12 files changed

+36
-34
lines changed

‎README.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Use this tool to update the firmware and/or add SSL certificates for any WINC, N
66

77
You can download the Firmware/Certificates updater here:
88

9-
https://github.com/bcmi-labs/FirmwareUpdater/releases/latest
9+
https://github.com/arduino/FirmwareUpdater/releases/latest
1010

1111
== Usage ==
1212

@@ -48,7 +48,7 @@ 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-libraries/FirmwareUpdater/cli
51+
go get github.com/arduino/FirmwareUpdater/cli
5252

5353
This will create a bin folder with `cli` executable in it.
5454

‎cli/main.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"os"
99
"strings"
1010

11-
"github.com/arduino-libraries/FirmwareUpdater/modules/nina"
12-
"github.com/arduino-libraries/FirmwareUpdater/modules/sara"
13-
"github.com/arduino-libraries/FirmwareUpdater/modules/winc"
14-
"github.com/arduino-libraries/FirmwareUpdater/utils"
15-
"github.com/arduino-libraries/FirmwareUpdater/utils/context"
11+
"github.com/arduino/FirmwareUpdater/modules/nina"
12+
"github.com/arduino/FirmwareUpdater/modules/sara"
13+
"github.com/arduino/FirmwareUpdater/modules/winc"
14+
"github.com/arduino/FirmwareUpdater/utils"
15+
"github.com/arduino/FirmwareUpdater/utils/context"
1616
)
1717

1818
var ctx context.Context

‎distrib.sh

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
VERSION=`cd src/github.com/arduino-libraries/FirmwareUpdater/cli && git describe --tags`
3+
VERSION=`cd src/github.com/arduino/FirmwareUpdater/cli && 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-libraries/FirmwareUpdater/cli
17-
GOOS=linux GOARCH=386 GO386=387 go build -o distrib/linux32/updater github.com/arduino-libraries/FirmwareUpdater/cli
18-
GOOS=linux GOARCH=arm go build -o distrib/linuxarm/updater github.com/arduino-libraries/FirmwareUpdater/cli
19-
GOOS=linux GOARCH=arm64 go build -o distrib/linuxarm64/updater github.com/arduino-libraries/FirmwareUpdater/cli
20-
GOOS=windows GOARCH=386 GO386=387 go build -o distrib/windows/updater.exe github.com/arduino-libraries/FirmwareUpdater/cli
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
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-libraries/FirmwareUpdater/cli
24+
GOOS=darwin GOARCH=amd64 go build -o distrib/osx/updater github.com/arduino/FirmwareUpdater/cli
2525

26-
cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/linux64
27-
cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/linux32
28-
cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/linuxarm
29-
cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/linuxarm64
30-
cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/windows
31-
cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/osx
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
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-libraries/FirmwareUpdater/extras/package_index.json.template |
62+
cat $GOPATH/src/github.com/arduino/FirmwareUpdater/extras/package_index.json.template |
6363
sed "s/%%VERSION%%/${VERSION}/" |
6464
sed "s/%%FILENAME%%/${FILENAME}/" |
6565
sed "s/%%LINUX64_SHA%%/${LINUX64_SHA}/" |

‎go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
module github.com/arduino-libraries/FirmwareUpdater
1+
module github.com/arduino/FirmwareUpdater
2+
3+
go 1.14
24

35
require (
46
github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d // indirect

‎modules/nina/flasher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ package nina
2222
import (
2323
"crypto/md5"
2424
"encoding/binary"
25-
"github.com/arduino-libraries/FirmwareUpdater/utils"
25+
"github.com/arduino/FirmwareUpdater/utils"
2626
"log"
2727
"time"
2828

‎modules/nina/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import (
2828
"strconv"
2929
"strings"
3030

31-
"github.com/arduino-libraries/FirmwareUpdater/programmers/avrdude"
32-
"github.com/arduino-libraries/FirmwareUpdater/programmers/bossac"
33-
"github.com/arduino-libraries/FirmwareUpdater/utils/context"
31+
"github.com/arduino/FirmwareUpdater/programmers/avrdude"
32+
"github.com/arduino/FirmwareUpdater/programmers/bossac"
33+
"github.com/arduino/FirmwareUpdater/utils/context"
3434
)
3535

3636
var f *Flasher

‎modules/sara/flasher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package sara
2121

2222
import (
23-
"github.com/arduino-libraries/FirmwareUpdater/utils"
23+
"github.com/arduino/FirmwareUpdater/utils"
2424
serial "github.com/facchinm/go-serial"
2525
"log"
2626
"strings"

‎modules/sara/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ package sara
2121

2222
import (
2323
"fmt"
24-
"github.com/arduino-libraries/FirmwareUpdater/programmers/bossac"
25-
"github.com/arduino-libraries/FirmwareUpdater/utils/context"
24+
"github.com/arduino/FirmwareUpdater/programmers/bossac"
25+
"github.com/arduino/FirmwareUpdater/utils/context"
2626
"io/ioutil"
2727
"log"
2828
"strconv"

‎modules/winc/flasher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package winc
2121

2222
import (
2323
"encoding/binary"
24-
"github.com/arduino-libraries/FirmwareUpdater/utils"
24+
"github.com/arduino/FirmwareUpdater/utils"
2525
serial "github.com/facchinm/go-serial"
2626
"log"
2727
"time"

‎modules/winc/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"bytes"
2424
"errors"
2525
"fmt"
26-
"github.com/arduino-libraries/FirmwareUpdater/programmers/bossac"
27-
"github.com/arduino-libraries/FirmwareUpdater/utils/context"
26+
"github.com/arduino/FirmwareUpdater/programmers/bossac"
27+
"github.com/arduino/FirmwareUpdater/utils/context"
2828
"io/ioutil"
2929
"log"
3030
"os"

‎programmers/avrdude/avrdude.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os/exec"
99
"path/filepath"
1010

11-
"github.com/arduino-libraries/FirmwareUpdater/utils/context"
11+
"github.com/arduino/FirmwareUpdater/utils/context"
1212
serial "go.bug.st/serial.v1"
1313
//"go.bug.st/serial.v1/enumerator"
1414
"time"

‎programmers/bossac/bossac.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package bossac
33
import (
44
"bytes"
55
"errors"
6-
"github.com/arduino-libraries/FirmwareUpdater/utils/context"
6+
"github.com/arduino/FirmwareUpdater/utils/context"
77
serial "go.bug.st/serial.v1"
88
"io/ioutil"
99
"log"

0 commit comments

Comments
 (0)