From f87acecb4948d54336036a916232da46d9340149 Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Sun, 9 Feb 2020 21:41:38 +0100 Subject: [PATCH] norx_timeout is in seconds, internal timeout is in ms, so add missing *1000 --- libraries/SondeLib/Display.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/SondeLib/Display.cpp b/libraries/SondeLib/Display.cpp index 44937ae..e864a2d 100644 --- a/libraries/SondeLib/Display.cpp +++ b/libraries/SondeLib/Display.cpp @@ -834,9 +834,9 @@ void Display::initFromFile() { if(strncmp(s,"timer=",6)==0) { // timer values char t1[10],t2[10],t3[10]; sscanf(s+6, "%5[0-9a-zA-Z-] , %5[0-9a-zA-Z-] , %5[0-9a-zA-Z-]", t1, t2, t3); - newlayouts[idx].timeouts[0] = (*t1=='n'||*t1=='N')?sonde.config.norx_timeout:atoi(t1); - newlayouts[idx].timeouts[1] = (*t2=='n'||*t1=='N')?sonde.config.norx_timeout:atoi(t2); - newlayouts[idx].timeouts[2] = (*t3=='n'||*t1=='N')?sonde.config.norx_timeout:atoi(t3); + newlayouts[idx].timeouts[0] = (*t1=='n'||*t1=='N')?sonde.config.norx_timeout*1000:atoi(t1); + newlayouts[idx].timeouts[1] = (*t2=='n'||*t1=='N')?sonde.config.norx_timeout*1000:atoi(t2); + newlayouts[idx].timeouts[2] = (*t3=='n'||*t1=='N')?sonde.config.norx_timeout*1000:atoi(t3); //sscanf(s+6, "%hd,%hd,%hd", newlayouts[idx].timeouts, newlayouts[idx].timeouts+1, newlayouts[idx].timeouts+2); Serial.printf("timer values: %d, %d, %d\n", newlayouts[idx].timeouts[0], newlayouts[idx].timeouts[1], newlayouts[idx].timeouts[2]); } else if(strncmp(s, "key1action=",11)==0) { // key 1 actions