From 59e84a6146f0e8e156854a2278b8d81bdf586c72 Mon Sep 17 00:00:00 2001 From: Dirk Jahnke Date: Thu, 6 Jun 2019 19:22:34 +0200 Subject: [PATCH] Fixed: Setting fastclock name in config. --- src/ClockClient.h | 2 +- src/main.cpp | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/ClockClient.h b/src/ClockClient.h index 88ba32f..623edbc 100644 --- a/src/ClockClient.h +++ b/src/ClockClient.h @@ -37,7 +37,7 @@ class ClockClient static int const getClockSeconds() { return clockSeconds; } static void addClockChangeCallback(ClockChangeCallback callback); int getNumberOfKnownClocks() { return fastclockScanner.getNumberOfKnownClocks(); }; - static String *getKnownClocks(); + String *getKnownClocks() { return fastclockScanner.getKnownClocks(); }; int getListenPort(); IPAddress getMulticastIP(); static String const getClockString() { diff --git a/src/main.cpp b/src/main.cpp index 893ac3d..2fac119 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -95,7 +95,10 @@ const char _HEAD_END[] PROGMEM = "
{v} {r}%
"; const char _FORM_START[] PROGMEM = "
"; -const char _FORM_CLOCKNAME[] PROGMEM = "
"; +const char _FORM_CLOCKNAME[] PROGMEM = "
"; +const char _FORM_CLOCKSFOUND_START[] PROGMEM = "Fastclocks seen:

"; const char _FORM_CLOCKMODE_HEADLINE[] PROGMEM = "
Clock mode:
"; const char _FORM_CLOCKMODE_DEMO[] PROGMEM = "
"; const char _FORM_CLOCKMODE_REAL[] PROGMEM = "
"; @@ -148,7 +151,19 @@ void appConfig() { page += FPSTR(_VSPACE); page += FPSTR(_FORM_UTC_OFFSET); page += FPSTR(_VSPACE); - page += FPSTR(_FORM_CLOCKNAME); + input = FPSTR(_FORM_CLOCKNAME); + value = config.getString("listenToClock"); + input.replace("{n}", value); + page += input; + page += FPSTR(_FORM_CLOCKSFOUND_START); + String *knownClocks = fastclock.getKnownClocks(); + for (int i=0; i