diff --git a/LichtWecker/LichtWecker.ino b/LichtWecker/LichtWecker.ino index ca84aa3..4daf863 100644 --- a/LichtWecker/LichtWecker.ino +++ b/LichtWecker/LichtWecker.ino @@ -16,7 +16,7 @@ #include String Hardware = "0.10"; -String Software = "0.06"; +String Software = "0.07"; String ntp_server = "ntp2.uni-augsburg.de"; // Set web server port number to 80 diff --git a/LichtWecker/webserver.ino b/LichtWecker/webserver.ino index 86142ae..2cc129a 100644 --- a/LichtWecker/webserver.ino +++ b/LichtWecker/webserver.ino @@ -1,4 +1,6 @@ String logfile = ""; +//Webserver +//################################################################################### void setup_webserver(){ httpUpdater.setup(&server, "Licht", "Wecker"); @@ -18,8 +20,15 @@ void handle_webserver(){ } -String Header = "Lichtwecker

Licht Wecker

"; -String Footer = "


Not for Sale, Prototyp by CHM, Hardware: " + Hardware + ", Software: "+ Software +"
"; +//Layout +//################################################################################### + +String Meta = ""; +String CSS = ""; +String Header = "" + Meta + CSS + "Lichtwecker

Licht Wecker

"; +String Footer = "


Not for Sale, Prototyp by CHM, Hardware: " + Hardware + ", Software: "+ Software +"
"; +String card_start = "
"; +String card_end = "
"; void handleRootPath() { //Handler for the rooth path handleArgs(); @@ -85,21 +94,24 @@ void handleArgs(){ } +//Webpage +//################################################################################### + void print_website(){ bool A1 = Clock.checkAlarmEnabled(1); bool A2 = Clock.checkAlarmEnabled(2); - String Alarm1 = "Alarm 1:
:
Sommerzeit: " + getBoolString(summer) + "
Aktiv: " + getBoolString(A1) + "
Aktivieren " + "  Deaktivieren"; - String Alarm2 = "Alarm 2:
:
Sommerzeit: " + getBoolString(summer) + "
Aktiv: " + getBoolString(A2) + "
Aktivieren " + "  Deaktivieren"; + String Alarm1 = "Alarm 1:
:
Sommerzeit: " + getBoolString(summer) + "
Aktiv: " + getBoolString(A1) + "
Aktivieren " + "  Deaktivieren"; + String Alarm2 = "Alarm 2:
:
Sommerzeit: " + getBoolString(summer) + "
Aktiv: " + getBoolString(A2) + "
Aktivieren " + "  Deaktivieren"; String Alarm = "

Alarm

" + Alarm1 + "

" + Alarm2; String Zeit = "

Zeit

" + String(h) + ":" + String(m) + ":" + String(s) + " - " + String(d) + "." + String(M) + "." + String(y) + " | DST: " + String(summertime_EU(y,M,d,h,1)); String NTP = "

NTP

" + String("stündliches Zeit Update über " + ntp_server + ": ") + getBoolString(ntp_update) + "
Aktivieren " + "  Deaktivieren"; String Reboot = "

System:

Neustart

Software Update Modus"; - String Body = Alarm + Zeit + NTP + Reboot; + String Body = card_start + Alarm + card_end + card_start + Zeit + card_end + card_start + NTP + card_end + card_start + Reboot + card_end; server.send(200, "text/html", Header + Body + Footer); } void print_reset(){ - String Body = "Neustart... Neu laden"; + String Body = "
Neustart... Neu laden
"; server.send(200, "text/html", Header + Body + Footer); delay(500); }