add support for arduino/fwuploader-plugin-helper#10

Author: umbynos

Diff for: cli/certificates/flash.go

@@ -153,7 +153,7 @@ func flashCertificatesWithPlugin(uploader *plugin.FwUploader, certificateURLs, c
 		return nil, err
 	}
 
-	_, err = uploader.FlashCertificates(commonFlags.Address, commonFlags.Fqbn, certsBundle, stdout, stderr)
+	_, err = uploader.FlashCertificates(commonFlags.Address, commonFlags.Fqbn, globals.LogLevel, globals.Verbose, certsBundle, stdout, stderr)
 	return &flasher.FlashResult{
 		Flasher: &flasher.ExecOutput{
 			Stdout: stdoutBuffer.String(),

Diff for: cli/firmware/flash.go

@@ -171,7 +171,7 @@ func updateFirmwareWithPlugin(uploader *plugin.FwUploader, fwPath *paths.Path) (
 		stdout = os.Stdout
 		stderr = os.Stderr
 	}
-	res, err := uploader.FlashFirmware(commonFlags.Address, commonFlags.Fqbn, fwPath, stdout, stderr)
+	res, err := uploader.FlashFirmware(commonFlags.Address, commonFlags.Fqbn, globals.LogLevel, globals.Verbose, fwPath, stdout, stderr)
 	if err != nil {
 		return nil, fmt.Errorf("couldn't update firmware: %s", err)
 	}

Diff for: cli/firmware/getversion.go

@@ -89,7 +89,7 @@ func getVersionWithPlugin(uploader *plugin.FwUploader) *flasher.FlashResult {
 		stdout = os.Stdout
 		stderr = os.Stderr
 	}
-	res, err := uploader.GetFirmwareVersion(commonFlags.Address, commonFlags.Fqbn, stdout, stderr)
+	res, err := uploader.GetFirmwareVersion(commonFlags.Address, commonFlags.Fqbn, globals.LogLevel, globals.Verbose, stdout, stderr)
 	if err != nil {
 		feedback.Fatal(fmt.Sprintf("Couldn't get firmware version: %s", err), feedback.ErrGeneric)
 	}

Diff for: plugin/plugin.go

@@ -84,14 +84,20 @@ func (uploader *FwUploader) QueryAPIVersion() (int, error) {
 }
 
 // GetFirmwareVersion runs the plugin to obtain the version of the installed firmware
-func (uploader *FwUploader) GetFirmwareVersion(portAddress, fqbn string, stdout, stderr io.Writer) (*GetFirmwareVersionResult, error) {
+func (uploader *FwUploader) GetFirmwareVersion(portAddress, fqbn, LogLevel string, verbose bool, stdout, stderr io.Writer) (*GetFirmwareVersionResult, error) {
 	args := []string{"firmware", "get-version"}
 	if portAddress != "" {
 		args = append(args, "-p", portAddress)
 	}
 	if fqbn != "" {
 		args = append(args, "-b", fqbn)
 	}
+	if verbose {
+		args = append(args, "-v")
+	}
+	if LogLevel != "" {
+		args = append(args, "--log-level", LogLevel)
+	}
 	execStdout, execStderr, execErr := uploader.exec(stdout, stderr, args...)
 
 	res := &GetFirmwareVersionResult{
@@ -129,14 +135,20 @@ type GetFirmwareVersionResult struct {
 }
 
 // FlashFirmware runs the plugin to flash the selected firmware
-func (uploader *FwUploader) FlashFirmware(portAddress, fqbn string, firmwarePath *paths.Path, stdout, stderr io.Writer) (*FlashFirmwareResult, error) {
+func (uploader *FwUploader) FlashFirmware(portAddress, fqbn, LogLevel string, verbose bool, firmwarePath *paths.Path, stdout, stderr io.Writer) (*FlashFirmwareResult, error) {
 	args := []string{"firmware", "flash", firmwarePath.String()}
 	if portAddress != "" {
 		args = append(args, "-p", portAddress)
 	}
 	if fqbn != "" {
 		args = append(args, "-b", fqbn)
 	}
+	if verbose {
+		args = append(args, "-v")
+	}
+	if LogLevel != "" {
+		args = append(args, "--log-level", LogLevel)
+	}
 	execStdout, execStderr, execErr := uploader.exec(stdout, stderr, args...)
 
 	res := &FlashFirmwareResult{
@@ -192,14 +204,20 @@ func (uploader *FwUploader) exec(stdout, stderr io.Writer, args ...string) (*byt
 }
 
 // FlashCertificates writes the given certificates bundle in PEM format.
-func (uploader *FwUploader) FlashCertificates(portAddress, fqbn string, certsPath *paths.Path, stdout, stderr io.Writer) (*FlashCertificatesResult, error) {
+func (uploader *FwUploader) FlashCertificates(portAddress, fqbn, LogLevel string, verbose bool, certsPath *paths.Path, stdout, stderr io.Writer) (*FlashCertificatesResult, error) {
 	args := []string{"cert", "flash", certsPath.String()}
 	if portAddress != "" {
 		args = append(args, "-p", portAddress)
 	}
 	if fqbn != "" {
 		args = append(args, "-b", fqbn)
 	}
+	if verbose {
+		args = append(args, "-v")
+	}
+	if LogLevel != "" {
+		args = append(args, "--log-level", LogLevel)
+	}
 	execStdout, execStderr, execErr := uploader.exec(stdout, stderr, args...)
 
 	res := &FlashCertificatesResult{