From 9b5a86ceb22af5cbb48fc1d6ab4395df21aaca8b Mon Sep 17 00:00:00 2001 From: Willi <36384850+OK1FWG@users.noreply.github.com> Date: Thu, 2 Sep 2021 23:16:57 +0200 Subject: [PATCH 1/4] Update TaskRouter.cpp --- src/TaskRouter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskRouter.cpp b/src/TaskRouter.cpp index ec8f485..1b166d4 100644 --- a/src/TaskRouter.cpp +++ b/src/TaskRouter.cpp @@ -94,7 +94,7 @@ bool RouterTask::loop(System &system) { } uint32_t diff = _beacon_timer.getTriggerTimeInSec(); - _stateInfo = "beacon " + String(uint32_t(diff / 60)) + ":" + String(uint32_t(diff % 60)); + _stateInfo = "beacon " + String(uint32_t(diff / 600)) + String(uint32_t(diff / 60) % 10) + ":" + String(uint32_t(diff / 10) % 6) + String(uint32_t(diff % 10)); return true; } From a5e391d416ad9b1f89efa454fecf69b72c52b430 Mon Sep 17 00:00:00 2001 From: Willi <36384850+OK1FWG@users.noreply.github.com> Date: Tue, 7 Sep 2021 10:01:46 +0200 Subject: [PATCH 2/4] Update TaskRouter.cpp --- src/TaskRouter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskRouter.cpp b/src/TaskRouter.cpp index 1b166d4..c85fa05 100644 --- a/src/TaskRouter.cpp +++ b/src/TaskRouter.cpp @@ -94,7 +94,7 @@ bool RouterTask::loop(System &system) { } uint32_t diff = _beacon_timer.getTriggerTimeInSec(); - _stateInfo = "beacon " + String(uint32_t(diff / 600)) + String(uint32_t(diff / 60) % 10) + ":" + String(uint32_t(diff / 10) % 6) + String(uint32_t(diff % 10)); + _stateInfo = "beacon " + String(uint32_t(diff/600)) + String(uint32_t(diff/60) % 10) + ":" + String(uint32_t(diff/10) % 6) + String(uint32_t(diff % 10)); return true; } From 8019d78ba0a9e4d741579bde8f9449084922e311 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Mon, 13 Sep 2021 22:40:41 +0200 Subject: [PATCH 3/4] fix format --- src/TaskRouter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskRouter.cpp b/src/TaskRouter.cpp index c85fa05..a11a5f6 100644 --- a/src/TaskRouter.cpp +++ b/src/TaskRouter.cpp @@ -94,7 +94,7 @@ bool RouterTask::loop(System &system) { } uint32_t diff = _beacon_timer.getTriggerTimeInSec(); - _stateInfo = "beacon " + String(uint32_t(diff/600)) + String(uint32_t(diff/60) % 10) + ":" + String(uint32_t(diff/10) % 6) + String(uint32_t(diff % 10)); + _stateInfo = "beacon " + String(uint32_t(diff/600)) + String(uint32_t(diff/60) % 10) + ":" + String(uint32_t(diff/10) % 6) + String(uint32_t(diff % 10)); return true; } From 6f8a0b73081b1c78a2c3da620a335ec9a2e5db4e Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Mon, 13 Sep 2021 22:44:53 +0200 Subject: [PATCH 4/4] fix format --- src/TaskRouter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaskRouter.cpp b/src/TaskRouter.cpp index a11a5f6..f64f6b0 100644 --- a/src/TaskRouter.cpp +++ b/src/TaskRouter.cpp @@ -94,7 +94,7 @@ bool RouterTask::loop(System &system) { } uint32_t diff = _beacon_timer.getTriggerTimeInSec(); - _stateInfo = "beacon " + String(uint32_t(diff/600)) + String(uint32_t(diff/60) % 10) + ":" + String(uint32_t(diff/10) % 6) + String(uint32_t(diff % 10)); + _stateInfo = "beacon " + String(uint32_t(diff / 600)) + String(uint32_t(diff / 60) % 10) + ":" + String(uint32_t(diff / 10) % 6) + String(uint32_t(diff % 10)); return true; }