diff --git a/README.md b/README.md
index f7bc04c..80599fd 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,8 @@ We've got some interesting branches in this repo inspired by user feedback. Thes
- [**static_background_pattern**](https://github.com/techniccontroller/wordclock_esp8266/tree/static_background_pattern): This branch allows to light up specific letters always during clock mode. E.G., to display some special words in another color.
+- [**frame_light**](https://github.com/techniccontroller/wordclock_esp8266/tree/frame_light): This branch allows to add an additional LEDs around the clock, as background/frame light it has the same color as the clock. Thanks to Sandro for the idea.
+
## Install needed Libraries
diff --git a/data/index.html b/data/index.html
index 4bce60d..15700fd 100644
--- a/data/index.html
+++ b/data/index.html
@@ -243,7 +243,7 @@
}
.show{
- height: 280px;
+ height: 320px;
transition: height 1s;
}
@@ -280,6 +280,10 @@
var nmStart = document.getElementById("nm_start");
var nmEnd = document.getElementById("nm_end");
var sld_brightness = document.getElementById("brightness");
+ var sld_nm_brightness = document.getElementById("nm_brightness");
var sld_colorshiftspeed = document.getElementById("colorshiftspeed");
var ckb_resetWifi = document.querySelector('input[id="ResetWifi"]');
var cmdstr = "./cmd?setting=";
@@ -616,6 +622,8 @@
WORDCLOCK 2.0
cmdstr += sld_brightness.value;
cmdstr += "-";
cmdstr += sld_colorshiftspeed.value;
+ cmdstr += "-";
+ cmdstr += sld_nm_brightness.value;
console.log(cmdstr);
sendCommand(cmdstr);
if(ckb_resetWifi.checked) {
diff --git a/ntp_client_plus.cpp b/ntp_client_plus.cpp
index 451bde3..2dadd9f 100644
--- a/ntp_client_plus.cpp
+++ b/ntp_client_plus.cpp
@@ -314,6 +314,26 @@ unsigned int NTPClientPlus::getDayOfWeek()
return this->_dayOfWeek;
}
+/**
+ * @brief Getter for day of the month
+ *
+ * @return unsigned int
+ */
+unsigned int NTPClientPlus::getDayOfMonth()
+{
+ return this->_dateDay;
+}
+
+/**
+ * @brief Getter for the month number
+ *
+ * @return unsigned int
+ */
+unsigned int NTPClientPlus::getMonthNumber()
+{
+ return this->_dateMonth;
+}
+
/**
* @brief Function to calc current year
*
diff --git a/ntp_client_plus.h b/ntp_client_plus.h
index 847306c..7060f2c 100644
--- a/ntp_client_plus.h
+++ b/ntp_client_plus.h
@@ -33,6 +33,8 @@ class NTPClientPlus{
String getFormattedDate();
void calcDate();
unsigned int getDayOfWeek();
+ unsigned int getDayOfMonth();
+ unsigned int getMonthNumber();
unsigned int getYear();
bool isLeapYear(unsigned int year);
int getMonth(int dayOfYear);
diff --git a/wordclock_esp8266.ino b/wordclock_esp8266.ino
index b8d9046..2dc2dbb 100644
--- a/wordclock_esp8266.ino
+++ b/wordclock_esp8266.ino
@@ -48,20 +48,38 @@
// CONSTANTS
// ----------------------------------------------------------------------------------
-#define EEPROM_SIZE 30 // size of EEPROM to save persistent variables
-#define ADR_NM_START_H 0
-#define ADR_NM_END_H 4
-#define ADR_NM_START_M 8
-#define ADR_NM_END_M 12
-#define ADR_BRIGHTNESS 16
-#define ADR_MC_RED 20
-#define ADR_MC_GREEN 22
-#define ADR_MC_BLUE 24
-#define ADR_STATE 26
-#define ADR_NM_ACTIVATED 27
-#define ADR_COLSHIFTSPEED 28
-#define ADR_COLSHIFTACTIVE 29
-
+#define EEPROM_VERSION_CODE 3 // Change this value when defaults settings change
+
+// EEPROM address map (all uint8_t, 1 byte each)
+#define EEPROM_SIZE 14 // size of EEPROM to save persistent variables
+#define ADR_EEPROM_VERSION 0 // uint8_t
+#define ADR_NM_START_H 1 // uint8_t
+#define ADR_NM_END_H 2 // uint8_t
+#define ADR_NM_START_M 3 // uint8_t
+#define ADR_NM_END_M 4 // uint8_t
+#define ADR_BRIGHTNESS 5 // uint8_t
+#define ADR_MC_RED 6 // uint8_t
+#define ADR_MC_GREEN 7 // uint8_t
+#define ADR_MC_BLUE 8 // uint8_t
+#define ADR_STATE 9 // uint8_t
+#define ADR_NM_ACTIVATED 10 // uint8_t
+#define ADR_COLSHIFTSPEED 11 // uint8_t
+#define ADR_COLSHIFTACTIVE 12 // uint8_t
+#define ADR_NM_BRIGHTNESS 13 // uint8_t
+
+// DEFAULT SETTINGS (if one changes this, also increment the EEPROM_VERSION_CODE, to ensure that the EEPROM is updated with the new defaults)
+#define DEFAULT_NM_START_HOUR 22 // default start hour of nightmode (0-23)
+#define DEFAULT_NM_START_MIN 5 // default start minute of nightmode (0-59)
+#define DEFAULT_NM_END_HOUR 7 // default end hour of nightmode (0-23)
+#define DEFAULT_NM_END_MIN 0 // default end minute of nightmode (0-59)
+#define DEFAULT_BRIGHTNESS 40 // default brightness of LEDs (10-255)
+#define DEFAULT_MC_RED 200 // default main color red value
+#define DEFAULT_MC_GREEN 200 // default main color green value
+#define DEFAULT_MC_BLUE 0 // default main color blue value
+#define DEFAULT_NM_ACTIVATED 1 // if function nightmode is activated (0 = deactivated, 1 = activated)
+#define DEFAULT_NM_BRIGHTNESS 0 // default brightness during night mode (0-255)
+#define DEFAULT_COLSHIFT_SPEED 1 // needs to be between larger than 0 (1 = slowest, 255 = fastest)
+#define DEFAULT_COLSHIFT_ACTIVE 0 // if dynamic color shift is active (0 = deactivated, 1 = activated)
#define NEOPIXELPIN 5 // pin to which the NeoPixels are attached
#define BUTTONPIN 14 // pin to which the button is attached
@@ -159,7 +177,7 @@ const uint32_t colors24bit[NUM_COLORS] = {
LEDMatrix::Color24bit(0, 128, 0),
LEDMatrix::Color24bit(0, 0, 255) };
-uint8_t brightness = 40; // current brightness of leds
+uint8_t brightness = DEFAULT_BRIGHTNESS; // current brightness of leds
bool sprialDir = false;
// timestamp variables
@@ -182,24 +200,25 @@ Tetris mytetris = Tetris(&ledmatrix, &logger);
Snake mysnake = Snake(&ledmatrix, &logger);
Pong mypong = Pong(&ledmatrix, &logger);
-float filterFactor = DEFAULT_SMOOTHING_FACTOR;// stores smoothing factor for led transition
-uint8_t currentState = st_clock; // stores current state
-bool stateAutoChange = false; // stores state of automatic state change
-bool nightMode = false; // stores state of nightmode
-bool nightModeActivated = true; // stores if the function nightmode is activated (its not the state of nightmode)
-bool ledOff = false; // stores state of led off
-uint32_t maincolor_clock = colors24bit[2]; // color of the clock and digital clock
-uint32_t maincolor_snake = colors24bit[1]; // color of the random snake animation
-bool apmode = false; // stores if WiFi AP mode is active
-bool dynColorShiftActive = false; // stores if dynamic color shift is active
-uint8_t dynColorShiftPhase = 0; // stores the phase of the dynamic color shift
-uint8_t dynColorShiftSpeed = 1; // stores the speed of the dynamic color shift -> used to calc update period
+float filterFactor = DEFAULT_SMOOTHING_FACTOR; // stores smoothing factor for led transition
+uint8_t currentState = st_clock; // stores current state
+bool stateAutoChange = false; // stores state of automatic state change
+bool nightMode = false; // stores state of nightmode
+bool nightModeActivated = DEFAULT_NM_ACTIVATED; // stores if the function nightmode is activated (its not the state of nightmode)
+bool ledOff = false; // stores state of led off
+uint32_t maincolor_clock = colors24bit[2]; // color of the clock and digital clock
+uint32_t maincolor_snake = colors24bit[1]; // color of the random snake animation
+bool apmode = false; // stores if WiFi AP mode is active
+bool dynColorShiftActive = DEFAULT_COLSHIFT_ACTIVE; // stores if dynamic color shift is active
+uint8_t dynColorShiftPhase = 0; // stores the phase of the dynamic color shift
+uint8_t dynColorShiftSpeed = DEFAULT_COLSHIFT_SPEED; // stores the speed of the dynamic color shift -> used to calc update period
// nightmode settings
-uint8_t nightModeStartHour = 22;
-uint8_t nightModeStartMin = 0;
-uint8_t nightModeEndHour = 7;
-uint8_t nightModeEndMin = 0;
+uint8_t nightModeStartHour = DEFAULT_NM_START_HOUR;
+uint8_t nightModeStartMin = DEFAULT_NM_START_MIN;
+uint8_t nightModeEndHour = DEFAULT_NM_END_HOUR;
+uint8_t nightModeEndMin = DEFAULT_NM_END_MIN;
+uint8_t nightModeBrightness = DEFAULT_NM_BRIGHTNESS;
// Watchdog counter to trigger restart if NTP update was not possible 30 times in a row (5min)
int watchdogCounter = 30;
@@ -221,6 +240,25 @@ void setup() {
//Init EEPROM
EEPROM.begin(EEPROM_SIZE);
+ // Check EEPROM version code
+ uint8_t storedVersion = EEPROM.read(ADR_EEPROM_VERSION);
+ if (storedVersion != EEPROM_VERSION_CODE) {
+ // Set new defaults
+ EEPROM.write(ADR_EEPROM_VERSION, EEPROM_VERSION_CODE);
+ EEPROM.write(ADR_NM_START_H, DEFAULT_NM_START_HOUR);
+ EEPROM.write(ADR_NM_START_M, DEFAULT_NM_START_MIN);
+ EEPROM.write(ADR_NM_END_H, DEFAULT_NM_END_HOUR);
+ EEPROM.write(ADR_NM_END_M, DEFAULT_NM_END_MIN);
+ EEPROM.write(ADR_BRIGHTNESS, DEFAULT_BRIGHTNESS);
+ setMainColor(DEFAULT_MC_RED, DEFAULT_MC_GREEN, DEFAULT_MC_BLUE);
+ EEPROM.write(ADR_STATE, st_clock);
+ EEPROM.write(ADR_NM_ACTIVATED, DEFAULT_NM_ACTIVATED);
+ EEPROM.write(ADR_COLSHIFTSPEED, DEFAULT_COLSHIFT_SPEED);
+ EEPROM.write(ADR_COLSHIFTACTIVE, DEFAULT_COLSHIFT_ACTIVE);
+ EEPROM.write(ADR_NM_BRIGHTNESS, DEFAULT_NM_BRIGHTNESS);
+ EEPROM.commit();
+ }
+
// configure button pin as input
pinMode(BUTTONPIN, INPUT_PULLUP);
@@ -360,6 +398,7 @@ void setup() {
loadNightmodeSettingsFromEEPROM();
loadBrightnessSettingsFromEEPROM();
loadColorShiftStateFromEEPROM();
+ loadNightmodeBrightnessFromEEPROM();
if(ESP.getResetReason().equals("Power On") || ESP.getResetReason().equals("External System")){
// test quickly each LED
@@ -426,15 +465,23 @@ void loop() {
}
// handle state behaviours (trigger loopCycles of different states depending on current state)
- if(!nightMode && !ledOff && (millis() - lastStep > behaviorUpdatePeriod) && (millis() - lastLEDdirect > TIMEOUT_LEDDIRECT)){
+ if(!ledOff && (millis() - lastStep > behaviorUpdatePeriod) && (millis() - lastLEDdirect > TIMEOUT_LEDDIRECT)){
updateStateBehavior(currentState);
lastStep = millis();
}
- // Turn off LEDs if ledOff is true or nightmode is active
- if((ledOff || nightMode) && !waitForTimeAfterReboot){
+ // Turn off LEDs if ledOff is true
+ if(ledOff && !waitForTimeAfterReboot){
ledmatrix.gridFlush();
}
+
+ // Apply night mode brightness
+ if(nightMode && !ledOff && !waitForTimeAfterReboot){
+ ledmatrix.setBrightness(nightModeBrightness);
+ }
+ else if(!nightMode && !ledOff && !waitForTimeAfterReboot){
+ ledmatrix.setBrightness(brightness);
+ }
// periodically write colors to matrix
if(millis() - lastAnimationStep > PERIOD_MATRIXUPDATE && !waitForTimeAfterReboot && (millis() - lastLEDdirect > TIMEOUT_LEDDIRECT)){
@@ -446,7 +493,7 @@ void loop() {
handleButton();
// handle state changes
- if(stateAutoChange && (millis() - lastStateChange > PERIOD_STATECHANGE) && !nightMode && !ledOff){
+ if(stateAutoChange && (millis() - lastStateChange > PERIOD_STATECHANGE) && !ledOff){
// increment state variable and trigger state change
stateChange((currentState + 1) % NUM_STATES, false);
@@ -897,6 +944,16 @@ void loadColorShiftStateFromEEPROM()
logger.logString("ColorShiftActive: " + String(dynColorShiftActive));
}
+/**
+ * @brief Load the night mode brightness from EEPROM
+ *
+ */
+void loadNightmodeBrightnessFromEEPROM()
+{
+ nightModeBrightness = EEPROM.read(ADR_NM_BRIGHTNESS);
+ logger.logString("Night mode brightness: " + String(nightModeBrightness));
+}
+
/**
* @brief Handler for handling commands sent to "/cmd" url
*
@@ -969,6 +1026,7 @@ void handleCommand() {
nightModeEndMin = split(timestr, '-', 3).toInt();
brightness = split(timestr, '-', 4).toInt();
dynColorShiftSpeed = split(timestr, '-', 5).toInt();
+ nightModeBrightness = split(timestr, '-', 6).toInt();
if(nightModeStartHour < 0 || nightModeStartHour > 23) nightModeStartHour = 22;
if(nightModeStartMin < 0 || nightModeStartMin > 59) nightModeStartMin = 0;
if(nightModeEndHour < 0 || nightModeEndHour > 23) nightModeEndHour = 7;
@@ -981,11 +1039,13 @@ void handleCommand() {
EEPROM.write(ADR_NM_END_M, nightModeEndMin);
EEPROM.write(ADR_BRIGHTNESS, brightness);
EEPROM.write(ADR_COLSHIFTSPEED, dynColorShiftSpeed);
+ EEPROM.write(ADR_NM_BRIGHTNESS, nightModeBrightness);
EEPROM.commit();
logger.logString("Nightmode starts at: " + String(nightModeStartHour) + ":" + String(nightModeStartMin));
logger.logString("Nightmode ends at: " + String(nightModeEndHour) + ":" + String(nightModeEndMin));
logger.logString("Brightness: " + String(brightness));
logger.logString("ColorShiftSpeed: " + String(dynColorShiftSpeed));
+ logger.logString("Night mode brightness: " + String(nightModeBrightness));
ledmatrix.setBrightness(brightness);
lastNightmodeCheck = millis() - PERIOD_NIGHTMODECHECK;
}
@@ -1139,6 +1199,8 @@ void handleDataRequest() {
message += ",";
message += "\"brightness\":\"" + String(brightness) + "\"";
message += ",";
+ message += "\"nightModeBrightness\":\"" + String(nightModeBrightness) + "\"";
+ message += ",";
message += "\"colorshift\":\"" + String(dynColorShiftActive) + "\"";
message += ",";
message += "\"colorshiftspeed\":\"" + String(dynColorShiftSpeed) + "\"";
diff --git a/wordclockfunctions.ino b/wordclockfunctions.ino
index ecbdc6e..5720b03 100644
--- a/wordclockfunctions.ino
+++ b/wordclockfunctions.ino
@@ -114,7 +114,7 @@ String timeToString(uint8_t hours,uint8_t minutes){
}
else if(minutes >= 20 && minutes < 25)
{
- message += "ZEHN VOR HALB ";
+ message += "ZWANZIG NACH ";
}
else if(minutes >= 25 && minutes < 30)
{
@@ -130,7 +130,7 @@ String timeToString(uint8_t hours,uint8_t minutes){
}
else if(minutes >= 40 && minutes < 45)
{
- message += "ZEHN NACH HALB ";
+ message += "ZWANZIG VOR ";
}
else if(minutes >= 45 && minutes < 50)
{
@@ -150,7 +150,7 @@ String timeToString(uint8_t hours,uint8_t minutes){
{
hours -= 12;
}
- if(minutes >= 20)
+ if(minutes >= 25)
{
hours++;
}
diff --git a/wordclockfunctions.ino_swiss b/wordclockfunctions.ino_swiss
index 7ec5f2c..146e5cd 100644
--- a/wordclockfunctions.ino_swiss
+++ b/wordclockfunctions.ino_swiss
@@ -9,7 +9,6 @@ const String clockStringSwiss = "ESPESCHAFUFVIERTUBFZAAZWANZGSIVORABOHWORTUHRHA
*/
void drawMinuteIndicator(uint8_t minutes, uint32_t color){
//separate LEDs for minutes in an additional row
- {
switch (minutes%5)
{
case 0:
@@ -31,7 +30,6 @@ void drawMinuteIndicator(uint8_t minutes, uint32_t color){
ledmatrix.setMinIndicator(0b1111, color);
break;
}
- }
}
/**
@@ -93,20 +91,10 @@ int showStringOnClock(String message, uint32_t color){
* @param minutes minutes of the time value
* @return String time as sentence
*/
-String timeToString(uint8_t hours, uint8_t minutes, bool puristModeActive){
+String timeToString(uint8_t hours, uint8_t minutes){
//ES IST
- String message = "";
-
- if(puristModeActive){
- message = "";
- if(minutes < 5 || (minutes >=30 && minutes < 35)){
- message = "ES ESCH ";
- }
- }
- else{
- message = "ES ESCH ";
- }
+ String message = "ES ESCH ";
//show minutes
if(minutes >= 5 && minutes < 10)