From 96b0972f92cf20515e793758da4c6c8e6507ba49 Mon Sep 17 00:00:00 2001 From: Thomas Bertels Date: Fri, 10 Sep 2021 20:05:21 +0200 Subject: [PATCH 1/4] Enable progress on ArduinoOTA upload --- tools/espota.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/espota.py b/tools/espota.py index 77fcfd75c64..6d91f6d9cbc 100755 --- a/tools/espota.py +++ b/tools/espota.py @@ -41,7 +41,7 @@ FLASH = 0 SPIFFS = 100 AUTH = 200 -PROGRESS = False +PROGRESS = True # update_progress() : Displays or updates a console progress bar ## Accepts a float between 0 and 1. Any int will be converted to a float. ## A value under 0 represents a 'halt'. @@ -305,7 +305,7 @@ def parser(unparsed_args): dest = "progress", help = "Show progress output. Does not work for ArduinoIDE", action = "store_true", - default = False + default = True ) group.add_option("-t", "--timeout", dest = "timeout", From 16a256505ae8d04238b6c892339f81ceba8ee4a2 Mon Sep 17 00:00:00 2001 From: Thomas Bertels Date: Fri, 10 Sep 2021 21:08:09 +0200 Subject: [PATCH 2/4] Revert "Enable progress on ArduinoOTA upload" This reverts commit 96b0972f92cf20515e793758da4c6c8e6507ba49. --- tools/espota.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/espota.py b/tools/espota.py index 6d91f6d9cbc..77fcfd75c64 100755 --- a/tools/espota.py +++ b/tools/espota.py @@ -41,7 +41,7 @@ FLASH = 0 SPIFFS = 100 AUTH = 200 -PROGRESS = True +PROGRESS = False # update_progress() : Displays or updates a console progress bar ## Accepts a float between 0 and 1. Any int will be converted to a float. ## A value under 0 represents a 'halt'. @@ -305,7 +305,7 @@ def parser(unparsed_args): dest = "progress", help = "Show progress output. Does not work for ArduinoIDE", action = "store_true", - default = True + default = False ) group.add_option("-t", "--timeout", dest = "timeout", From 6adaf1152ae0d37f3c50925d0cdcfc9af2c08b73 Mon Sep 17 00:00:00 2001 From: Thomas Bertels Date: Fri, 10 Sep 2021 21:12:18 +0200 Subject: [PATCH 3/4] Enable progress on ArduinoOTA upload --- platform.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.txt b/platform.txt index d76c62127f8..a73b59e2ba8 100644 --- a/platform.txt +++ b/platform.txt @@ -10,7 +10,7 @@ tools.esptool_py.cmd=esptool tools.esptool_py.cmd.linux=esptool.py tools.esptool_py.cmd.windows=esptool.exe -tools.esptool_py.network_cmd=python "{runtime.platform.path}/tools/espota.py" +tools.esptool_py.network_cmd=python "{runtime.platform.path}/tools/espota.py" -r tools.esptool_py.network_cmd.windows="{runtime.platform.path}/tools/espota.exe" tools.gen_esp32part.cmd=python "{runtime.platform.path}/tools/gen_esp32part.py" From 65515cf4df9f2f88e589c4879494b2c432dc2221 Mon Sep 17 00:00:00 2001 From: Thomas Bertels Date: Fri, 10 Sep 2021 21:16:16 +0200 Subject: [PATCH 4/4] Enable progress on ArduinoOTA upload --- platform.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.txt b/platform.txt index a73b59e2ba8..9cc554a531b 100644 --- a/platform.txt +++ b/platform.txt @@ -11,7 +11,7 @@ tools.esptool_py.cmd.linux=esptool.py tools.esptool_py.cmd.windows=esptool.exe tools.esptool_py.network_cmd=python "{runtime.platform.path}/tools/espota.py" -r -tools.esptool_py.network_cmd.windows="{runtime.platform.path}/tools/espota.exe" +tools.esptool_py.network_cmd.windows="{runtime.platform.path}/tools/espota.exe" -r tools.gen_esp32part.cmd=python "{runtime.platform.path}/tools/gen_esp32part.py" tools.gen_esp32part.cmd.windows="{runtime.platform.path}/tools/gen_esp32part.exe"