diff --git a/.github/workflows/check-certificates.yml b/.github/workflows/check-certificates.yml index d4a70364..af52e909 100644 --- a/.github/workflows/check-certificates.yml +++ b/.github/workflows/check-certificates.yml @@ -16,7 +16,7 @@ env: jobs: get-certificates-list: # This workflow would fail in forks that don't have the certificate secrets defined - if: github.repository == 'arduino/FirmwareUploader' + if: github.repository == 'arduino/arduino-fwuploader' runs-on: ubuntu-latest outputs: certificates: ${{ steps.get-files.outputs.certificates }} @@ -38,7 +38,7 @@ jobs: check-certificates: # This workflow would fail in forks that don't have the certificate secrets defined - if: github.repository == 'arduino/FirmwareUploader' + if: github.repository == 'arduino/arduino-fwuploader' runs-on: ubuntu-latest needs: get-certificates-list diff --git a/.github/workflows/check-notarization-certificates.yml b/.github/workflows/check-notarization-certificates.yml index 917d6941..7a33cc30 100644 --- a/.github/workflows/check-notarization-certificates.yml +++ b/.github/workflows/check-notarization-certificates.yml @@ -16,7 +16,7 @@ env: jobs: check-certificates: # This workflow would fail in forks that don't have the certificate secrets defined - if: github.repository == 'arduino/FirmwareUploader' + if: github.repository == 'arduino/arduino-fwuploader' runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/link-validation.yml b/.github/workflows/link-validation.yml index c1556f9a..9662d45a 100644 --- a/.github/workflows/link-validation.yml +++ b/.github/workflows/link-validation.yml @@ -9,7 +9,7 @@ on: jobs: verify-links: # Don't trigger on schedule event when in a fork - if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'arduino/FirmwareUploader') + if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'arduino/arduino-fwuploader') runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bfa73ea7..ded44655 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,12 +88,12 @@ jobs: run: | # GitHub's upload/download-artifact@v2 actions don't preserve file permissions, # so we need to add execution permission back. - chmod +x dist/macos64/FirmwareUploader + chmod +x dist/macos64/arduino-fwuploader TAG=${GITHUB_REF/refs\/tags\//} - tar cjf dist/FirmwareUploader_${TAG}_macOS_64bit.tar.bz2 \ + tar cjf dist/arduino-fwuploader_${TAG}_macOS_64bit.tar.bz2 \ firmwares \ LICENSE.txt \ - -C dist/macos64/ FirmwareUploader + -C dist/macos64/ arduino-fwuploader - name: Upload artifacts uses: actions/upload-artifact@v2 @@ -146,4 +146,4 @@ jobs: bodyFile: "dist/CHANGELOG.md" draft: false prerelease: ${{ steps.prerelease.outputs.IS_PRE }} - artifacts: dist/FirmwareUploader*,dist/package_index.json + artifacts: dist/arduino-fwuploader*,dist/package_index.json diff --git a/.gitignore b/.gitignore index a2785a03..9a611380 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /debug -/FirmwareUploader* +/arduino-fwuploader* /.vscode/ .idea coverage_*.txt diff --git a/README.md b/README.md index 83b3f16b..cda62df5 100644 --- a/README.md +++ b/README.md @@ -6,60 +6,85 @@ Use this tool to update the firmware and/or add SSL certificates for any WINC, N You can download the Firmware/Certificates updater here: -https://github.com/arduino/FirmwareUploader/releases/latest +https://github.com/arduino/arduino-fwuploader/releases/latest ## Usage -Extract the zip file and run (for example, NINA -> WiFi1010) +### Firmware Flashing + +Extract the zip file and, to update a mkr 1010, run: + +``` +./arduino-fwuploader firmware flash -b arduino:samd:mkrwifi1010 -a /dev/ttyACM0 +``` + +You just have to specify the fqbn (`-b` or `--fqbn`) of the board and the serial port (`-a` or `--address`) The firmware +uploader will take care of fetching everything is required to perform the update process. If no module and version are +specified **the latest version of the firmware** will be used. + +If you want to flash a specific version of a firmware you can use the `-m` or `--module` flag + +For example to flash a MKR1000 with 19.6.1 version of the firmware you can run something like: ``` -./FirmwareUploader --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 +./arduino-fwuploader firmware flash -b arduino:samd:mkr1000 -a /dev/ttyACM0 -m WINC1500@19.6.1 ``` -To flash a MKR1000: +There is also a retry mechanism bundled in the tool because the flashing process sometimes can be a bit unreliable. For +example to update a Nano RP2040 Connect with the retry set to 2 you can use: ``` -./FirmwareUploader --flasher firmwares/WINC1500/FirmwareUpdater.mkr1000.ino.bin --firmware firmwares/WINC1500/19.5.4/m2m_aio_3a0.bin --port /dev/ttyACM0 --address arduino.cc:443 --restore_binary /tmp/arduino_build_619137/WiFiSSLClient.ino.bin --programmer {runtime.tools.bossac}/bossac +./arduino-fwuploader firmware flash --fqbn arduino:mbed_nano:nanorp2040connect -a /dev/ttyACM0 --retries 2 ``` -To update a MKRNB1500: +It's possible also to list the available firmwares for every board/module with: ``` -./FirmwareUploader --flasher firmwares/SARA/SerialSARAPassthrough.ino.bin --firmware firmwares/SARA/5.6A2.00-to-5.6A2.01.pkg --port /dev/ttyACM0 --restore_binary firmwares/SARA/SerialSARAPassthrough.ino.bin --programmer {runtime.tools.bossac}/bossac +./arduino-fwuploader firmware list ``` -To update a Nano RP2040 Connect: +but you can also filter the results by specifying the `-b` or `--fqbn` flag + +The tool offers the ability to print output in json, with the `--format json` + +### Certificates + +The tool offers also the ability to flash SSL certificates to a board: ``` -./FirmwareUploader --flasher firmwares/NINA/FirmwareUpdater.nanorp2040connect.ino.elf --firmware firmwares/NINA/1.4.5/NINA_W102-Nano_RP2040_Connect.bin --port /dev/ttyACM0 --address arduino.cc:443 --programmer {runtime.tools.rp2040tools}/rp2040load +/arduino-fwuploader flash -b arduino:samd:nano_33_iot" -a COM10 -u arduino.cc:443 -u google.cc:443 ``` +or you can specify a path to a file with `-f` + ### Command line options -The full list of command line options can be obtained with the `-h` option: `./FirmwareUploader -h` +The full list of command line options can be obtained with the `-h` option: `./arduino-fwuploader -h` ``` -FirmwareUploader (FirmwareUploader). +Arduino Firmware Uploader (arduino-fwuploader). Usage: - FirmwareUploader [flags] + arduino-fwuploader [command] Examples: - ./FirmwareUploader [flags...] + ./arduino-fwuploader [flags...] + +Available Commands: + certificates Commands to operate on certificates. + firmware Commands to operate on firmwares. + help Help about any command + version Shows version number of arduino-fwuploader. Flags: - --address strings address (host:port) to fetch and flash root certificate for, multiple values allowed - --certs string root certificate directory - --firmware string firmware file to flash - --flasher string firmware upload binary (precompiled for the right target) - --get_available_for string Ask for available firmwares matching a given board - -h, --help help for FirmwareUploader - --model string module model (winc, nina or sara) - --port string serial port to use for flashing - --programmer string path of programmer in use (avrdude/bossac) - --read read all firmware and output to stdout - --restore_binary string binary to restore after the firmware upload (precompiled for the right target) - --retries int Number of retries in case of upload failure (default 9) + --format string The output format, can be {text|json}. (default "text") + -h, --help help for arduino-fwuploader + --log-file string Path to the file where logs will be written + --log-format string The output format for the logs, can be {text|json}. + --log-level string Messages with this level and above will be logged. Valid levels are: trace, debug, info, warn, error, fatal, panic (default "info") + -v, --verbose Print the logs on the standard output. + +Use "arduino-fwuploader [command] --help" for more information about a command. ``` ## How to build the tools from source file @@ -72,7 +97,7 @@ task dist:_ Where could be one of: `macOS`,`Windows`,`Linux`. And : `32bit`, `64bit`, `ARM` or `ARM64` -This will create the `FirmwareUploader` executable. +This will create the `arduino-fwuploader` executable. ## Security @@ -96,4 +121,4 @@ details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -[security-policy]: https://github.com/arduino/FirmwareUploader/security/policy +[security-policy]: https://github.com/arduino/arduino-fwuploader/security/policy diff --git a/Taskfile.yml b/Taskfile.yml index 6c4e8328..1135ac7d 100755 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -91,7 +91,7 @@ tasks: - poetry run black . vars: - PROJECT_NAME: "FirmwareUploader" + PROJECT_NAME: "arduino-fwuploader" DIST_DIR: "dist" # build vars COMMIT: @@ -106,9 +106,9 @@ vars: LDFLAGS: > -ldflags ' - -X github.com/arduino/FirmwareUploader/version.versionString={{.VERSION}} - -X github.com/arduino/FirmwareUploader/version.commit={{ .COMMIT }} - -X github.com/arduino/FirmwareUploader/version.date={{.TIMESTAMP}} + -X github.com/arduino/arduino-fwuploader/version.versionString={{.VERSION}} + -X github.com/arduino/arduino-fwuploader/version.commit={{ .COMMIT }} + -X github.com/arduino/arduino-fwuploader/version.date={{.TIMESTAMP}} ' # test vars GOFLAGS: "-timeout 10m -v -coverpkg=./... -covermode=atomic" @@ -117,9 +117,9 @@ vars: TEST_LDFLAGS: > -ldflags ' - -X github.com/arduino/FirmwareUploader/version.versionString={{.TEST_VERSION}} - -X github.com/arduino/FirmwareUploader/version.commit={{.TEST_COMMIT}} - -X github.com/arduino/FirmwareUploader/version.date={{.TIMESTAMP}} + -X github.com/arduino/arduino-fwuploader/version.versionString={{.TEST_VERSION}} + -X github.com/arduino/arduino-fwuploader/version.commit={{.TEST_COMMIT}} + -X github.com/arduino/arduino-fwuploader/version.date={{.TIMESTAMP}} ' # check-lint vars GOLINTBIN: diff --git a/cli/certificates/certificates.go b/cli/certificates/certificates.go index 9d06305d..f02ef05d 100644 --- a/cli/certificates/certificates.go +++ b/cli/certificates/certificates.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/cli/certificates/flash.go b/cli/certificates/flash.go index 60e06e7c..425b2262 100644 --- a/cli/certificates/flash.go +++ b/cli/certificates/flash.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -27,13 +27,13 @@ import ( "strings" "time" - "github.com/arduino/FirmwareUploader/flasher" - "github.com/arduino/FirmwareUploader/indexes" - "github.com/arduino/FirmwareUploader/indexes/download" - programmer "github.com/arduino/FirmwareUploader/programmers" "github.com/arduino/arduino-cli/arduino/serialutils" "github.com/arduino/arduino-cli/cli/errorcodes" "github.com/arduino/arduino-cli/cli/feedback" + "github.com/arduino/arduino-fwuploader/flasher" + "github.com/arduino/arduino-fwuploader/indexes" + "github.com/arduino/arduino-fwuploader/indexes/download" + programmer "github.com/arduino/arduino-fwuploader/programmers" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" "github.com/sirupsen/logrus" diff --git a/cli/cli.go b/cli/cli.go index 3d304dfb..54967888 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -25,13 +25,13 @@ import ( "os" "strings" - "github.com/arduino/FirmwareUploader/cli/certificates" - "github.com/arduino/FirmwareUploader/cli/firmware" - "github.com/arduino/FirmwareUploader/cli/version" + "github.com/arduino/arduino-fwuploader/cli/certificates" + "github.com/arduino/arduino-fwuploader/cli/firmware" + "github.com/arduino/arduino-fwuploader/cli/version" - v "github.com/arduino/FirmwareUploader/version" "github.com/arduino/arduino-cli/cli/errorcodes" "github.com/arduino/arduino-cli/cli/feedback" + v "github.com/arduino/arduino-fwuploader/version" "github.com/mattn/go-colorable" "github.com/rifflock/lfshook" "github.com/sirupsen/logrus" @@ -47,11 +47,11 @@ var ( ) func NewCommand() *cobra.Command { - // FirmwareUploader is the root command + // arduino-fwuploader is the root command rootCmd := &cobra.Command{ - Use: "FirmwareUploader", - Short: "FirmwareUploader.", - Long: "FirmwareUploader (FirmwareUploader).", + Use: "arduino-fwuploader", + Short: "arduino-fwuploader.", + Long: "Arduino Firmware Uploader (arduino-fwuploader).", Example: " " + os.Args[0] + " [flags...]", Args: cobra.NoArgs, PersistentPreRun: preRun, diff --git a/cli/firmware/firmware.go b/cli/firmware/firmware.go index 9bcf87ce..4f13fdf4 100644 --- a/cli/firmware/firmware.go +++ b/cli/firmware/firmware.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/cli/firmware/flash.go b/cli/firmware/flash.go index e8bd04c6..2e7738bf 100644 --- a/cli/firmware/flash.go +++ b/cli/firmware/flash.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -27,14 +27,14 @@ import ( "strings" "time" - "github.com/arduino/FirmwareUploader/flasher" - "github.com/arduino/FirmwareUploader/indexes" - "github.com/arduino/FirmwareUploader/indexes/download" - "github.com/arduino/FirmwareUploader/indexes/firmwareindex" - programmer "github.com/arduino/FirmwareUploader/programmers" "github.com/arduino/arduino-cli/arduino/serialutils" "github.com/arduino/arduino-cli/cli/errorcodes" "github.com/arduino/arduino-cli/cli/feedback" + "github.com/arduino/arduino-fwuploader/flasher" + "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" diff --git a/cli/firmware/list.go b/cli/firmware/list.go index 2399f2a1..1ce9a909 100644 --- a/cli/firmware/list.go +++ b/cli/firmware/list.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -22,9 +22,9 @@ package firmware import ( "os" - "github.com/arduino/FirmwareUploader/indexes" "github.com/arduino/arduino-cli/cli/feedback" "github.com/arduino/arduino-cli/table" + "github.com/arduino/arduino-fwuploader/indexes" "github.com/spf13/cobra" semver "go.bug.st/relaxed-semver" ) diff --git a/cli/globals/globals.go b/cli/globals/globals.go index 6ebc5fba..be13c57e 100644 --- a/cli/globals/globals.go +++ b/cli/globals/globals.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/cli/version/version.go b/cli/version/version.go index bb619601..8f1ae4bc 100644 --- a/cli/version/version.go +++ b/cli/version/version.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -22,8 +22,8 @@ package version import ( "os" - v "github.com/arduino/FirmwareUploader/version" "github.com/arduino/arduino-cli/cli/feedback" + v "github.com/arduino/arduino-fwuploader/version" "github.com/spf13/cobra" ) @@ -31,8 +31,8 @@ import ( func NewCommand() *cobra.Command { return &cobra.Command{ Use: "version", - Short: "Shows version number of FirmwareUploader.", - Long: "Shows the version number of FirmwareUploader which is installed on your system.", + Short: "Shows version number of arduino-fwuploader.", + Long: "Shows the version number of arduino-fwuploader which is installed on your system.", Example: " " + os.Args[0] + " version", Args: cobra.NoArgs, Run: run, diff --git a/flasher/certificate.go b/flasher/certificate.go index f6821ef4..4b7f44c3 100644 --- a/flasher/certificate.go +++ b/flasher/certificate.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/flasher/flasher.go b/flasher/flasher.go index 6e25cfe6..cbb38a4b 100644 --- a/flasher/flasher.go +++ b/flasher/flasher.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/flasher/nina.go b/flasher/nina.go index aa07cd38..316b7282 100644 --- a/flasher/nina.go +++ b/flasher/nina.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/flasher/sara.go b/flasher/sara.go index 12ec9751..b2d0b1b2 100644 --- a/flasher/sara.go +++ b/flasher/sara.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/flasher/winc.go b/flasher/winc.go index a28a70fb..b94432f7 100644 --- a/flasher/winc.go +++ b/flasher/winc.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/generator/generator.py b/generator/generator.py index 41966856..1019c0f5 100644 --- a/generator/generator.py +++ b/generator/generator.py @@ -276,7 +276,7 @@ def generate_boards_json(input_data, arduino_cli_path): ) args = parser.parse_args(sys.argv[1:]) - # raw_boards.json has been generated using --get_available_for FirmwareUploader flag. + # raw_boards.json has been generated using --get_available_for FirmwareUploader (version 0.1.8) flag. # It has been edited a bit to better handle parsing. with open("raw_boards.json", "r") as f: raw_boards = json.load(f) diff --git a/go.mod b/go.mod index 7d86f080..da7889df 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/arduino/FirmwareUploader +module github.com/arduino/arduino-fwuploader go 1.14 diff --git a/gon.config.hcl b/gon.config.hcl index 00054d08..48afe59a 100644 --- a/gon.config.hcl +++ b/gon.config.hcl @@ -1,5 +1,5 @@ -source = ["dist/macos64/FirmwareUploader"] -bundle_id = "cc.arduino.FirmwareUploader" +source = ["dist/macos64/arduino-fwuploader"] +bundle_id = "cc.arduino.arduino-fwuploader" sign { application_identity = "Developer ID Application: ARDUINO SA (7KT7ZWMCJT)" @@ -8,5 +8,5 @@ sign { # Ask Gon for zip output to force notarization process to take place. # The CI will ignore the zip output, using the signed binary only. zip { - output_path = "FirmwareUploader.zip" + output_path = "arduino-fwuploader.zip" } \ No newline at end of file diff --git a/indexes/download/download.go b/indexes/download/download.go index fe3957a1..1d2f7b81 100644 --- a/indexes/download/download.go +++ b/indexes/download/download.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -31,12 +31,12 @@ import ( "path" "strings" - "github.com/arduino/FirmwareUploader/cli/globals" - "github.com/arduino/FirmwareUploader/indexes/firmwareindex" "github.com/arduino/arduino-cli/arduino/cores" "github.com/arduino/arduino-cli/arduino/cores/packageindex" "github.com/arduino/arduino-cli/arduino/security" "github.com/arduino/arduino-cli/arduino/utils" + "github.com/arduino/arduino-fwuploader/cli/globals" + "github.com/arduino/arduino-fwuploader/indexes/firmwareindex" "github.com/arduino/go-paths-helper" rice "github.com/cmaglie/go.rice" "github.com/sirupsen/logrus" diff --git a/indexes/download/download_test.go b/indexes/download/download_test.go index 49da9216..6da6c727 100644 --- a/indexes/download/download_test.go +++ b/indexes/download/download_test.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -23,11 +23,11 @@ import ( "os" "testing" - "github.com/arduino/FirmwareUploader/cli/globals" - "github.com/arduino/FirmwareUploader/indexes/firmwareindex" "github.com/arduino/arduino-cli/arduino/cores" "github.com/arduino/arduino-cli/arduino/cores/packageindex" "github.com/arduino/arduino-cli/arduino/resources" + "github.com/arduino/arduino-fwuploader/cli/globals" + "github.com/arduino/arduino-fwuploader/indexes/firmwareindex" "github.com/arduino/go-paths-helper" "github.com/stretchr/testify/require" semver "go.bug.st/relaxed-semver" diff --git a/indexes/firmwareindex/firmwareindex.go b/indexes/firmwareindex/firmwareindex.go index 0a68fb94..d66106b5 100644 --- a/indexes/firmwareindex/firmwareindex.go +++ b/indexes/firmwareindex/firmwareindex.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/indexes/firmwareindex/firmwareindex_test.go b/indexes/firmwareindex/firmwareindex_test.go index e7326ece..2ed1c5b6 100644 --- a/indexes/firmwareindex/firmwareindex_test.go +++ b/indexes/firmwareindex/firmwareindex_test.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/indexes/indexes.go b/indexes/indexes.go index 689d3014..aad9124f 100644 --- a/indexes/indexes.go +++ b/indexes/indexes.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -22,12 +22,12 @@ package indexes import ( "strings" - "github.com/arduino/FirmwareUploader/cli/globals" - "github.com/arduino/FirmwareUploader/indexes/download" - "github.com/arduino/FirmwareUploader/indexes/firmwareindex" "github.com/arduino/arduino-cli/arduino/cores" "github.com/arduino/arduino-cli/arduino/cores/packageindex" "github.com/arduino/arduino-cli/arduino/resources" + "github.com/arduino/arduino-fwuploader/cli/globals" + "github.com/arduino/arduino-fwuploader/indexes/download" + "github.com/arduino/arduino-fwuploader/indexes/firmwareindex" "github.com/sirupsen/logrus" semver "go.bug.st/relaxed-semver" ) @@ -88,7 +88,7 @@ func GetPackageIndex() (*packageindex.Index, error) { return in, err } -// GetFirmwareIndex downloads and loads the FirmwareUploader module_firmware_index.json +// GetFirmwareIndex downloads and loads the arduino-fwuploader module_firmware_index.json func GetFirmwareIndex() (*firmwareindex.Index, error) { indexPath, err := download.DownloadIndex(globals.ModuleFirmwareIndexGZURL) if err != nil { diff --git a/indexes/indexes_test.go b/indexes/indexes_test.go index b0bb1683..89b0efe5 100644 --- a/indexes/indexes_test.go +++ b/indexes/indexes_test.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/main.go b/main.go index 09173629..baeaa2a9 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ package main import ( "os" - "github.com/arduino/FirmwareUploader/cli" + "github.com/arduino/arduino-fwuploader/cli" ) func main() { diff --git a/mkdocs.yml b/mkdocs.yml index bd536c46..ed6c5dc0 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,11 +1,11 @@ # Project information site_name: Arduino Firmware Uploader site_description: A firmware uploader/updater for Arduino Boards. -site_url: https://arduino.github.io/FirmwareUploader/ +site_url: https://arduino.github.io/arduino-fwuploader/ # Repository -repo_name: arduino/FirmwareUploader -repo_url: https://github.com/arduino/FirmwareUploader +repo_name: arduino/arduino-fwuploader +repo_url: https://github.com/arduino/arduino-fwuploader edit_uri: "" # Copyright @@ -43,7 +43,7 @@ markdown_extensions: - pymdownx.magiclink: repo_url_shorthand: true user: arduino - repo: FirmwareUploader + repo: arduino-fwuploader - pymdownx.mark - pymdownx.smartsymbols - pymdownx.superfences diff --git a/programmers/programmer.go b/programmers/programmer.go index 29970a4b..e47eb961 100644 --- a/programmers/programmer.go +++ b/programmers/programmer.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or diff --git a/pyproject.toml b/pyproject.toml index cd6dfa6e..481d213d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] -name = "FirmwareUploader" +name = "arduino-fwuploader" version = "0.0.0" -description = "FirmwareUploader" +description = "arduino-fwuploader" authors = ["Arduino "] [tool.poetry.dependencies] diff --git a/test/conftest.py b/test/conftest.py index d01d3fdd..28b4cf24 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,4 +1,4 @@ -# FirmwareUploader +# arduino-fwuploader # Copyright (c) 2021 Arduino LLC. All right reserved. # This library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ def run_command(pytestconfig, working_dir) -> typing.Callable[..., invoke.runner http://docs.pyinvoke.org/en/1.4/api/runners.html#invoke.runners.Result """ - fwuploader_path = pathlib.Path(pytestconfig.rootdir).parent / "FirmwareUploader" + fwuploader_path = pathlib.Path(pytestconfig.rootdir).parent / "arduino-fwuploader" def _run( cmd: list, custom_working_dir: typing.Optional[str] = None, custom_env: typing.Optional[dict] = None diff --git a/test/test_main.py b/test/test_main.py index 9ff6da4c..09d65f5c 100644 --- a/test/test_main.py +++ b/test/test_main.py @@ -1,4 +1,4 @@ -# FirmwareUploader +# arduino-fwuploader # Copyright (c) 2021 Arduino LLC. All right reserved. # This library is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ def test_version(run_command): result = run_command(cmd=["version"]) assert result.ok output_list = result.stdout.strip().split(sep=" ") - assert output_list[0] == "FirmwareUploader" + assert output_list[0] == "arduino-fwuploader" assert output_list[1] == "Version:" version = output_list[2] assert semver.VersionInfo.isvalid(version=version) or version == "git-snapshot" or "nightly" in version @@ -37,7 +37,7 @@ def test_version(run_command): result = run_command(cmd=["version", "--format", "json"]) assert result.ok parsed_out = json.loads(result.stdout) - assert parsed_out.get("Application", False) == "FirmwareUploader" + assert parsed_out.get("Application", False) == "arduino-fwuploader" version = parsed_out.get("VersionString", False) assert semver.VersionInfo.isvalid(version=version) or "git-snapshot" in version or "nightly" in version assert parsed_out.get("Commit", False) != "" diff --git a/version/version.go b/version/version.go index e2bcb8cd..d2a2f2e4 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ /* - FirmwareUploader + arduino-fwuploader Copyright (c) 2021 Arduino LLC. All right reserved. This library is free software; you can redistribute it and/or @@ -53,5 +53,5 @@ func init() { if versionString == "" { versionString = defaultVersionString } - VersionInfo = newInfo("FirmwareUploader") + VersionInfo = newInfo("arduino-fwuploader") }