iotwebconf 3.0.0 migration
This commit is contained in:
coelner
parent
1d98379395
commit
907cd7b6ab
@ -6,6 +6,15 @@
|
||||
|
||||
#include <NeoPixelBrightnessBus.h>
|
||||
#include <IotWebConf.h>
|
||||
#include <IotWebConfUsing.h>
|
||||
// UpdateServer includes
|
||||
#ifdef ESP8266
|
||||
# include <ESP8266HTTPUpdateServer.h>
|
||||
#elif defined(ESP32)
|
||||
// For ESP32 IotWebConf provides a drop-in replacement for UpdateServer.
|
||||
# include <IotWebConfESP32HTTPUpdateServer.h>
|
||||
#endif
|
||||
|
||||
|
||||
#define MOD(a,b) ((((a)%(b))+(b))%(b))
|
||||
/* Model I
|
||||
@ -15,7 +24,6 @@
|
||||
over a 56k voltage divider . Dark (0.5MOhm) , 10Lux (5-10kOhm)
|
||||
*/
|
||||
#define LDR_PIN A6
|
||||
|
||||
#define NUM_LEDS 60
|
||||
#define COLOR_ORDER GRB
|
||||
#define DATA_PIN 17
|
||||
@ -44,7 +52,7 @@ RgbwColor blue(0, 0, colorSaturation, 0);
|
||||
RgbwColor realWhite(colorSaturation);
|
||||
RgbColor white(0, 0, 0, 40); //darkish dirt
|
||||
RgbwColor whiter(0, 0, 0, 120); //darkish dirt
|
||||
RgbwColor white12(0,0,0,192); //darkish dirt
|
||||
RgbwColor white12(0, 0, 0, 192); //darkish dirt
|
||||
RgbwColor black(0);
|
||||
RgbwColor gold(HtmlColor( 0xFFD700 ) );
|
||||
RgbwColor orangered(HtmlColor( 0xFF4500 ) );
|
||||
@ -55,7 +63,7 @@ RgbwColor temp;
|
||||
#define MINIMAL_BRIGHTNESS 20
|
||||
#define LDR_SCALE 16
|
||||
#define colorSaturation 192
|
||||
//NeoPixelBrightnessBus<NeoGrbFeature, Neo800KbpsMethod> strip(NUM_LEDS, DATA_PIN);
|
||||
//NeoPixelBrightnessBus<NeoGrbFeature, Neo800KbpsMethod> strip(NUM_LEDS, DATA_PIN); //ws2812B
|
||||
NeoPixelBrightnessBus<NeoGrbFeature, NeoEsp32I2s1800KbpsMethod> strip(NUM_LEDS, DATA_PIN);
|
||||
RgbColor red(colorSaturation, 0, 0);
|
||||
RgbColor green(0, colorSaturation, 0);
|
||||
@ -79,7 +87,7 @@ const int daylightOffset_sec = 3600;
|
||||
struct tm timeinfo;
|
||||
volatile int currentSec = 59;
|
||||
volatile int currentMin = 1;
|
||||
volatile int currentHour = 1;
|
||||
volatile int currentHour = 2;
|
||||
|
||||
// variable for storing the potentiometer value
|
||||
volatile unsigned int ldrValue = 0;
|
||||
@ -88,27 +96,65 @@ int MAX_BRIGHTNESS = 200;
|
||||
// WebPortal
|
||||
const char thingName[] = "NTP-Clock-RGBLED";
|
||||
const char wifiInitialApPassword[] = "12345678";
|
||||
//ToDo add internal LED and check visibility
|
||||
#define STRING_LEN 63
|
||||
#define NUMBER_LEN 4
|
||||
// -- Configuration specific key. The value should be modified if config structure was changed.
|
||||
#define CONFIG_VERSION "dem3"
|
||||
#define CONFIG_VERSION "dem6"
|
||||
|
||||
// -- Javascript block will be added to the header. 🔒 🔓
|
||||
const char CUSTOMHTML_SCRIPT_INNER[] PROGMEM = "\n\
|
||||
document.addEventListener('DOMContentLoaded', function(event) {\n\
|
||||
let elements = document.querySelectorAll('input[type=\"password\"]');\n\
|
||||
for (let p of elements) {\n\
|
||||
let btn = document.createElement('INPUT'); btn.type = 'button'; btn.value = 'show'; btn.style.width = 'auto'; p.style.width = '83%'; p.parentNode.insertBefore(btn,p.nextSibling);\n\
|
||||
btn.onclick = function() { if (p.type === 'password') { p.type = 'text'; btn.value = 'hide'; } else { p.type = 'password'; btn.value = 'show'; } }\n\
|
||||
};\n\
|
||||
});\n";
|
||||
//const char CUSTOMHTML_BODY_INNER[] PROGMEM = " <link rel='icon' src='data:image/png;base64,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'/>";
|
||||
DNSServer dnsServer;
|
||||
WebServer server(80);
|
||||
#ifdef ESP8266
|
||||
ESP8266HTTPUpdateServer httpUpdater;
|
||||
#elif defined(ESP32)
|
||||
HTTPUpdateServer httpUpdater;
|
||||
#endif
|
||||
|
||||
char ntpServerParamValue[STRING_LEN] = "pool.ntp.org";
|
||||
char maxBrightnessParamValue[NUMBER_LEN] = "100";
|
||||
char ntpServerParamValue[STRING_LEN];
|
||||
char maxBrightnessParamValue[NUMBER_LEN];
|
||||
char singleSecondParamValue[STRING_LEN];
|
||||
char allDotsOnParamValue[STRING_LEN];
|
||||
char followingHourParamValue[STRING_LEN];
|
||||
|
||||
IotWebConf iotWebConf(thingName, &dnsServer, &server, wifiInitialApPassword, CONFIG_VERSION);
|
||||
IotWebConfParameterGroup timeGroup = IotWebConfParameterGroup("Time", "Time Settings");
|
||||
IotWebConfTextParameter ntpServerParam = IotWebConfTextParameter("NTP Server", "ntpServer", ntpServerParamValue, STRING_LEN, "pool.ntp.org");
|
||||
IotWebConfParameterGroup ledGroup = IotWebConfParameterGroup("LED", "LED settings");
|
||||
IotWebConfNumberParameter maxBrightnessParam = IotWebConfNumberParameter("Max BRIGHTNESS", "max brightness", maxBrightnessParamValue, NUMBER_LEN, "200", "20..254", "min='20' max='254' step='1'");
|
||||
IotWebConfCheckboxParameter singleSecondParam = IotWebConfCheckboxParameter("Show Seconds", "singleSecond", singleSecondParamValue, STRING_LEN, true);
|
||||
IotWebConfCheckboxParameter allDotsOnParam = IotWebConfCheckboxParameter("all Dots lighten on", "allDotsOn", allDotsOnParamValue, STRING_LEN, true);
|
||||
IotWebConfCheckboxParameter followingHourParam = IotWebConfCheckboxParameter("following Hour", "followingHour", followingHourParamValue, STRING_LEN, true);
|
||||
|
||||
IotWebConfParameter ntpServerParam = IotWebConfParameter("NTP Server", "ntpServer", ntpServerParamValue, STRING_LEN, "text", "pool.ntp.org", "pool.ntp.org");
|
||||
IotWebConfSeparator separator1 = IotWebConfSeparator("LED settings");
|
||||
IotWebConfParameter maxBrightnessParam = IotWebConfParameter("Max BRIGHTNESS", "max brightness", maxBrightnessParamValue, NUMBER_LEN, "number", "20..254", "200", "min='20' max='254' step='1'");
|
||||
//IotWebConfParameter singleSecondParam = IotWebConfParameter("Show Seconds", "singleSecond", singleSecondParamValue, STRING_LEN, "text", "Yes", "Yes");
|
||||
//IotWebConfParameter allDotsOnParam = IotWebConfParameter("all Dots lighten on", "allDotsOn", allDotsOnParamValue, STRING_LEN, "text", "Yes", "Yes");
|
||||
//IotWebConfParameter followingHourParam = IotWebConfParameter("following Hour", "followingHour ", followingHourParamValue, STRING_LEN, "text", "Yes", "Yes");
|
||||
|
||||
//Version3.X.X IotWebConfCheckboxParameter checkboxParam = IotWebConfCheckboxParameter("Check param", "checkParam", checkboxParamValue, STRING_LEN, true);
|
||||
class CustomHtmlFormatProvider : public iotwebconf::HtmlFormatProvider
|
||||
{
|
||||
protected:
|
||||
String getScriptInner() override
|
||||
{
|
||||
return
|
||||
HtmlFormatProvider::getScriptInner() +
|
||||
String(FPSTR(CUSTOMHTML_SCRIPT_INNER));
|
||||
}
|
||||
/*
|
||||
String getBodyInner() override
|
||||
{
|
||||
return
|
||||
String(FPSTR(CUSTOMHTML_BODY_INNER)) +
|
||||
HtmlFormatProvider::getBodyInner();
|
||||
}
|
||||
*/
|
||||
};
|
||||
// -- An instance must be created from the class defined above.
|
||||
CustomHtmlFormatProvider customHtmlFormatProvider;
|
||||
|
||||
//ToDo color Picker Second, 12Clock, Minute, Hour
|
||||
|
||||
@ -137,20 +183,19 @@ String printLocalTime() {
|
||||
/**
|
||||
Handle web requests to "/" path.
|
||||
*/
|
||||
void handleRoot() {
|
||||
void iotWebConfHandleRoot() {
|
||||
// -- Let IotWebConf test and handle captive portal requests.
|
||||
if (iotWebConf.handleCaptivePortal())
|
||||
{
|
||||
// -- Captive portal request were already served.
|
||||
return;
|
||||
}
|
||||
//char timeStringBuff[50]; //50 chars should be enough
|
||||
//strftime(timeStringBuff, sizeof(timeStringBuff), "%A, %B %d %Y %H:%M:%S", &timeinfo);
|
||||
|
||||
String s = "<!DOCTYPE html><html lang=\"en\"><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\"/>";
|
||||
s += "<meta http-equiv=\"refresh\" content=\"30\">";
|
||||
s += "<meta charset=\"UTF-8\">";
|
||||
s += "<title>RGB LED Clock</title></head><body>RGB LED Clock";
|
||||
//s += CUSTOMHTML_BODY_INNER;
|
||||
s += "<title>RGB LED Clock</title></head><body>";
|
||||
s += "RGB LED Clock";
|
||||
s += "<p>";
|
||||
s += "<table>";
|
||||
s += "<tr><td>Current Time:</td><td>";
|
||||
@ -172,19 +217,26 @@ void handleRoot() {
|
||||
s += "Go to <a href='config'>configure page</a> to change values.";
|
||||
s += "</body></html>\n";
|
||||
|
||||
server.send(200, "text/html", s);
|
||||
server.send(200, "text/html; charset=UTF-8", s);
|
||||
}
|
||||
|
||||
void configSaved()
|
||||
void iotWebConfConfigSaved()
|
||||
{
|
||||
//ToDo ntpServerParamValue;
|
||||
MAX_BRIGHTNESS = atoi(maxBrightnessParamValue);
|
||||
singleSecond = singleSecondParam.isChecked() ? true : false;
|
||||
//Serial.println(singleSecondParam.isChecked() ? "true" : "false");
|
||||
allDotsOn = allDotsOnParam.isChecked() ? true : false;
|
||||
//Serial.println(allDotsOnParam.isChecked() ? "true" : "false");
|
||||
followingHour = followingHourParam.isChecked() ? true : false;
|
||||
//Serial.println(followingHourParam.isChecked() ? "true" : "false");
|
||||
Serial.println("Configuration was updated.");
|
||||
|
||||
}
|
||||
|
||||
boolean formValidator()
|
||||
boolean iotWebConfFormValidator()
|
||||
{
|
||||
|
||||
Serial.println("Validating form.");
|
||||
boolean valid = true;
|
||||
|
||||
@ -199,32 +251,35 @@ boolean formValidator()
|
||||
{
|
||||
valid = false;
|
||||
}
|
||||
|
||||
return valid;
|
||||
}
|
||||
|
||||
void iotWebConf_Setup() {
|
||||
iotWebConf.addParameter(&ntpServerParam);
|
||||
iotWebConf.addParameter(&separator1);
|
||||
iotWebConf.addParameter(&maxBrightnessParam);
|
||||
/*
|
||||
iotWebConf.addParameter(&separator1);
|
||||
iotWebConf.addParameter(&singleSecondParam);
|
||||
iotWebConf.addParameter(&separator1);
|
||||
iotWebConf.addParameter(&allDotsOnParam);
|
||||
iotWebConf.addParameter(&separator1);
|
||||
iotWebConf.addParameter(&followingHourParam);
|
||||
*/
|
||||
iotWebConf.setConfigSavedCallback(&configSaved);
|
||||
iotWebConf.setWifiConnectionCallback(&syncNTP); //NTP call after connection established
|
||||
iotWebConf.setFormValidator(&formValidator);
|
||||
iotWebConf.getApTimeoutParameter()->visible = true;
|
||||
|
||||
timeGroup.addItem(&ntpServerParam);
|
||||
|
||||
ledGroup.addItem(&maxBrightnessParam);
|
||||
ledGroup.addItem(&singleSecondParam);
|
||||
ledGroup.addItem(&allDotsOnParam);
|
||||
ledGroup.addItem(&followingHourParam);
|
||||
|
||||
iotWebConf.addParameterGroup(&timeGroup);
|
||||
iotWebConf.addParameterGroup(&ledGroup);
|
||||
|
||||
iotWebConf.setConfigSavedCallback(&iotWebConfConfigSaved);
|
||||
iotWebConf.setWifiConnectionCallback(&syncNTP); //NTP call after connection established
|
||||
iotWebConf.setFormValidator(&iotWebConfFormValidator);
|
||||
iotWebConf.getApTimeoutParameter()->visible = true;
|
||||
iotWebConf.setupUpdateServer(
|
||||
[](const char* updatePath) { httpUpdater.setup(&server, updatePath); },
|
||||
[](const char* userName, char* password) { httpUpdater.updateCredentials(userName, password); });
|
||||
|
||||
iotWebConf.setHtmlFormatProvider(&customHtmlFormatProvider);
|
||||
// -- Initializing the configuration.
|
||||
iotWebConf.init();
|
||||
|
||||
// -- Set up required URL handlers on the web server.
|
||||
server.on("/", handleRoot);
|
||||
server.on("/", iotWebConfHandleRoot);
|
||||
server.on("/config", [] { iotWebConf.handleConfig(); });
|
||||
server.onNotFound([]() {
|
||||
iotWebConf.handleNotFound();
|
||||
@ -252,7 +307,6 @@ void syncNTP() {
|
||||
}
|
||||
|
||||
void setup() {
|
||||
|
||||
pinMode(LDR_PIN, INPUT_PULLUP);
|
||||
pinMode(DATA_PIN, OUTPUT);
|
||||
|
||||
@ -265,7 +319,7 @@ void setup() {
|
||||
Serial.println("-----------------------\nSettings\n-----------------------");
|
||||
Serial.printf("Show single second: \t%s\n", singleSecond ? "yes" : "no");
|
||||
Serial.printf("Lighten up all LEDs: \t%s\n", allDotsOn ? "yes" : "no");
|
||||
Serial.printf("Following Hour: \t%s\n\n", followingHour? "yes" : "no");
|
||||
Serial.printf("Following Hour: \t%s\n\n", followingHour ? "yes" : "no");
|
||||
|
||||
strip.Begin();
|
||||
strip.SetBrightness( MINIMAL_BRIGHTNESS );
|
||||
|
||||
31
README.md
31
README.md
@ -0,0 +1,31 @@
|
||||
# Anleitung RGB LED Uhr
|
||||
|
||||
Dies ist eine Beschreibung der RGB LED Uhr
|
||||
# Schnellstart
|
||||
Sobald die Uhr mit Strom versorgt wird ( 5V, 500mAh) bietet das Board (Lolin32lite) einen WiFi Accesspoint "NTP-Clock-RGBLED" an. Zu diesem kann man sich verbinden (Passwort: 12345678). Es wird unter der IP 192.168.4.1 ein Webserver angeboten, der zwei Webseiten anzeigen kann. Primär wird die Statusseite angezeigt, die alle wesentlichen Parameter auflistet:
|
||||
- Aktuelle NTP Zeit
|
||||
- der gewählte NTP Server
|
||||
- aktuelle Helligkeit
|
||||
- maximale Helligkeit
|
||||
- Anzeige der einzelnen Sekunden
|
||||
- Aufleuchten aller LEDs
|
||||
- Folgende Stunde wie auf einer analogen Uhr
|
||||
|
||||
Unten auf der Statusseite gibt es einen Link zur Konfigurationsseite
|
||||
## technische Details
|
||||
|
||||
- ESP32 (Lolin32 Lite)
|
||||
- SK6812 or WS2812B 60 LED ring
|
||||
- LDR over Resistor voltage divider
|
||||
- LED ring powered over 3.3V (WS2812B) rail or USB VCC (SK6812)
|
||||
- LED Output Pin 17 (requirement for NeoPixel library as I2C is used)
|
||||
- LDR analog measure pin A6
|
||||
|
||||
|
||||
## ausstehende Verbesserungen
|
||||
- [ ] RGB Auswahl Sekunden
|
||||
- [ ] RGB Auswahl Minuten
|
||||
- [ ] RGB Auswahl Stunden
|
||||
- [ ] RGB Auswahl 12 Uhr
|
||||
- [ ] flüssige Helligkeitsadaptierung
|
||||
- [ ] Firmware Update über Upload
|
||||
Loading…
Reference in New Issue
Block a user