[Added]: Message Function
This commit is contained in:
@@ -17,11 +17,12 @@
|
|||||||
|
|
||||||
//Default Settings
|
//Default Settings
|
||||||
String Hardware = "0.12";
|
String Hardware = "0.12";
|
||||||
String Software = "0.10";
|
String Software = "0.11";
|
||||||
|
|
||||||
String ntp_server = "ntp2.uni-augsburg.de";
|
String ntp_server = "ntp2.uni-augsburg.de";
|
||||||
bool ntp_update = true;
|
bool ntp_update = true;
|
||||||
int wakeup_time = 10;
|
int wakeup_time = 10;
|
||||||
|
String message_text = "";
|
||||||
//ConfigData (WiFi Name and Pin-Numbers)
|
//ConfigData (WiFi Name and Pin-Numbers)
|
||||||
const String NodeName = "LichtWecker";
|
const String NodeName = "LichtWecker";
|
||||||
|
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ void update_Time(){
|
|||||||
void display_year(int Day, int Month, int Year){
|
void display_year(int Day, int Month, int Year){
|
||||||
display_text("Jahr", String(Year));
|
display_text("Jahr", String(Year));
|
||||||
}
|
}
|
||||||
|
int current_Sec = 0;
|
||||||
void display_time(int Stunde, int Minute, int Sekunde){
|
void display_time(int Stunde, int Minute, int Sekunde){
|
||||||
String Min = String(Minute);
|
String Min = String(Minute);
|
||||||
String Stu = String(Stunde);
|
String Stu = String(Stunde);
|
||||||
@@ -168,9 +168,19 @@ void display_time(int Stunde, int Minute, int Sekunde){
|
|||||||
/*else if (Sekunde % 2 == 0){
|
/*else if (Sekunde % 2 == 0){
|
||||||
display_text(Stu + ":" + Min, get_alarm_string());
|
display_text(Stu + ":" + Min, get_alarm_string());
|
||||||
}*/
|
}*/
|
||||||
|
else if(message_text != ""){
|
||||||
|
display_text(Stu + ":" + Min + ":" + Sek, message_text);
|
||||||
|
setBrightnes(true);
|
||||||
|
if (alarm_started == false){
|
||||||
|
if (Sekunde % 5 == 0 && Sekunde != current_Sec){
|
||||||
|
set_color(0, 0, 255);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
else{
|
else{
|
||||||
display_text(Stu + ":" + Min + ":" + Sek, get_alarm_string());
|
display_text(Stu + ":" + Min + ":" + Sek, get_alarm_string());
|
||||||
}
|
}
|
||||||
|
current_Sec = Sekunde;
|
||||||
}
|
}
|
||||||
|
|
||||||
void display_date(int Day, int Month, int Year){
|
void display_date(int Day, int Month, int Year){
|
||||||
|
|||||||
@@ -21,7 +21,13 @@ void handle_Alarm_switch(){
|
|||||||
stop_alarm();
|
stop_alarm();
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
switch_alarm_mode();
|
//Delete Message
|
||||||
|
if(message_text != ""){
|
||||||
|
message_text = "";
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
switch_alarm_mode();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
delay(200);
|
delay(200);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,6 +106,13 @@ void handleArgs(){
|
|||||||
redirect();
|
redirect();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
else if (server.argName(i) == "news"){
|
||||||
|
if (server.arg(i) != ""){
|
||||||
|
message_text = server.arg(i);
|
||||||
|
}
|
||||||
|
redirect();
|
||||||
|
break;
|
||||||
|
}
|
||||||
else if(server.argName(i) == "reset" && server.arg(i) == "true"){
|
else if(server.argName(i) == "reset" && server.arg(i) == "true"){
|
||||||
print_reset();
|
print_reset();
|
||||||
ESP.restart();
|
ESP.restart();
|
||||||
@@ -134,9 +141,10 @@ void print_website(){
|
|||||||
String Weckzeit = "<b>Weckdauer (Minuten):</b> <form action=\"/\" methode=\"get\"><input type=\"number\" name=\"wakeup_time\" value=\"" + String(wakeup_time) + "\"><input type=\"submit\" value=\"Speichern\"></form>";
|
String Weckzeit = "<b>Weckdauer (Minuten):</b> <form action=\"/\" methode=\"get\"><input type=\"number\" name=\"wakeup_time\" value=\"" + String(wakeup_time) + "\"><input type=\"submit\" value=\"Speichern\"></form>";
|
||||||
String Alarm = "<h3>Alarm</h3>" + Alarm1 + "<br><br>" + Alarm2 + "<br><br>" + Weckzeit;
|
String Alarm = "<h3>Alarm</h3>" + Alarm1 + "<br><br>" + Alarm2 + "<br><br>" + Weckzeit;
|
||||||
String Zeit = "<br><h3>Zeit</h3>" + String(h) + ":" + String(m) + ":" + String(s) + " - " + String(d) + "." + String(M) + "." + String(y) + " | DST: " + String(summertime_EU(y,M,d,h,1));
|
String Zeit = "<br><h3>Zeit</h3>" + String(h) + ":" + String(m) + ":" + String(s) + " - " + String(d) + "." + String(M) + "." + String(y) + " | DST: " + String(summertime_EU(y,M,d,h,1));
|
||||||
|
String News = "<br><h3>Nachricht</h3>Diese Nachricht wird auf dem Display angezeigt!<br><form action=\"/\" methode=\"get\"><input type=\"text\" name=\"news\" value=\"" + String(message_text) + "\"><input type=\"submit\" value=\"Speichern\"></form><br>";
|
||||||
String NTP = "<br><h3>NTP</h3><b>Server:</b> <form action=\"/\" methode=\"get\"><input type=\"text\" name=\"ntp_server\" value=\"" + String(ntp_server) + "\"><input type=\"submit\" value=\"Speichern\"></form><br>stündliches Zeit Update: " + getBoolString(ntp_update) + "<br><a href=\"?ntp=true\">Aktivieren</a> " + " <a href=\"?ntp=false\">Deaktivieren</a>";
|
String NTP = "<br><h3>NTP</h3><b>Server:</b> <form action=\"/\" methode=\"get\"><input type=\"text\" name=\"ntp_server\" value=\"" + String(ntp_server) + "\"><input type=\"submit\" value=\"Speichern\"></form><br>stündliches Zeit Update: " + getBoolString(ntp_update) + "<br><a href=\"?ntp=true\">Aktivieren</a> " + " <a href=\"?ntp=false\">Deaktivieren</a>";
|
||||||
String Reboot = "<br><h3>System:</h3><a href=\"?reset=true\">Neustart</a><br><br><a href=\"update\">Software Update Modus</a><br><br><a href=\"?factory_reset=true\">Werkseinstellungen</a><br><br><a href=\"log\">Log</a>";
|
String Reboot = "<br><h3>System:</h3><a href=\"?reset=true\">Neustart</a><br><br><a href=\"update\">Software Update Modus</a><br><br><a href=\"?factory_reset=true\">Werkseinstellungen</a><br><br><a href=\"log\">Log</a>";
|
||||||
String Body = card_start + Alarm + card_end + card_start + NTP + card_end + card_start + Reboot + card_end;
|
String Body = card_start + Alarm + card_end + card_start + News + card_end + card_start + NTP + card_end + card_start + Reboot + card_end;
|
||||||
server.send(200, "text/html", Header + Body + Footer);
|
server.send(200, "text/html", Header + Body + Footer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user