Added pictures and doc info.

Ignore changes if value does not change.

README.md

@@ -6,11 +6,17 @@ But it might as well be used as a fast clock display for model railroads.
 
 Prerequisites:
 
-* WS-2812 based adressable LED chain forming the 7-segment display
-* number of LEDs per segment is configurable
+-   WS-2812 based adressable LED chain forming the 7-segment display
+-   number of LEDs per segment is configurable
 
+This is, how it could look like (fyi: the big cargo car is 1:45 scale, the small one is 1:160):
 
+![Clock Picture](doc/Clock1a.png)
+
+The configuration menu allows the selection of real or fast clock and some options like colors, fastclock name or UTC time offset for real time:
+
+![Config Menu](doc/WebConfig.png)
 
 ## Links / References
 
-- example of 3d printable segment frames
+-   example of 3d printable segment frames

src/ClockClient.h

@@ -26,6 +26,7 @@ class ClockClient
     void begin();
     void loop();
     static void setListenToClock(const char *_name) { name = String(_name); }
+    static void setListenToClock(String _name) { name = String(_name); }
     static const char * const getLastMessage();
     static String const getText() { return text; }
     static String const getClock() { return clock; }
@@ -36,8 +37,8 @@ class ClockClient
     static int const getClockMinutes() { return clockMinutes; }
     static int const getClockSeconds() { return clockSeconds; }
     static void addClockChangeCallback(ClockChangeCallback callback);
-    static int getNumberOfKnownClocks();
-    static String *getKnownClocks();
+    int getNumberOfKnownClocks() { return fastclockScanner.getNumberOfKnownClocks(); };
+    String *getKnownClocks() { return fastclockScanner.getKnownClocks(); };
     int getListenPort();
     IPAddress getMulticastIP();
     static String const getClockString() {

src/DjConfig.cpp

@@ -127,6 +127,24 @@ void Config::loadFile(const char *filename, const char * const sectionConfigItem
   }
 }
 
+void Config::writeAllConfigs(void) {
+  logHeap();
+  debug.out(F("Write all changed configs, checking ")); debug.out(numberOfConfigItems); debug.outln(F(" items."));
+  for (int i=0; i<numberOfConfigItems; ++i) {
+    debug.out("["); debug.out(i); debug.out("] ");
+    debug.out(configItems[i].section);
+    debug.out(".");
+    debug.out(configItems[i].name);
+    debug.out("(");
+    debug.out(configItems[i].changed ? "changed" : "-");
+    debug.out(")=");
+    debug.outln(configItems[i].value);
+    if (configItems[i].changed) {
+      writeConfigFile(configItems[i].section);
+    }
+  }
+  logHeap();
+}
 
 void Config::writeConfigFile(String filename) {
   logHeap();
@@ -207,8 +225,10 @@ void Config::setString(String key, String value) {
     debug.out(F("ERROR: Tried to set new value, but cannot find config item ")); debug.outln(key);
   } else {
     // debug.outln(configItems[index].value);
-    configItems[index].value = String(value);
-    configItems[index].changed = true;
+    if (!configItems[index].value.equals(value)) {
+      configItems[index].value = String(value);
+      configItems[index].changed = true;
+    }
   }
 }
 

src/DjConfig.h

@@ -25,7 +25,7 @@ public:
   void setString(String parameter, String value);
   void setInt(String parameter, int value);
   void setBoolean(String parameter, boolean value);
-
+  void writeAllConfigs(void) ;
 private:
   String _filename = "";
   Debug& debug;

src/DjSimpleFS.cpp

@@ -5,7 +5,7 @@
 //
 //
 
-#include <DjSimpleFS.h>
+#include "DjSimpleFS.h"
 
 boolean SimpleFS::_initialized = false;
 FSInfo SimpleFS::fsInfo;
@@ -76,4 +76,3 @@ size_t SimpleFS::getMaxPathLength() {
   }
   return fsInfo.maxPathLength;
 }
-

src/SevenSegmentClock.cpp

@@ -4,6 +4,20 @@ static const uint16_t PixelCount = 4*7*3+3;
 
 #define colorSaturation 31
 
+SevenSegmentClock::ColorSelection
+SevenSegmentClock::colorSelection[] = {
+  { Black, "Black", 0, 0, 0 },
+  { Blue, "Blue", 0, 0, 255 },
+  { Red, "Red", 255, 0, 0 },
+  { Green, "Green", 0, 255, 0 },
+  { White, "White", 255, 255, 255 },
+  { Yellow, "Yellow", 255, 255, 0 },
+  { Magenta, "Magenta", 255, 0, 255 },
+  { Magenta, "Cyan", 0, 255, 255 }
+};
+
+int SevenSegmentClock::numberOfSupportedColors = sizeof(SevenSegmentClock::colorSelection) / sizeof(SevenSegmentClock::colorSelection[0]);
+
 // Seven Segment Layout: 3 LEDs per segment
 // order of segments:
 //     b
@@ -161,23 +175,27 @@ void SevenSegmentClock::displayDigit(unsigned int digitNum, char charToDisplay)
 }
 
 void SevenSegmentClock::displaySeperator(char seperatorCharacter) {
+  displaySeperator(seperatorCharacter, currentColor);
+}
+
+void SevenSegmentClock::displaySeperator(char seperatorCharacter, uint32_t color) {
   //Serial.print("displaySeperator: seperator="); Serial.println(seperatorCharacter);
   switch (seperatorCharacter) {
     case '.':
     case ',':
-      strip->setPixelColor(decimalPointLed, currentColor);
+      strip->setPixelColor(decimalPointLed, color);
       strip->setPixelColor(clockSeperatorLed1, black);
       strip->setPixelColor(clockSeperatorLed2, black);
       break;
     case ':':
       strip->setPixelColor(decimalPointLed, black);
-      strip->setPixelColor(clockSeperatorLed1, currentColor);
-      strip->setPixelColor(clockSeperatorLed2, currentColor);
+      strip->setPixelColor(clockSeperatorLed1, color);
+      strip->setPixelColor(clockSeperatorLed2, color);
       break;
       case '|':
-        strip->setPixelColor(decimalPointLed, currentColor);
-        strip->setPixelColor(clockSeperatorLed1, currentColor);
-        strip->setPixelColor(clockSeperatorLed2, currentColor);
+        strip->setPixelColor(decimalPointLed, color);
+        strip->setPixelColor(clockSeperatorLed1, color);
+        strip->setPixelColor(clockSeperatorLed2, color);
         break;
     default:
       Serial.print("SevenSegmentClock::displaySeperator: Unknown character to be displayed: ");
@@ -191,6 +209,14 @@ void SevenSegmentClock::displaySeperator(char seperatorCharacter) {
   }
 }
 
+void SevenSegmentClock::displaySeperator(uint32_t color) {
+  strip->setPixelColor(clockSeperatorLed1, color);
+  strip->setPixelColor(clockSeperatorLed2, color);
+}
+
+void SevenSegmentClock::displayDecimalPoint(uint32_t color) {
+  strip->setPixelColor(decimalPointLed, color);
+}
 
 void SevenSegmentClock::displayTime(int hour, int minute)  {
   if (clockHour != hour || clockMinute != minute) {
@@ -224,7 +250,9 @@ void SevenSegmentClock::displayUpdate(void) {
         displayDigit(1, displayText[1]);
         displayDigit(2, displayText[2]);
         displayDigit(3, displayText[3]);
-        displaySeperator(':');
+        //displaySeperator(':');
+        displaySeperator(currentColor);
+        displayDecimalPoint(black);
         break;
       case ClockBlinking:
         if (currentlyBlinkOn) {
@@ -232,17 +260,15 @@ void SevenSegmentClock::displayUpdate(void) {
           displayDigit(1, displayText[1]);
           displayDigit(2, displayText[2]);
           displayDigit(3, displayText[3]);
-          displaySeperator(':');
+          //displaySeperator(':');
+          displaySeperator(currentColor);
         } else {
           displayDigit(0, ' ');
           displayDigit(1, ' ');
           displayDigit(2, ' ');
           displayDigit(3, ' ');
-          displaySeperator(' ');
-        }
-        if (millis() > nextBlinkSwitch_ms) {
-          currentlyBlinkOn = !currentlyBlinkOn;
-          nextBlinkSwitch_ms = millis() + (currentlyBlinkOn ? BLINK_ON_TIME_ms : BLINK_OFF_TIME_ms);
+          //displaySeperator(' ');
+          displaySeperator(black);
         }
         break;
       case SeperatorBlinking:
@@ -251,13 +277,13 @@ void SevenSegmentClock::displayUpdate(void) {
         displayDigit(2, displayText[2]);
         displayDigit(3, displayText[3]);
         if (currentlyBlinkOn) {
-          displaySeperator('|');
+          //displaySeperator('|');
+          displaySeperator(currentColor);
+          displayDecimalPoint(currentColor);
         } else {
-          displaySeperator(' ');
-        }
-        if (millis() > nextBlinkSwitch_ms) {
-          currentlyBlinkOn = !currentlyBlinkOn;
-          nextBlinkSwitch_ms = millis() + (currentlyBlinkOn ? BLINK_ON_TIME_ms : BLINK_OFF_TIME_ms);
+          //displaySeperator(' ');
+          displaySeperator(black);
+          displayDecimalPoint(black);
         }
         break;
       case DecimalPointBlinking:
@@ -266,15 +292,30 @@ void SevenSegmentClock::displayUpdate(void) {
         displayDigit(2, displayText[2]);
         displayDigit(3, displayText[3]);
         if (currentlyBlinkOn) {
-          displaySeperator('.');
+          //displaySeperator('.');
+          displayDecimalPoint(currentColor);
         } else {
-          displaySeperator(' ');
-        }
-        if (millis() > nextBlinkSwitch_ms) {
-          currentlyBlinkOn = !currentlyBlinkOn;
-          nextBlinkSwitch_ms = millis() + (currentlyBlinkOn ? BLINK_ON_TIME_ms : BLINK_OFF_TIME_ms);
+          //displaySeperator(' ');
+          displayDecimalPoint(black);
         }
         break;
+      case DecimalPointColoredBlinking:
+        displayDigit(0, displayText[0]);
+        displayDigit(1, displayText[1]);
+        displayDigit(2, displayText[2]);
+        displayDigit(3, displayText[3]);
+        if (currentlyBlinkOn) {
+          //displaySeperator('.', currentColor);
+          displayDecimalPoint(currentColor);
+        } else {
+          //displaySeperator('.', blinkColor);
+          displayDecimalPoint(blinkColor);
+        }
+        break;
+    }
+    if (millis() > nextBlinkSwitch_ms) {
+      currentlyBlinkOn = !currentlyBlinkOn;
+      nextBlinkSwitch_ms = millis() + (currentlyBlinkOn ? BLINK_ON_TIME_ms : BLINK_OFF_TIME_ms);
     }
     strip->show();
     //Serial.print("Shown: "); Serial.print(displayText[0]); Serial.print(displayText[1]);
@@ -283,30 +324,68 @@ void SevenSegmentClock::displayUpdate(void) {
   }
 }
 
-uint32_t SevenSegmentClock::red, SevenSegmentClock::green, SevenSegmentClock::blue, SevenSegmentClock::white, SevenSegmentClock::black, SevenSegmentClock::yellow;
 uint8_t SevenSegmentClock::LedDataPin;
 Adafruit_NeoPixel *SevenSegmentClock::strip;
 
-void SevenSegmentClock::initColors(uint8_t _brightness) {
-  SevenSegmentClock::red = strip->Color(_brightness, 0, 0);
-  SevenSegmentClock::green = strip->Color(0, _brightness, 0);
-  SevenSegmentClock::blue = strip->Color(0, 0, _brightness);
-  SevenSegmentClock::white = strip->Color(_brightness, _brightness, _brightness);
-  SevenSegmentClock::black = strip->Color(0, 0, 0);
-  SevenSegmentClock::yellow = strip->Color(_brightness, _brightness, 0);
-  SevenSegmentClock::setColor(SevenSegmentClock::getColor()); // reset color to enforce reclaculation
-}
-
 void SevenSegmentClock::setColor(Color color) {
   currentColorHandle = color;
-  switch (currentColorHandle) {
-    case Black: currentColor = SevenSegmentClock::black; break;
-    case Blue: currentColor = SevenSegmentClock::blue; break;
-    case Red: currentColor = SevenSegmentClock::red; break;
-    case Green: currentColor = SevenSegmentClock::green; break;
-    case White: currentColor = SevenSegmentClock::white; break;
-    case Yellow: currentColor = SevenSegmentClock::yellow; break;
+  currentColor = getColorByHandle(color);
+}
+
+void SevenSegmentClock::setBlinkColor(Color color) {
+  blinkColorHandle=color;
+  blinkColor=getColorByHandle(color);
+  debug.out(F("setBlinkColor to ")); debug.outln(getColorName(color));
+}
+
+String SevenSegmentClock::getColorName(Color handle) {
+  for (int i=0; i<numberOfSupportedColors; ++i) {
+    if (colorSelection[i].handle == handle)
+      return colorSelection[i].colorName;
   }
+  debug.outln(F("ERROR: Unknown color / handle not known"), DEBUG_ERROR);
+  return String(F("ERROR: Unknown color handle"));
+}
+
+SevenSegmentClock::Color SevenSegmentClock::getColorHandle(int index) {
+  return colorSelection[index].handle;
+}
+
+uint32_t SevenSegmentClock::getAdjustedStripColor(uint8_t red, uint8_t green, uint8_t blue) {
+  return strip->Color((red * brightness) / 255, (green * brightness) / 255, (blue * brightness) / 255);
+}
+
+uint32 SevenSegmentClock::getColorByName(String name) {
+  for (int i=0; i<numberOfSupportedColors; ++i) {
+    if (colorSelection[i].colorName.equals(name)) {
+      return getAdjustedStripColor(colorSelection[i].red, colorSelection[i].green, colorSelection[i].blue);
+    }
+  }
+  debug.out(F("ERROR: Unknown color name "), DEBUG_ERROR);
+  debug.outln(name, DEBUG_ERROR);
+  return 0xffffffff;
+}
+
+uint32 SevenSegmentClock::getColorByHandle(Color handle) {
+  for (int i=0; i<numberOfSupportedColors; ++i) {
+    if (colorSelection[i].handle == handle) {
+      return getAdjustedStripColor(colorSelection[i].red, colorSelection[i].green, colorSelection[i].blue);
+    }
+  }
+  debug.outln(F("ERROR: Unknown color handle"), DEBUG_ERROR);
+  debug.out(F("Currently I know about ")); debug.out(numberOfSupportedColors); debug.outln(F(" colors."));
+  return 0xffffffff;
+}
+
+SevenSegmentClock::Color SevenSegmentClock::getColorHandleByName(String name) {
+  for (int i=0; i<numberOfSupportedColors; ++i) {
+    if (colorSelection[i].colorName.equals(name)) {
+      return colorSelection[i].handle;
+    }
+  }
+  debug.out(F("ERROR: Unknown color name "), DEBUG_ERROR);
+  debug.outln(name, DEBUG_ERROR);
+  return Green; // default
 }
 
 void SevenSegmentClock::begin(void) {
@@ -315,9 +394,11 @@ void SevenSegmentClock::begin(void) {
   Serial.print("Pixels="); Serial.println(PixelCount);
   SevenSegmentClock::strip = new Adafruit_NeoPixel(PixelCount, LedDataPin, NEO_GRB + NEO_KHZ800);
   strip->begin();
+  setClockHalted(true);
+  setBrightness(20);
+  setColor(Green);
+  setBlinkColor(Red);
+  black = strip->Color(0, 0, 0);
   strip->clear();
   strip->show();
-  initColors(colorSaturation);
-  SevenSegmentClock::currentColor = SevenSegmentClock::blue;
-  SevenSegmentClock::currentColorHandle = SevenSegmentClock::Blue;
 }

src/SevenSegmentClock.h

@@ -7,44 +7,60 @@
 
 // avoid flickering of the display:
 #define TIME_BETWEEN_DISPLAY_UPDATES_ms 100
-#define BLINK_OFF_TIME_ms 200
-#define BLINK_ON_TIME_ms 200
+#define BLINK_OFF_TIME_ms 400
+#define BLINK_ON_TIME_ms 400
 #define defaultLedDataPin 2
 class SevenSegmentClock {
 public:
-  SevenSegmentClock(Debug& _debug, Config& _config):debug(_debug), config(_config) { LedDataPin=defaultLedDataPin; init(); };
-  SevenSegmentClock(Debug& _debug, Config& _config, uint8_t dataPin):debug(_debug), config(_config) { LedDataPin=dataPin; init(); };
+  SevenSegmentClock(Debug& _debug, Config& _config):debug(_debug), config(_config) { LedDataPin=defaultLedDataPin; };
+  SevenSegmentClock(Debug& _debug, Config& _config, uint8_t dataPin):debug(_debug), config(_config) { LedDataPin=dataPin; };
   void begin(void);
   void displayTime(int hour, int minute);
   void displayUpdate(void);
   //void setClockSpeed(int _msPerModelSecond) { msPerModelSecond = _msPerModelSecond; setClockSpeed("x"); };
-  enum BlinkMode { NoBlinking, ClockBlinking, SeperatorBlinking, DecimalPointBlinking };
+  enum BlinkMode { NoBlinking, ClockBlinking, SeperatorBlinking, DecimalPointBlinking, DecimalPointColoredBlinking };
   void setBlinkMode(BlinkMode _blinkMode) { blinkMode = _blinkMode; };
   void setClockHalted(bool halted) { clockHalted = halted; };
-  enum Color { Black, Red, Green, Blue, White, Yellow };
+  enum Color { Black, Red, Green, Blue, White, Yellow, Magenta, Cyan };
   void setColor(Color color);
+  void setBlinkColor(Color color);
   Color getColor(void) { return currentColorHandle; };
-  enum ClockDisplayStatus { Off, Booting, Halted, StandardClock, FastClock };
   void displayDigit(unsigned int digitNum, char c);
   void displaySeperator(char seperatorCharacter);
-  void setBrightness(uint8_t b) { brightness=b; initColors(b); };
+  void displaySeperator(char seperatorCharacter, uint32_t color);
+  void displaySeperator(uint32_t color);
+  void displayDecimalPoint(uint32_t color);
+  void setBrightness(uint8_t b) { brightness=b; };
   uint8_t getBrightness(void) { return brightness; };
+  int getNumberSupportedColors(void) { return numberOfSupportedColors; };
+  String getColorName(int index) { return String(colorSelection[index].colorName); };
+  String getColorName(Color handle);
+  Color getColorHandle(int index);
+  uint32_t getAdjustedStripColor(uint8_t red, uint8_t green, uint8_t blue);
+  uint32 getColorByName(String name);
+  uint32 getColorByHandle(Color handle);
+  Color getColorHandleByName(String name);
 private:
   Debug& debug;
   Config& config;
-  void init(void) { displayStatus = Off; clockHour=12; clockMinute=34; setClockHalted(true); currentColorHandle = Green; currentColor = green; };
   static uint8_t LedDataPin;
   static Adafruit_NeoPixel *strip;
   static BlinkMode blinkMode;
   static uint8_t brightness;
-  static uint32_t red, green, blue, white, black, yellow;
-  ClockDisplayStatus displayStatus;
   int clockHour;
   int clockMinute;
   bool clockHalted;
   Color currentColorHandle;
+  Color blinkColorHandle;
   uint32_t currentColor;
+  uint32_t blinkColor;
+  uint32_t black;
   void displaySegment(unsigned int ledAddress, uint32_t color);
-  void initColors(uint8_t _brightness);
+  static struct ColorSelection {
+    Color handle;
+    String colorName;
+    uint8_t red, green, blue;
+  } colorSelection[];
+  static int numberOfSupportedColors;
 };
 #endif

src/WebUI.cpp

@@ -0,0 +1,202 @@
+#include "WebUI.h"
+
+static const String appName{"7SegDisplay-XL"};
+static const char _HEAD[] PROGMEM              = "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"UTF-8\" name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\"/><title>{v}</title>";
+static const char _STYLE[] PROGMEM             = "<style>.c{text-align: center;} div,input{padding:5px;font-size:1em;} input{width:95%;} input.r{width:20%;} body{text-align: center;font-family:verdana;} button{border:0;border-radius:0.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;} .q{float: right;width: 64px;text-align: right;} .l{background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAALVBMVEX///8EBwfBwsLw8PAzNjaCg4NTVVUjJiZDRUUUFxdiZGSho6OSk5Pg4eFydHTCjaf3AAAAZElEQVQ4je2NSw7AIAhEBamKn97/uMXEGBvozkWb9C2Zx4xzWykBhFAeYp9gkLyZE0zIMno9n4g19hmdY39scwqVkOXaxph0ZCXQcqxSpgQpONa59wkRDOL93eAXvimwlbPbwwVAegLS1HGfZAAAAABJRU5ErkJggg==\") no-repeat left center;background-size: 1em;}</style>";
+static const char _SCRIPT[] PROGMEM            = "<script>function c(l){document.getElementById('s').value=l.innerText||l.textContent;document.getElementById('p').focus();}</script>";
+static const char _HEAD_END[] PROGMEM          = "</head><body><div style='text-align:left;display:inline-block;min-width:260px;'>";
+static const char _PORTAL_OPTIONS[] PROGMEM    = "<form action=\"/wifi\" method=\"get\"><button>Configure WiFi</button></form><br/><form action=\"/0wifi\" method=\"get\"><button>Configure WiFi (No Scan)</button></form><br/><form action=\"/i\" method=\"get\"><button>Info</button></form><br/><form action=\"/r\" method=\"post\"><button>Reset</button></form>";
+static const char _ITEM[] PROGMEM              = "<div><a href='#p' onclick='c(this)'>{v}</a>&nbsp;<span class='q {i}'>{r}%</span></div>";
+static const char _FORM_START[] PROGMEM        = "<form method='get' action='configSave'>";
+static const char _FORM_CLOCKNAME[] PROGMEM    = "<label for='n'>Fastclock name</label><input id='n' name='n' length=32 placeholder='clock name' value='{n}'><br/>";
+static const char _FORM_CLOCKSFOUND_START[] PROGMEM = "Fastclocks seen:<br/><ul>";
+static const char _FORM_CLOCKSFOUND_ITEM[] PROGMEM = "<li>{fc}</li>";
+static const char _FORM_CLOCKSFOUND_END[] PROGMEM = "</ul><br/>";
+static const char _FORM_CLOCKMODE_HEADLINE[] PROGMEM = "<br/>Clock mode:<br/>";
+static const char _FORM_CLOCKMODE_DEMO[] PROGMEM = "<input class='r' id='md' name='m' type='radio' value='demo' {check}><label for='md'>Demo</label><br/>";
+static const char _FORM_CLOCKMODE_REAL[] PROGMEM = "<input class='r' id='mr' name='m' type='radio' value='real' {check}><label for='md'>Real Clock</label><br/>";
+static const char _FORM_CLOCKMODE_FAST[] PROGMEM = "<input class='r' id='mf' name='m' type='radio' value='fast' {check}><label for='md'>Fast Clock</label><br/>";
+static const char _FORM_UTC_OFFSET[] PROGMEM   = "<label for='utc'>UTC offset (minutes)</label><input id='utc' name='utc' length=4 placeholder='120'><br/>";
+static const char _FORM_PARAM[] PROGMEM        = "<br/><input id='{i}' name='{n}' maxlength={l} placeholder='{p}' value='{v}' {c}>";
+static const char _FORM_COLOR_HEADLINE[] PROGMEM = "Display color:<br/>";
+static const char _FORM_COLOR_template[] PROGMEM = "<input class='r' id='{cid}' name='c' type='radio' value='{cname}' {check}><label for='{cid}'>{cname}</label><br/>";
+static const char _FORM_BRIGHTNESS[] PROGMEM   = "<label for='b'>Brightness:</label><input id='b' name='b' type='range' min='10' max='255' value='{bright}'><br/>";
+static const char _FORM_FASTCLOCK_INFO[] PROGMEM = "<div>Number of fastclocks found: {nfc}</div><br/>";
+static const char _FORM_END[] PROGMEM          = "<br/><button type='submit'>apply</button></form><br/>";
+static const char _SAVE_PERM_BUTTON[] PROGMEM  = "<br/><form action=\"/configSavePermanent\" method=\"get\"><button>Save permanently</button></form><br/>";
+static const char _CONFIG_BUTTON[] PROGMEM     = "<br/><form action=\"/config\" method=\"get\"><button>Configure</button></form><br/>";
+static const char _VSPACE[] PROGMEM            = "<br/><br/>";
+static const char _SAVED[] PROGMEM             = "<div>Credentials Saved<br />Trying to connect ESP to network.<br />If it fails reconnect to AP to try again</div>";
+static const char _END[] PROGMEM               = "</div></body></html>";
+
+void WebUI::appConfig() {
+  String page = FPSTR(_HEAD);
+  String input;
+  String value;
+  int ivalue;
+
+  page.replace("{v}", "7Seg Config");
+  page += FPSTR(_SCRIPT);
+  page += FPSTR(_STYLE);
+  //page += _customHeadElement;
+  page += FPSTR(_HEAD_END);
+  page += String(F("<h1>"));
+  page += appName;
+  page += String(F("</h1>"));
+  page += String(F("<h3>Clock Options</h3>"));
+  //page += FPSTR(_PORTAL_OPTIONS);
+  page += FPSTR(_FORM_START);
+  page += FPSTR(_FORM_CLOCKMODE_HEADLINE);
+  input = FPSTR(_FORM_CLOCKMODE_DEMO);
+  input.replace("{check}", (config.getString("appMode").equals("Demo")) ? "checked" : "");
+  page += input;
+  input = FPSTR(_FORM_CLOCKMODE_REAL);
+  input.replace("{check}", (config.getString("appMode").equals("Realclock")) ? "checked" : "");
+  page += input;
+  input = FPSTR(_FORM_CLOCKMODE_FAST);
+  input.replace("{check}", (config.getString("appMode").equals("Fastclock")) ? "checked" : "");
+  page += input;
+  page += FPSTR(_VSPACE);
+  page += FPSTR(_FORM_UTC_OFFSET);
+  page += FPSTR(_VSPACE);
+  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<fastclock.getNumberOfKnownClocks(); ++i) {
+    input = FPSTR(_FORM_CLOCKSFOUND_ITEM);
+    input.replace("{fc}", knownClocks[i]);
+    page += input;
+  }
+  page += FPSTR(_FORM_CLOCKSFOUND_END);
+
+  page += FPSTR(_VSPACE);
+  page += FPSTR(_FORM_COLOR_HEADLINE);
+  for (int i=0; i<sevenSegmentClock.getNumberSupportedColors(); ++i) {
+    input = FPSTR(_FORM_COLOR_template);
+    input.replace("{cid}", sevenSegmentClock.getColorName(i));
+    input.replace("{cname}", sevenSegmentClock.getColorName(i));
+    input.replace("{check}", (config.getString("clockColor").equals(sevenSegmentClock.getColorName(i))) ? "checked" : "");
+    page += input;
+  }
+
+  page += FPSTR(_VSPACE);
+  input = FPSTR(_FORM_BRIGHTNESS);
+  value = String(sevenSegmentClock.getBrightness());
+  input.replace("{bright}", value);
+  page += input;
+
+  page += FPSTR(_VSPACE);
+  input = FPSTR(_FORM_FASTCLOCK_INFO);
+  ivalue = fastclock.getNumberOfKnownClocks();
+  value = String(ivalue);
+  //value = String("unknown");
+  input.replace("{nfc}", value);
+  page += input;
+
+  page += FPSTR(_FORM_END);
+  page += FPSTR(_END);
+
+  server->sendHeader("Content-Length", String(page.length()));
+  server->send(200, "text/html", page);
+}
+
+void WebUI::appConfigSave(void) {
+  String page = FPSTR(_HEAD);
+
+  page.replace("{v}", "7Seg Config");
+  page += FPSTR(_SCRIPT);
+  page += FPSTR(_STYLE);
+  page += FPSTR(_HEAD_END);
+  page += String(F("<h1>"));
+  page += appName;
+  page += String(F("</h1>"));
+
+  debug.out(server->args(), DEBUG_MED_INFO); debug.outln(" arguments", DEBUG_MED_INFO);
+  for (int i=0; i<server->args(); ++i) {
+    debug.out(server->argName(i), DEBUG_MAX_INFO);
+    debug.out(": ", DEBUG_MAX_INFO);
+    debug.outln(server->arg(i), DEBUG_MAX_INFO);
+  }
+  if (server->hasArg("n")) {
+    String clockName = server->arg("n");
+    config.setString("listenToClock", clockName);
+    fastclock.setListenToClock(clockName);
+    page += F("<div>Set fastclock to listen to clock with name ");
+    page += clockName;
+    page += F(".</div>");
+  }
+  if (server->hasArg("b")) {
+    int brightness = server->arg("b").toInt();
+    sevenSegmentClock.setBrightness(brightness);
+    config.setInt("brightness", brightness);
+    page += F("<div>Set brightness to ");
+    page += server->arg("b");
+    page += F(".</div>");
+  }
+  if (server->hasArg("c")) {
+    String colorName = server->arg("c");
+    SevenSegmentClock::Color colorHandle = sevenSegmentClock.getColorHandleByName(server->arg("c"));
+    sevenSegmentClock.setColor(colorHandle);
+    config.setString("clockColor", colorName);
+    page += F("<div>Set color to ");
+    page += server->arg("c");
+    page += F(".</div>");
+  }
+  if (server->hasArg("m")) {
+    debug.out("setting clock mode to ", DEBUG_MAX_INFO); debug.outln(server->arg("m"), DEBUG_MAX_INFO);
+    page += F("<div>Set clock mode to ");
+    page += server->arg("m");
+    page += F(".</div>");
+    if (server->arg("m").equals("real")) config.setString("appMode", MODE_REALCLOCK);
+    else if (server->arg("m").equals("fast")) config.setString("appMode", MODE_FASTCLOCK);
+    else if (server->arg("m").equals("demo")) config.setString("appMode", MODE_DEMO);
+    else {
+      debug.outln("ERROR: Unknown application mode, going into demo mode", DEBUG_ERROR);
+      config.setString("appMode", MODE_DEMO);
+      page += F("<div>ERROR: Unknown clockmode, using default: demo.</div>");
+    }
+  }
+  if (server->hasArg("utc")) {
+    page += F("<div>Set real clock offset to ");
+    int timeOffset;
+    if (server->arg("utc").equals("")) {
+      page += "120";
+      timeOffset = 120;
+    } else {
+      page += server->arg("utc");
+      timeOffset = server->arg("utc").toInt();
+    }
+    config.setInt("utcTimeOffsetMinutes", timeOffset);
+    timeClient.setTimeOffset(timeOffset * 60);
+    page += F(" minutes.</div>");
+  }
+  page += String(F("<div>Configuration updated.</div>"));
+  page += FPSTR(_CONFIG_BUTTON);
+  page += FPSTR(_SAVE_PERM_BUTTON);
+  page += FPSTR(_END);
+  server->sendHeader("Content-Length", String(page.length()));
+  server->send(200, "text/html", page);
+}
+
+void WebUI::appConfigSavePermanent(void) {
+  String page = FPSTR(_HEAD);
+
+  page.replace("{v}", "7Seg Config");
+  page += FPSTR(_SCRIPT);
+  page += FPSTR(_STYLE);
+  page += FPSTR(_HEAD_END);
+  page += String(F("<h1>"));
+  page += appName;
+  page += String(F("</h1>"));
+
+  debug.outln("Writing configs to save them permanently", DEBUG_MAX_INFO);
+  config.writeAllConfigs();
+  page += String(F("<div>Configuration permanently saved.</div>"));
+  page += FPSTR(_CONFIG_BUTTON);
+  page += FPSTR(_END);
+  server->sendHeader("Content-Length", String(page.length()));
+  server->send(200, "text/html", page);
+}

src/WebUI.h

@@ -0,0 +1,44 @@
+#ifndef _webui_included
+#define _webui_included
+
+#include "app.h"
+#include <ESP8266WebServer.h>
+#include <NTPClient.h>
+#include "DjDebug.h"
+#include "DjConfig.h"
+#include "SevenSegmentClock.h"
+#include "ClockClient.h"
+
+class WebUI {
+public:
+  WebUI(Debug& _debug, Config& _config, NTPClient& _timeClient, ClockClient& _fastclock, SevenSegmentClock& _sevenSegmentClock):
+    debug(_debug), config(_config), timeClient(_timeClient), fastclock(_fastclock), sevenSegmentClock(_sevenSegmentClock) {
+    debug.outln(F("WebUI constructor called"));
+  };
+  void begin(void) {
+    server = new ESP8266WebServer(80);
+    server->on("/config", std::bind(&WebUI::appConfig, this));
+    server->on("/configSave", std::bind(&WebUI::appConfigSave, this));
+    server->on("/configSavePermanent", std::bind(&WebUI::appConfigSavePermanent, this)); 
+    //server->on("/config", HTTP_GET, appConfig);
+    //server->on("/configSave", HTTP_GET, appConfigSave);
+    //server->on("/configSavePermanent", HTTP_GET, appConfigSavePermanent);
+
+    server->begin();
+  };
+  void loop(void) {
+    server->handleClient();
+  };
+  void appConfig();
+  void appConfigSave();
+  void appConfigSavePermanent();
+private:
+  Debug& debug;
+  Config& config;
+  NTPClient& timeClient;
+  ClockClient& fastclock;
+  SevenSegmentClock& sevenSegmentClock;
+  ESP8266WebServer *server;
+};
+
+#endif

src/app.h

@@ -0,0 +1,10 @@
+#ifndef _app_included
+#define _app_included
+
+#include <Arduino.h>
+
+#define MODE_DEMO "Demo"
+#define MODE_REALCLOCK "Realclock"
+#define MODE_FASTCLOCK "Fastclock"
+
+#endif

src/main.cpp

@@ -1,14 +1,10 @@
-#include <Arduino.h>
+#include "app.h"
 #include <FS.h>                   //this needs to be first, or it all crashes and burns...
 #include <ESP8266WiFi.h>
 #include <NTPClient.h>        //https://github.com/esp8266/Arduino
 #include <WiFiUdp.h>
-
-//needed for library
 #include <DNSServer.h>
-#include <ESP8266WebServer.h>
 #include <WiFiManager.h>
-
 #include <ArduinoJson.h>
 #include <SPI.h>
 #include "DjDebug.h"
@@ -16,6 +12,8 @@
 #include "SevenSegmentClock.h"
 #include "DjDebug.h"
 #include "ClockClient.h"
+#include "WebUI.h"
+#include "DjSimpleFS.h"
 
 // NTP
 WiFiUDP ntpUDP;
@@ -24,10 +22,6 @@ WiFiUDP ntpUDP;
 // update interval (in milliseconds, can be changed using setUpdateInterval() ).
 NTPClient timeClient(ntpUDP, "europe.pool.ntp.org", 7200, 60000);
 
-#define MODE_DEMO "Demo"
-#define MODE_REALCLOCK "Realclock"
-#define MODE_FASTCLOCK "Fastclock"
-
 static const char *appName = "FastclockClient7Seg";
 const char * const PROGMEM mainConfig[] = {
   "appMode:string:" MODE_DEMO,
@@ -41,61 +35,10 @@ Debug debug;
 Config config(debug);
 ClockClient fastclock(debug, config);
 SevenSegmentClock sevenSegmentClock(debug, config);
-ESP8266WebServer *server;
 ClockClient fastclockClient(debug, config);
-
-static struct ColorSelection {
-  uint8_t id;
-  SevenSegmentClock::Color colorHandle;
-  String colorName;
-} colorSelection[] = {
-  { 1, SevenSegmentClock::Black, "black" },
-  { 2, SevenSegmentClock::Blue, "blue" },
-  { 3, SevenSegmentClock::Red, "red" },
-  { 4, SevenSegmentClock::Green, "green" },
-  { 5, SevenSegmentClock::White, "white" },
-  { 6, SevenSegmentClock::Yellow, "yellow" }
-};
-
-#if 0
-
-static const String getColorName(uint8_t color) {
-  for (unsigned int i=0; i<sizeof(colorSelection); ++i) {
-    if (color == colorSelection[i].id) {
-      return colorSelection[i].colorName;
-    }
-  }
-  return "**INVALID**";
-}
-
-static const uint8_t getColorId(SevenSegmentClock::Color color) {
-  for (unsigned int i=0; i<sizeof(colorSelection); ++i) {
-    if (color == colorSelection[i].colorHandle) {
-      return colorSelection[i].id;
-    }
-  }
-  return -1;
-}
-
-static const SevenSegmentClock::Color getColorHandle(uint8_t id) {
-  for (unsigned int i=0; i<sizeof(colorSelection); ++i) {
-    if (id == colorSelection[i].id) {
-      return colorSelection[i].colorHandle;
-    }
-  }
-  return SevenSegmentClock::Green; // default
-}
-#endif
-
-static const SevenSegmentClock::Color getColorHandleByName(String name) {
-  for (unsigned int i=0; i<sizeof(colorSelection); ++i) {
-    if (name.equals(colorSelection[i].colorName)) {
-      return colorSelection[i].colorHandle;
-    }
-  }
-  return SevenSegmentClock::Green; // default
-}
-
+//ESP8266WebServer *server;
+WebUI *webUI;
+SimpleFS filesystem(debug);
 
 //flag for saving data
 bool shouldSaveConfig = false;
@@ -134,25 +77,6 @@ void setupWifiConnection() {
   //save the custom parameters to FS
   if (shouldSaveConfig) {
     debug.outln("saving config ... NYI", DEBUG_MED_INFO);
-    // DynamicJsonDocument config(2048);
-    //JsonObject json = jsonBuffer.createObject();
-    /*
-    config["clock_name"] = clockName;
-    config["clock_channel"] = clockChannelString;
-    config["clock_color"] = clockColor;
-    */
-
-/*
-    File configFile = SPIFFS.open("/config.json", "w");
-    if (!configFile) {
-      Serial.println("failed to open config file for writing");
-    }
-
-    serializeJsonPretty(config, Serial);
-    serializeJson(config, configFile);
-    configFile.close();
-    //end save
-*/
   }
 
   debug.out("local ip: ", DEBUG_MAX_INFO); debug.outln(WiFi.localIP(), DEBUG_MAX_INFO);
@@ -160,280 +84,48 @@ void setupWifiConnection() {
   debug.out("subnet: ", DEBUG_MAX_INFO); debug.outln(WiFi.subnetMask(), DEBUG_MAX_INFO);
 }
 
-const char _HEAD[] PROGMEM              = "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"UTF-8\" name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\"/><title>{v}</title>";
-const char _STYLE[] PROGMEM             = "<style>.c{text-align: center;} div,input{padding:5px;font-size:1em;} input{width:95%;} input.r{width:20%;} body{text-align: center;font-family:verdana;} button{border:0;border-radius:0.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;} .q{float: right;width: 64px;text-align: right;} .l{background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAALVBMVEX///8EBwfBwsLw8PAzNjaCg4NTVVUjJiZDRUUUFxdiZGSho6OSk5Pg4eFydHTCjaf3AAAAZElEQVQ4je2NSw7AIAhEBamKn97/uMXEGBvozkWb9C2Zx4xzWykBhFAeYp9gkLyZE0zIMno9n4g19hmdY39scwqVkOXaxph0ZCXQcqxSpgQpONa59wkRDOL93eAXvimwlbPbwwVAegLS1HGfZAAAAABJRU5ErkJggg==\") no-repeat left center;background-size: 1em;}</style>";
-const char _SCRIPT[] PROGMEM            = "<script>function c(l){document.getElementById('s').value=l.innerText||l.textContent;document.getElementById('p').focus();}</script>";
-const char _HEAD_END[] PROGMEM          = "</head><body><div style='text-align:left;display:inline-block;min-width:260px;'>";
-const char _PORTAL_OPTIONS[] PROGMEM    = "<form action=\"/wifi\" method=\"get\"><button>Configure WiFi</button></form><br/><form action=\"/0wifi\" method=\"get\"><button>Configure WiFi (No Scan)</button></form><br/><form action=\"/i\" method=\"get\"><button>Info</button></form><br/><form action=\"/r\" method=\"post\"><button>Reset</button></form>";
-const char _ITEM[] PROGMEM              = "<div><a href='#p' onclick='c(this)'>{v}</a>&nbsp;<span class='q {i}'>{r}%</span></div>";
-const char _FORM_START[] PROGMEM        = "<form method='get' action='configsave'>";
-const char _FORM_CLOCKNAME[] PROGMEM    = "<label for='n'>Fastclock name</label><input id='n' name='n' length=32 placeholder='clock name'><br/>";
-const char _FORM_CLOCKMODE_HEADLINE[] PROGMEM = "<br/>Clock mode:<br/>";
-const char _FORM_CLOCKMODE_DEMO[] PROGMEM = "<input class='r' id='md' name='m' type='radio' value='demo' {check}><label for='md'>Demo</label><br/>";
-const char _FORM_CLOCKMODE_REAL[] PROGMEM = "<input class='r' id='mr' name='m' type='radio' value='real' {check}><label for='md'>Real Clock</label><br/>";
-const char _FORM_CLOCKMODE_FAST[] PROGMEM = "<input class='r' id='mf' name='m' type='radio' value='fast' {check}><label for='md'>Fast Clock</label><br/>";
-const char _FORM_UTC_OFFSET[] PROGMEM   = "<label for='utc'>UTC offset (minutes)</label><input id='utc' name='utc' length=4 placeholder='120'><br/>";
-const char _FORM_PARAM[] PROGMEM        = "<br/><input id='{i}' name='{n}' maxlength={l} placeholder='{p}' value='{v}' {c}>";
-const char _FORM_COLOR_HEADLINE[] PROGMEM = "<br/>Display color:<br/>";
-const char _FORM_COLOR_BLUE[] PROGMEM   = "<input class='r' id='cb' name='c' type='radio' value='blue' {check}><label for='cb'>Blue</label><br/>";
-const char _FORM_COLOR_RED[] PROGMEM    = "<input class='r' id='cr' name='c' type='radio' value='red' {check}><label for='cr'>Red</label><br/>";
-const char _FORM_COLOR_GREEN[] PROGMEM  = "<input class='r' id='cg' name='c' type='radio' value='green' {check}><label for='cg'>Green</label><br/>";
-const char _FORM_COLOR_WHITE[] PROGMEM  = "<input class='r' id='cw' name='c' type='radio' value='white' {check}><label for='cw'>White</label><br/>";
-const char _FORM_COLOR_YELLOW[] PROGMEM = "<input class='r' id='cy' name='c' type='radio' value='yellow' {check}><label for='cy'>Yellow</label><br/>";
-const char _FORM_BRIGHTNESS[] PROGMEM   = "<br/><label for='b'>Brightness:</label><input id='b' name='b' type='range' min='10' max='255' value='{bright}'><br/>";
-const char _FORM_FASTCLOCK_INFO[] PROGMEM = "<br/><br/><div>Number of fastclocks found: {nfc}</div>";
-const char _FORM_END[] PROGMEM          = "<br/><button type='submit'>save</button></form>";
-const char _CONFIG_LINK[] PROGMEM       = "<br/><div class=\"c\"><a href=\"/config\">Configure</a></div>";
-const char _SAVED[] PROGMEM             = "<div>Credentials Saved<br />Trying to connect ESP to network.<br />If it fails reconnect to AP to try again</div>";
-const char _END[] PROGMEM               = "</div></body></html>";
 
-void appConfig() {
-  String page = FPSTR(_HEAD);
-  String input;
-  String value;
-
-  page.replace("{v}", "7Seg Config");
-  page += FPSTR(_SCRIPT);
-  page += FPSTR(_STYLE);
-  //page += _customHeadElement;
-  page += FPSTR(_HEAD_END);
-  page += String(F("<h1>"));
-  page += appName;
-  page += String(F("</h1>"));
-  page += String(F("<h3>Clock Options</h3>"));
-  //page += FPSTR(_PORTAL_OPTIONS);
-  page += FPSTR(_FORM_START);
-  page += FPSTR(_FORM_CLOCKMODE_HEADLINE);
-  input = FPSTR(_FORM_CLOCKMODE_DEMO);
-  input.replace("{check}", (config.getString("appMode").equals("Demo")) ? "checked" : "");
-  page += input;
-  input = FPSTR(_FORM_CLOCKMODE_REAL);
-  input.replace("{check}", (config.getString("appMode").equals("Realclock")) ? "checked" : "");
-  page += input;
-  input = FPSTR(_FORM_CLOCKMODE_FAST);
-  input.replace("{check}", (config.getString("appMode").equals("Fastclock")) ? "checked" : "");
-  page += input;
-  page += FPSTR(_FORM_UTC_OFFSET);
-  page += FPSTR(_FORM_CLOCKNAME);
-  page += FPSTR(_FORM_COLOR_HEADLINE);
-  input = FPSTR(_FORM_COLOR_BLUE);
-  input.replace("{check}", (config.getString("clockColor").equals("Blue")) ? "checked" : "");
-  page += input;
-  input = FPSTR(_FORM_COLOR_RED);
-  input.replace("{check}", (config.getString("clockColor").equals("Red")) ? "checked" : "");
-  page += input;
-  input = FPSTR(_FORM_COLOR_GREEN);
-  input.replace("{check}", (config.getString("clockColor").equals("Green")) ? "checked" : "");
-  page += input;
-  input = FPSTR(_FORM_COLOR_YELLOW);
-  input.replace("{check}", (config.getString("clockColor").equals("Yellow")) ? "checked" : "");
-  page += input;
-  input = FPSTR(_FORM_COLOR_WHITE);
-  input.replace("{check}", (config.getString("clockColor").equals("White")) ? "checked" : "");
-  page += input;
-  input = FPSTR(_FORM_BRIGHTNESS);
-  value = String(sevenSegmentClock.getBrightness());
-  input.replace("{bright}", value);
-  page += input;
-
-  input = FPSTR(_FORM_FASTCLOCK_INFO);
-  //value = String(ClockClient::getNumberOfKnownClocks());
-  value = String("unknown");
-  input.replace("{nfc}", value);
-  page += input;
-
-  page += FPSTR(_FORM_END);
-  page += FPSTR(_END);
-
-  server->sendHeader("Content-Length", String(page.length()));
-  server->send(200, "text/html", page);
-}
-
-void setRealClockTimeOffset(int offsetInMinutes) {
-  timeClient.setTimeOffset(offsetInMinutes * 60);
-}
-
-void appConfigSave() {
-  String page = FPSTR(_HEAD);
-
-  page.replace("{v}", "7Seg Config");
-  page += FPSTR(_SCRIPT);
-  page += FPSTR(_STYLE);
-  page += FPSTR(_HEAD_END);
-  page += String(F("<h1>"));
-  page += appName;
-  page += String(F("</h1>"));
-
-  debug.out(server->args(), DEBUG_MED_INFO); debug.outln(" arguments", DEBUG_MED_INFO);
-  for (int i=0; i<server->args(); ++i) {
-    debug.out(server->argName(i), DEBUG_MAX_INFO);
-    debug.out(": ", DEBUG_MAX_INFO);
-    debug.outln(server->arg(i), DEBUG_MAX_INFO);
-  }
-  if (server->hasArg("b")) {
-    sevenSegmentClock.setBrightness(server->arg("b").toInt());
-    page += F("<div>Set brightness to ");
-    page += server->arg("b");
-    page += F(".</div>");
-  }
-  if (server->hasArg("c")) {
-    String colorName = server->arg("c");
-    SevenSegmentClock::Color colorHandle = getColorHandleByName(server->arg("c"));
-    sevenSegmentClock.setColor(colorHandle);
-    page += F("<div>Set color to ");
-    page += server->arg("c");
-    page += F(".</div>");
-  }
-  if (server->hasArg("m")) {
-    debug.out("setting clock mode to ", DEBUG_MAX_INFO); debug.outln(server->arg("m"), DEBUG_MAX_INFO);
-    page += F("<div>Set clock mode to ");
-    page += server->arg("m");
-    page += F(".</div>");
-    if (server->arg("m").equals("real")) config.setString("appMode", MODE_REALCLOCK);
-    else if (server->arg("m").equals("fast")) config.setString("appMode", MODE_FASTCLOCK);
-    else if (server->arg("m").equals("demo")) config.setString("appMode", MODE_DEMO);
-    else {
-      debug.outln("ERROR: Unknown application mode, going into demo mode", DEBUG_ERROR);
-      config.setString("appMode", MODE_DEMO);
-      page += F("<div>ERROR: Unknown clockmode, using default: demo.</div>");
-    }
-  }
-  if (server->hasArg("utc")) {
-    page += F("<div>Set real clock offset to ");
-    int timeOffset;
-    if (server->arg("utc").equals("")) {
-      page += "120";
-      timeOffset = 120;
-    } else {
-      page += server->arg("utc");
-      timeOffset = server->arg("utc").toInt();
-    }
-    config.setInt("utcTimeOffsetMinutes", timeOffset);
-    setRealClockTimeOffset(timeOffset);
-    page += F(" minutes.</div>");
-  }
-  page += String(F("<div>Configuration updated.</div>"));
-  page += FPSTR(_CONFIG_LINK);
-  page += FPSTR(_END);
-  server->sendHeader("Content-Length", String(page.length()));
-  server->send(200, "text/html", page);
-}
 
 void setup() {
   debug.out(F("Starting *** "), DEBUG_MAX_INFO); debug.outln(appName, DEBUG_MAX_INFO);
   debug.out(F("Reset reason: "), DEBUG_MIN_INFO);
   debug.outln(ESP.getResetReason(), DEBUG_MIN_INFO);
 
-  //clean FS, for testing
-  //SPIFFS.format();
-
-  //read configuration from FS json
-  debug.outln(F("mounting FS..."), DEBUG_MAX_INFO);
-
-  if (SPIFFS.begin()) {
-    debug.outln(F("mounted file system"), DEBUG_MAX_INFO);
-    config.begin("main.cfg", mainConfig, sizeof(mainConfig)/sizeof(mainConfig[0]));
-  #if 0
-    if (SPIFFS.exists("/config.json")) {
-      //file exists, reading and loading
-      Serial.println("reading config file");
-      File configFile = SPIFFS.open("/config.json", "r");
-      if (configFile) {
-        Serial.println("opened config file");
-        size_t size = configFile.size();
-        // Allocate a buffer to store contents of the file.
-        std::unique_ptr<char[]> buf(new char[size]);
-
-        configFile.readBytes(buf.get(), size);
-        DynamicJsonDocument config(2048);
-        //JsonObject json = jsonBuffer.createObject();
-        DeserializationError error = deserializeJson(config, configFile);
-        serializeJson(config, Serial);
-        if (!error) {
-          Serial.println("\nparsed json");
-
-          //**strcpy(mqtt_server, json["mqtt_server"]);
-          //**strcpy(mqtt_port, json["mqtt_port"]);
-          //strcpy(blynk_token, json["blynk_token"]);
-
-          if (config["clock_name"]) {
-            strncpy(clockName, config["clock_name"], MAX_CLOCK_NAME_LEN);
-          } else {
-            Serial.println("no clock name in config");
-          }
-          if (config["clock_channel"]) {
-            strncpy(clockChannelString, config["clock_channel"], MAX_CLOCK_CHANNEL_STRING_LEN);
-          } else {
-            Serial.println("no clock channel in config");
-          }
-          if (config["clock_color"]) {
-            //strncpy(clockColor, config["clock_color"], MAX_CLOCK_COLOR_LEN);
-            clockColor = getColorHandle(config["clock_color"]);
-          } else {
-            Serial.println("no clock color in config");
-          }
-        } else {
-          Serial.println("failed to load json config, using defaults");
-          strncpy(clockName, DEFAULT_CLOCK_NAME, MAX_CLOCK_NAME_LEN);
-          strncpy(clockChannelString, DEFAULT_CLOCK_CHANNEL_STRING, MAX_CLOCK_CHANNEL_STRING_LEN);
-          //strncpy(clockColor, DEFAULT_CLOCK_COLOR, MAX_CLOCK_COLOR_LEN);
-          clockColor = getColorHandleByName(DEFAULT_CLOCK_COLOR);
-        }
-      }
-    } else {
-      Serial.println("no config file found");
-    }
-#endif
-  } else {
-    debug.outln(F("failed to mount FS"), DEBUG_ERROR);
-    config.begin("main.cfg", mainConfig, sizeof(mainConfig)/sizeof(mainConfig[0]));
-  }
-  //end read
-  // setupWifiConnection();
-
-  /*
-  radio.setClockChannel(clockChannel);
-  radio.setClockName(clockName);
-  radio.begin();
-  fastclock.begin();
-  pinMode(POWER_OFF_PIN, INPUT);
-  */
+  filesystem.begin();
+  config.begin("main.cfg", mainConfig, sizeof(mainConfig)/sizeof(mainConfig[0]));
   setupWifiConnection();
   debug.outln(F("Starting NTP Client"), DEBUG_MAX_INFO);
   timeClient.begin();
+  timeClient.setTimeOffset(config.getInt("utcTimeOffsetMinutes") * 60);
 
   debug.outln(F("Have following configuration:"), DEBUG_MAX_INFO);
-  //Serial.print("   Clock name: "); Serial.println(config.getString("clock_name"));
   debug.out(F("   App Mode: "), DEBUG_MAX_INFO); debug.outln(config.getString("appMode"), DEBUG_MAX_INFO);
   debug.out(F("   Clock color: "), DEBUG_MAX_INFO); debug.outln(config.getString("clockColor"), DEBUG_MAX_INFO);
   debug.out(F("   Brightness: "), DEBUG_MAX_INFO); debug.outln(config.getString("brightness"), DEBUG_MAX_INFO);
   debug.out(F("   Clock listen port: "), DEBUG_MAX_INFO); debug.outln(config.getString("listenPort"), DEBUG_MAX_INFO);
   debug.out(F("   Real time UTC offset: "), DEBUG_MAX_INFO); debug.outln(config.getString("utcTimeOffsetMinutes"), DEBUG_MAX_INFO);
 
-  setRealClockTimeOffset(config.getInt("utcTimeOffsetMinutes"));
-
   debug.outln(F("Starting fastclock ..."), DEBUG_MAX_INFO);
   fastclock.begin();
 
   debug.outln(F("Starting 7-segment clock display ..."), DEBUG_MAX_INFO);
   sevenSegmentClock.begin();
+  sevenSegmentClock.setBrightness(config.getInt("brightness"));
+  sevenSegmentClock.setColor(sevenSegmentClock.getColorHandleByName(config.getString("clockColor")));
 
-  // setting up web server for clock configuration
-  server = new ESP8266WebServer(80);
-  server->on("/config", HTTP_GET, appConfig);
-  server->on("/configsave", HTTP_GET, appConfigSave);
-  server->begin();
+  // setting up web server for clock configuration; intentionally very late
+  // as we need the web server during boot to be able to connect to/configure WiFi
+  webUI = new WebUI(debug, config, timeClient, fastclock, sevenSegmentClock);
+  webUI->begin();
 }
 
-int hours = 0, minutes = 0;
-uint32_t nextUpdate_ms = 0;
+static int hours = 0, minutes = 0;
+static uint32_t nextUpdate_ms = 0;
 
 void loop() {
   timeClient.update();
   fastclock.loop();
 
-  //Serial.println(timeClient.getFormattedTime());
-
   if (config.getString("appMode").equals(MODE_DEMO)) {
     if (millis() > nextUpdate_ms) {
       nextUpdate_ms = millis() + 1000;
@@ -445,11 +137,20 @@ void loop() {
       if (hours % 4 == 0) sevenSegmentClock.setBlinkMode(SevenSegmentClock::SeperatorBlinking); else sevenSegmentClock.setBlinkMode(SevenSegmentClock::NoBlinking);
     }
   } else if (config.getString("appMode").equals(MODE_REALCLOCK)) {
+    sevenSegmentClock.setClockHalted(!fastclock.isActive());
+    sevenSegmentClock.setBlinkMode(SevenSegmentClock::NoBlinking);
     sevenSegmentClock.displayTime(timeClient.getHours(), timeClient.getMinutes());
   } else if (config.getString("appMode").equals(MODE_FASTCLOCK)) {
+    sevenSegmentClock.setClockHalted(!fastclock.isActive());
+    if (fastclock.isActive()) {
+      sevenSegmentClock.setBlinkMode(SevenSegmentClock::NoBlinking);
+    } else {
+      sevenSegmentClock.setBlinkMode(SevenSegmentClock::DecimalPointColoredBlinking);
+    }
     sevenSegmentClock.displayTime(fastclock.getClockHours(), fastclock.getClockMinutes());
-  } else { debug.outln("ERROR: Unknown appMode found.", DEBUG_ERROR); }
+  } else { debug.outln(F("ERROR: Unknown appMode found."), DEBUG_ERROR); }
 
   sevenSegmentClock.displayUpdate();
-  server->handleClient();
+  webUI->loop();
+  filesystem.loop();
 }