Configuration via Web-Interface introduced. Can change color and brightness.

This commit is contained in:
Dirk Jahnke 2019-06-04 20:41:41 +02:00
parent c3b80e668b
commit 4f28b11cf7
3 changed files with 247 additions and 31 deletions

View File

@ -112,6 +112,8 @@ static const unsigned char PROGMEM charMapping[] = {
/* || */ Seg_a + Seg_c + Seg_e + Seg_g
};
uint8_t SevenSegmentClock::brightness;
void SevenSegmentClock::displaySegment(unsigned int ledAddress, uint32_t color) {
//Serial.print("displaySegment led="); Serial.print(ledAddress); Serial.print(" color=0x"); Serial.println(color, HEX);
for (int i=0; i<LedsPerSegment; i++) {
@ -273,8 +275,8 @@ void SevenSegmentClock::displayUpdate(void) {
break;
}
strip->show();
Serial.print("Shown: "); Serial.print(displayText[0]); Serial.print(displayText[1]);
Serial.print(':'); Serial.print(displayText[2]); Serial.println(displayText[3]);
//Serial.print("Shown: "); Serial.print(displayText[0]); Serial.print(displayText[1]);
//Serial.print(':'); Serial.print(displayText[2]); Serial.println(displayText[3]);
lastUpdate_ms = millis();
}
}
@ -283,6 +285,26 @@ uint32_t SevenSegmentClock::red, SevenSegmentClock::green, SevenSegmentClock::bl
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::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;
}
}
void SevenSegmentClock::begin(void) {
Serial.println("Init Neopixels ...");
Serial.print("LED pin="); Serial.println(LedDataPin);
@ -291,10 +313,7 @@ void SevenSegmentClock::begin(void) {
strip->begin();
strip->clear();
strip->show();
SevenSegmentClock::red = strip->Color(colorSaturation, 0, 0);
SevenSegmentClock::green = strip->Color(0, colorSaturation, 0);
SevenSegmentClock::blue = strip->Color(0, 0, colorSaturation);
SevenSegmentClock::white = strip->Color(colorSaturation, colorSaturation, colorSaturation);
SevenSegmentClock::black = strip->Color(0, 0, 0);
initColors(colorSaturation);
SevenSegmentClock::currentColor = SevenSegmentClock::blue;
SevenSegmentClock::currentColorHandle = SevenSegmentClock::Blue;
}

View File

@ -19,20 +19,28 @@ public:
enum BlinkMode { NoBlinking, ClockBlinking, SeperatorBlinking, DecimalPointBlinking };
void setBlinkMode(BlinkMode _blinkMode) { blinkMode = _blinkMode; };
void setClockHalted(bool halted) { clockHalted = halted; };
enum Color { Black, Red, Green, Blue, White };
void setColor(Color color);
Color getColor(void) { return currentColorHandle; };
static uint32_t red, green, blue, white, black;
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); };
uint8_t getBrightness(void) { return brightness; };
private:
void init(void) { displayStatus = Off; clockHour=12; clockMinute=34; setClockHalted(true); };
void init(void) { displayStatus = Off; clockHour=12; clockMinute=34; setClockHalted(true); currentColorHandle = Blue; currentColor = blue; };
static uint8_t LedDataPin;
static Adafruit_NeoPixel *strip;
static BlinkMode blinkMode;
static uint8_t brightness;
ClockDisplayStatus displayStatus;
int clockHour;
int clockMinute;
bool clockHalted;
Color currentColorHandle;
uint32_t currentColor;
void displaySegment(unsigned int ledAddress, uint32_t color);
void initColors(uint8_t _brightness);
};
#endif

View File

@ -11,21 +11,81 @@
#include <SPI.h>
#include "SevenSegmentClock.h"
#define USE_CONFIG false
static const char *appName = "FastclockClient7Seg";
#define MAX_CLOCK_NAME_LEN 16
#define MAX_CLOCK_CHANNEL_STRING_LEN 3
#define MAX_CLOCK_COLOR_LEN 16
#define DEFAULT_CLOCK_NAME "fastclk"
#define DEFAULT_CLOCK_CHANNEL_STRING "1"
#define DEFAULT_CLOCK_CHANNEL 1
#define DEFAULT_CLOCK_COLOR "blue"
SevenSegmentClock sevenSegmentClock;
ESP8266WebServer *server;
char static_ip[16] = "10.0.1.56";
char static_gw[16] = "10.0.1.1";
char static_sn[16] = "255.255.255.0";
char clockName[MAX_CLOCK_NAME_LEN+1] = "fastclk";
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" }
};
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::Blue; // default
}
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::Blue; // default
}
#define DEFAULT_COLOR SevenSegmentClock::Blue
#define DEFAULT_BRIGHTNESS 31
char clockName[MAX_CLOCK_NAME_LEN+1] = DEFAULT_CLOCK_NAME;
char clockChannelString[MAX_CLOCK_CHANNEL_STRING_LEN+1] = DEFAULT_CLOCK_CHANNEL_STRING;
uint8_t clockChannel = DEFAULT_CLOCK_CHANNEL;
SevenSegmentClock::Color clockColor = DEFAULT_COLOR;
//uint8_t brightness = DEFAULT_BRIGHTNESS;
//flag for saving data
bool shouldSaveConfig = false;
@ -61,10 +121,12 @@ void setupWifiConnection() {
//set minimu quality of signal so it ignores AP's under that quality
//defaults to 8%
wifiManager.setMinimumSignalQuality();
wifiManager.setMinimumSignalQuality(15);
Serial.println("Starting autoConnect ...");
if (!wifiManager.autoConnect("FastclockClient7Seg", "password")) {
//if (!wifiManager.autoConnect("FastclockClient7Seg", "password")) {
//if (!wifiManager.autoConnect("fc7seg", "password")) {
if (!wifiManager.autoConnect("fc7seg")) {
Serial.println("failed to connect and hit timeout");
delay(3000);
//reset and try again, or maybe put it to deep sleep
@ -76,42 +138,132 @@ void setupWifiConnection() {
Serial.println("connected...yeey :)");
//save the custom parameters to FS
#if USE_CONFIG
if (shouldSaveConfig) {
Serial.println("saving config");
DynamicJsonDocument jsonBuffer(2048);
JsonObject json = jsonBuffer.createObject();
//**json["mqtt_server"] = mqtt_server;
//**json["mqtt_port"] = mqtt_port;
//json["blynk_token"] = blynk_token;
DynamicJsonDocument config(2048);
//JsonObject json = jsonBuffer.createObject();
config["clock_name"] = clockName;
config["clock_channel"] = clockChannelString;
config["clock_color"] = clockColor;
/*
json["ip"] = WiFi.localIP().toString();
json["gateway"] = WiFi.gatewayIP().toString();
json["subnet"] = WiFi.subnetMask().toString();
*/
File configFile = SPIFFS.open("/config.json", "w");
if (!configFile) {
Serial.println("failed to open config file for writing");
}
serializeJsonPretty(json, Serial);
serializeJson(json, configFile);
serializeJsonPretty(config, Serial);
serializeJson(config, configFile);
configFile.close();
//end save
}
#endif
Serial.print("local ip: "); Serial.println(WiFi.localIP());
Serial.print("gateway: "); Serial.println(WiFi.gatewayIP());
Serial.print("subnet: "); Serial.println(WiFi.subnetMask());
}
void setup() {
// if coming from deep sleep, we just go to sleep again
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'><label for='n'>Fastclock name</label><input id='n' name='n' length=32 placeholder='clock name'><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_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_END[] PROGMEM = "<br/><button type='submit'>save</button></form>";
const char _SCAN_LINK[] PROGMEM = "<br/><div class=\"c\"><a href=\"/wifi\">Scan</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>";
// put your setup code here, to run once:
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_COLOR_HEADLINE);
input = FPSTR(_FORM_COLOR_BLUE);
input.replace("{check}", (clockColor == SevenSegmentClock::Blue) ? "checked" : "");
page += input;
input = FPSTR(_FORM_COLOR_RED);
input.replace("{check}", (clockColor == SevenSegmentClock::Red) ? "checked" : "");
page += input;
input = FPSTR(_FORM_COLOR_GREEN);
input.replace("{check}", (clockColor == SevenSegmentClock::Green) ? "checked" : "");
page += input;
input = FPSTR(_FORM_COLOR_WHITE);
input.replace("{check}", (clockColor == SevenSegmentClock::White) ? "checked" : "");
page += input;
input = FPSTR(_FORM_BRIGHTNESS);
value = String(sevenSegmentClock.getBrightness());
input.replace("{bright}", value);
page += input;
page += FPSTR(_FORM_END);
page += FPSTR(_END);
server->sendHeader("Content-Length", String(page.length()));
server->send(200, "text/html", page);
}
void appConfigSave() {
String page = FPSTR(_HEAD);
Serial.print("appConfigSave "); Serial.print(server->args()); Serial.println(" arguments");
for (int i=0; i<server->args(); ++i) {
Serial.print(server->argName(i));
Serial.print(": ");
Serial.println(server->arg(i));
}
if (server->hasArg("b")) {
sevenSegmentClock.setBrightness(server->arg("b").toInt());
}
if (server->hasArg("c")) {
String colorName = server->arg("c");
SevenSegmentClock::Color colorHandle = getColorHandleByName(server->arg("c"));
sevenSegmentClock.setColor(colorHandle);
}
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("<div>Configuration updated.</div>"));
page += FPSTR(_END);
server->sendHeader("Content-Length", String(page.length()));
server->send(200, "text/html", page);
}
void setup() {
Serial.begin(115200);
Serial.println("---");
Serial.print("Starting *** "); Serial.println(appName);
Serial.print("Reset reason: ");
Serial.println(ESP.getResetReason());
//clean FS, for testing
@ -122,7 +274,6 @@ void setup() {
if (SPIFFS.begin()) {
Serial.println("mounted file system");
#if USE_CONFIG
if (SPIFFS.exists("/config.json")) {
//file exists, reading and loading
Serial.println("reading config file");
@ -134,10 +285,10 @@ void setup() {
std::unique_ptr<char[]> buf(new char[size]);
configFile.readBytes(buf.get(), size);
DynamicJsonDocument jsonBuffer(2048);
JsonObject json = jsonBuffer.createObject();
DeserializationError error = deserializeJson(jsonBuffer, json);
serializeJson(json, Serial);
DynamicJsonDocument config(2048);
//JsonObject json = jsonBuffer.createObject();
DeserializationError error = deserializeJson(config, configFile);
serializeJson(config, Serial);
if (!error) {
Serial.println("\nparsed json");
@ -145,6 +296,23 @@ void setup() {
//**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");
}
#if 0
if (json["ip"]) {
Serial.print("setting custom ip from config: ");
//**strcpy(static_ip, json["ip"]);
@ -157,12 +325,18 @@ void setup() {
} else {
Serial.println("no custom ip in config");
}
} else {
Serial.println("failed to load json config");
}
}
}
#endif
} 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 = SevenSegmentClock::Blue;
}
}
} else {
Serial.println("no config file found");
}
} else {
Serial.println("failed to mount FS");
}
@ -177,7 +351,21 @@ void setup() {
fastclock.begin();
pinMode(POWER_OFF_PIN, INPUT);
*/
setupWifiConnection();
Serial.println("Have following configuration:");
Serial.print(" Clock name: "); Serial.println(clockName);
Serial.print(" Clock channel: "); Serial.println(clockChannelString);
Serial.print(" Clock color: "); Serial.println(getColorName(clockColor));
Serial.println("Starting 7-segment clock display ...");
sevenSegmentClock.begin();
// 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();
}
int hours = 0, minutes = 0;
@ -194,4 +382,5 @@ void loop() {
if (hours % 4 == 0) sevenSegmentClock.setBlinkMode(SevenSegmentClock::SeperatorBlinking); else sevenSegmentClock.setBlinkMode(SevenSegmentClock::NoBlinking);
}
sevenSegmentClock.displayUpdate();
server->handleClient();
}