From 3089dd4449b44917b3d0578b0b83b6fa165f273c Mon Sep 17 00:00:00 2001 From: Fede85 Date: Tue, 22 Dec 2015 16:45:12 +0100 Subject: [PATCH] Reversing the order of the flashCerts() and flashFirmware() functions allows to use both commands in the same command line preventing certificates from being deleted when the firmware is flashed --- .../WiFi101-FirmwareUpdater/cli/main/winc1500-uploader.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/cli/main/winc1500-uploader.go b/src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/cli/main/winc1500-uploader.go index db1105a8..a3dee6ea 100644 --- a/src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/cli/main/winc1500-uploader.go +++ b/src/github.com/arduino-libraries/WiFi101-FirmwareUpdater/cli/main/winc1500-uploader.go @@ -91,14 +91,14 @@ func main() { log.Fatalf("Programmer reports %d as maximum payload size (1024 is needed)", payloadSize) } - if rootCertDir != "" || len(addresses) != 0 { - if err := flashCerts(); err != nil { + if firmwareFile != "" { + if err := flashFirmware(); err != nil { log.Fatal(err) } } - if firmwareFile != "" { - if err := flashFirmware(); err != nil { + if rootCertDir != "" || len(addresses) != 0 { + if err := flashCerts(); err != nil { log.Fatal(err) } }