dirk
/
7SegmentFastClockClient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: dirk:362e0760db12cbb1182d74736842b6ace2314896
Branches Tags
dirk:master
..
compare: dirk:b773437d45956c8e14d0bf76f76f3ada6ad963c2
Branches Tags
dirk:master

No commits in common. "362e0760db12cbb1182d74736842b6ace2314896" and "b773437d45956c8e14d0bf76f76f3ada6ad963c2" have entirely different histories.
362e0760db ... b773437d45

2 changed files with 17 additions and 41 deletions
Show Stats Expand all files Collapse all files

2
src/SevenSegmentClock.h
View File

@ -28,7 +28,7 @@ public:
void setBrightness(uint8_t b) { brightness=b; initColors(b); }; void setBrightness(uint8_t b) { brightness=b; initColors(b); };
uint8_t getBrightness(void) { return brightness; }; uint8_t getBrightness(void) { return brightness; };
private: private:
void init(void) { displayStatus = Off; clockHour=12; clockMinute=34; setClockHalted(true); currentColorHandle = Green; currentColor = green; }; void init(void) { displayStatus = Off; clockHour=12; clockMinute=34; setClockHalted(true); currentColorHandle = Blue; currentColor = blue; };
static uint8_t LedDataPin; static uint8_t LedDataPin;
static Adafruit_NeoPixel *strip; static Adafruit_NeoPixel *strip;
static BlinkMode blinkMode; static BlinkMode blinkMode;

56
src/main.cpp
View File

@ -18,12 +18,12 @@ WiFiUDP ntpUDP;
// You can specify the time server pool and the offset (in seconds, can be // You can specify the time server pool and the offset (in seconds, can be
// changed later with setTimeOffset() ). Additionaly you can specify the // changed later with setTimeOffset() ). Additionaly you can specify the
// update interval (in milliseconds, can be changed using setUpdateInterval() ). // update interval (in milliseconds, can be changed using setUpdateInterval() ).
NTPClient timeClient(ntpUDP, "europe.pool.ntp.org", 7200, 60000); NTPClient timeClient(ntpUDP, "europe.pool.ntp.org", 3600, 60000);
#define MODE_DEMO 1 #define MODE_DEMO 1
#define MODE_REALCLOCK 2 #define MODE_REALCLOCK 2
#define MODE_FASTCLOCK 3 #define MODE_FASTCLOCK 3
static int appMode = MODE_REALCLOCK; static int appMode = MODE_REAL;
@ -35,7 +35,7 @@ static const char *appName = "FastclockClient7Seg";
#define DEFAULT_CLOCK_NAME "fastclk" #define DEFAULT_CLOCK_NAME "fastclk"
#define DEFAULT_CLOCK_CHANNEL_STRING "1" #define DEFAULT_CLOCK_CHANNEL_STRING "1"
#define DEFAULT_CLOCK_CHANNEL 1 #define DEFAULT_CLOCK_CHANNEL 1
#define DEFAULT_CLOCK_COLOR "green" #define DEFAULT_CLOCK_COLOR "blue"
SevenSegmentClock sevenSegmentClock; SevenSegmentClock sevenSegmentClock;
ESP8266WebServer *server; ESP8266WebServer *server;
@ -81,7 +81,7 @@ static const SevenSegmentClock::Color getColorHandle(uint8_t id) {
return colorSelection[i].colorHandle; return colorSelection[i].colorHandle;
} }
} }
return SevenSegmentClock::Green; // default return SevenSegmentClock::Blue; // default
} }
static const SevenSegmentClock::Color getColorHandleByName(String name) { static const SevenSegmentClock::Color getColorHandleByName(String name) {
@ -90,10 +90,10 @@ static const SevenSegmentClock::Color getColorHandleByName(String name) {
return colorSelection[i].colorHandle; return colorSelection[i].colorHandle;
} }
} }
return SevenSegmentClock::Green; // default return SevenSegmentClock::Blue; // default
} }
#define DEFAULT_COLOR SevenSegmentClock::Green #define DEFAULT_COLOR SevenSegmentClock::Blue
#define DEFAULT_BRIGHTNESS 31 #define DEFAULT_BRIGHTNESS 31
char clockName[MAX_CLOCK_NAME_LEN+1] = DEFAULT_CLOCK_NAME; char clockName[MAX_CLOCK_NAME_LEN+1] = DEFAULT_CLOCK_NAME;
@ -101,7 +101,7 @@ char clockChannelString[MAX_CLOCK_CHANNEL_STRING_LEN+1] = DEFAULT_CLOCK_CHANNEL_
uint8_t clockChannel = DEFAULT_CLOCK_CHANNEL; uint8_t clockChannel = DEFAULT_CLOCK_CHANNEL;
SevenSegmentClock::Color clockColor = DEFAULT_COLOR; SevenSegmentClock::Color clockColor = DEFAULT_COLOR;
//uint8_t brightness = DEFAULT_BRIGHTNESS; //uint8_t brightness = DEFAULT_BRIGHTNESS;
int utcTimeOffsetMinutes = 120; // default UTC+2h
//flag for saving data //flag for saving data
bool shouldSaveConfig = false; bool shouldSaveConfig = false;
@ -196,7 +196,6 @@ 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_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_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_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_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_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_BLUE[] PROGMEM = "<input class='r' id='cb' name='c' type='radio' value='blue' {check}><label for='cb'>Blue</label><br/>";
@ -236,7 +235,6 @@ void appConfig() {
input = FPSTR(_FORM_CLOCKMODE_FAST); input = FPSTR(_FORM_CLOCKMODE_FAST);
input.replace("{check}", (appMode == MODE_FASTCLOCK) ? "checked" : ""); input.replace("{check}", (appMode == MODE_FASTCLOCK) ? "checked" : "");
page += input; page += input;
page += FPSTR(_FORM_UTC_OFFSET);
page += FPSTR(_FORM_CLOCKNAME); page += FPSTR(_FORM_CLOCKNAME);
page += FPSTR(_FORM_COLOR_HEADLINE); page += FPSTR(_FORM_COLOR_HEADLINE);
input = FPSTR(_FORM_COLOR_BLUE); input = FPSTR(_FORM_COLOR_BLUE);
@ -269,14 +267,6 @@ void appConfig() {
void appConfigSave() { void appConfigSave() {
String page = FPSTR(_HEAD); 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>"));
Serial.print("appConfigSave "); Serial.print(server->args()); Serial.println(" arguments"); Serial.print("appConfigSave "); Serial.print(server->args()); Serial.println(" arguments");
for (int i=0; i<server->args(); ++i) { for (int i=0; i<server->args(); ++i) {
Serial.print(server->argName(i)); Serial.print(server->argName(i));
@ -285,44 +275,30 @@ void appConfigSave() {
} }
if (server->hasArg("b")) { if (server->hasArg("b")) {
sevenSegmentClock.setBrightness(server->arg("b").toInt()); sevenSegmentClock.setBrightness(server->arg("b").toInt());
page += F("<div>Set brightness to ");
page += server->arg("b");
page += F(".</div>");
} }
if (server->hasArg("c")) { if (server->hasArg("c")) {
String colorName = server->arg("c"); String colorName = server->arg("c");
SevenSegmentClock::Color colorHandle = getColorHandleByName(server->arg("c")); SevenSegmentClock::Color colorHandle = getColorHandleByName(server->arg("c"));
sevenSegmentClock.setColor(colorHandle); sevenSegmentClock.setColor(colorHandle);
page += F("<div>Set color to ");
page += server->arg("c");
page += F(".</div>");
} }
if (server->hasArg("m")) { if (server->hasArg("m")) {
Serial.print("setting clock mode to "); Serial.println(server->arg("m")); Serial.print("setting clock mode to "); Serial.println(server->arg("m"));
page += F("<div>Set clock mode to ");
page += server->arg("m");
page += F(".</div>");
if (server->arg("m").equals("real")) appMode = MODE_REALCLOCK; if (server->arg("m").equals("real")) appMode = MODE_REALCLOCK;
else if (server->arg("m").equals("fast")) appMode = MODE_FASTCLOCK; else if (server->arg("m").equals("fast")) appMode = MODE_FASTCLOCK;
else if (server->arg("m").equals("demo")) appMode = MODE_DEMO; else if (server->arg("m").equals("demo")) appMode = MODE_DEMO;
else { else {
Serial.println("ERROR: Unknown application mode, going into demo mode"); Serial.println("ERROR: Unknown application mode, going into demo mode");
appMode = MODE_DEMO; appMode = MODE_DEMO;
page += F("<div>ERROR: Unknown clockmode, using default: demo.</div>");
} }
} }
if (server->hasArg("utc")) { page.replace("{v}", "7Seg Config");
page += F("<div>Set real clock offset to "); page += FPSTR(_SCRIPT);
if (server->arg("utc").equals("")) { page += FPSTR(_STYLE);
page += "120"; //page += _customHeadElement;
utcTimeOffsetMinutes = 120; page += FPSTR(_HEAD_END);
} else { page += String(F("<h1>"));
page += server->arg("utc"); page += appName;
utcTimeOffsetMinutes = server->arg("utc").toInt(); page += String(F("</h1>"));
}
timeClient.setTimeOffset(utcTimeOffsetMinutes);
page += F(" minutes.</div>");
}
page += String(F("<div>Configuration updated.</div>")); page += String(F("<div>Configuration updated.</div>"));
page += FPSTR(_END); page += FPSTR(_END);
server->sendHeader("Content-Length", String(page.length())); server->sendHeader("Content-Length", String(page.length()));
@ -401,7 +377,7 @@ void setup() {
strncpy(clockName, DEFAULT_CLOCK_NAME, MAX_CLOCK_NAME_LEN); strncpy(clockName, DEFAULT_CLOCK_NAME, MAX_CLOCK_NAME_LEN);
strncpy(clockChannelString, DEFAULT_CLOCK_CHANNEL_STRING, MAX_CLOCK_CHANNEL_STRING_LEN); strncpy(clockChannelString, DEFAULT_CLOCK_CHANNEL_STRING, MAX_CLOCK_CHANNEL_STRING_LEN);
//strncpy(clockColor, DEFAULT_CLOCK_COLOR, MAX_CLOCK_COLOR_LEN); //strncpy(clockColor, DEFAULT_CLOCK_COLOR, MAX_CLOCK_COLOR_LEN);
clockColor = getColorHandleByName(DEFAULT_CLOCK_COLOR); clockColor = SevenSegmentClock::Blue;
} }
} }
} else { } else {