You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2023/07/13 14:48:41 UTC
[mynewt-newtmgr] branch master updated: use the timeout from the command line This patch changes the hardcoded 3 seconds timeout to the timeout which is actually specified at the command line, or the default 10 seconds if nothing is specified. The 3 seconds was not enough to write a flash image, when the erase time needs longer, as it is the case with Zephyr, when the incrementally erase option is not enabled.
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newtmgr.git
The following commit(s) were added to refs/heads/master by this push:
new 5f1f36e use the timeout from the command line This patch changes the hardcoded 3 seconds timeout to the timeout which is actually specified at the command line, or the default 10 seconds if nothing is specified. The 3 seconds was not enough to write a flash image, when the erase time needs longer, as it is the case with Zephyr, when the incrementally erase option is not enabled.
5f1f36e is described below
commit 5f1f36eb2243b76156685e99f70c3003621399d8
Author: Frank Buss <fb...@frank-buss.de>
AuthorDate: Mon Mar 27 16:08:36 2023 +0200
use the timeout from the command line
This patch changes the hardcoded 3 seconds timeout to the timeout
which is actually specified at the command line, or the default
10 seconds if nothing is specified. The 3 seconds was not enough
to write a flash image, when the erase time needs longer, as it
is the case with Zephyr, when the incrementally erase option is
not enabled.
---
nmxact/xact/image.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nmxact/xact/image.go b/nmxact/xact/image.go
index b3b332c..f2acfe3 100644
--- a/nmxact/xact/image.go
+++ b/nmxact/xact/image.go
@@ -495,7 +495,7 @@ func (c *ImageUpgradeCmd) runUpload(s sesn.Sesn) (*ImageUploadResult, error) {
for {
var opt = sesn.TxOptions{
- Timeout: 3 * time.Second,
+ Timeout: c.CmdBase.txOptions.Timeout,
Tries: 1,
}
cmd := NewImageUploadCmd()