Merge pull request 'fix-homepage-layout' (#9) from fix-homepage-layout into wemos-build

Reviewed-on: #9
This commit is contained in:
simon 2022-07-13 18:52:43 +00:00
commit d74a0b0d83

View File

@ -17,7 +17,7 @@ String header = "<!DOCTYPE html> <html>\n"
"</style>\n" "</style>\n"
"</head>\n" "</head>\n"
"<body>\n" "<body>\n"
"<h1>Truhensteuerung Web Server</h1>\n"; "<h1>Truhensteuerung Netz Servierer</h1>\n";
String ssid = "REPLACE_WITH_YOUR_SSID"; String ssid = "REPLACE_WITH_YOUR_SSID";
String password = "REPLACE_WITH_YOUR_PASSWORD"; String password = "REPLACE_WITH_YOUR_PASSWORD";
unsigned long currentTime = millis(); unsigned long currentTime = millis();
@ -97,6 +97,28 @@ void handleWifiSetup(){
ptr += "</table>\n"; ptr += "</table>\n";
ptr += "<input type=\"input\" id=\"password\" name=\"password\" placeholder=\"Kennwort\" >"; ptr += "<input type=\"input\" id=\"password\" name=\"password\" placeholder=\"Kennwort\" >";
ptr += "<input type=\"submit\" id=\"submit\" name=\"submit_wlan\" >"; ptr += "<input type=\"submit\" id=\"submit\" name=\"submit_wlan\" >";
ptr +="</div>"; ptr +="<div class=\"col\">";
ptr +="<table>\n\n";
ptr +="<tr>\n<td>ESP.getResetReason()</td>\n<td>";
ptr +=String(ESP.getResetReason());
ptr += "</td>\n</tr>\n";
ptr +="<tr>\n<td>ESP.getFreeHeap()</td>\n<td>";
ptr +=String(ESP.getFreeHeap());
ptr += "</td>\n</tr>\n";
ptr +="<tr>\n<td>ESP.getHeapFragmentation()</td>\n<td>";
ptr +=String(ESP.getHeapFragmentation());
ptr += "</td>\n</tr>\n";
ptr +="<tr>\n<td>ESP.getMaxFreeBlockSize()</td>\n<td>";
ptr +=String(ESP.getMaxFreeBlockSize());
ptr += "</td>\n</tr>\n";
ptr +="<tr>\n<td>ESP.getChipId()</td>\n<td>";
ptr +=String(ESP.getChipId());
ptr += "</td>\n</tr>\n";
ptr +="<tr>\n<td>ESP.getCpuFreqMHz()</td>\n<td>";
ptr +=String(ESP.getCpuFreqMHz());
ptr += "</td>\n</tr>\n";
ptr += "</table>\n";
ptr += "</div>\n"; ptr += "</div>\n";
ptr += "</form>"; ptr += "</form>";
}else{ }else{
@ -164,10 +186,10 @@ void handleWifiSetup(){
} }
void handleRoot(){ void handleRoot(){
String ptr = header; String ptr = header;
ptr += "<a href=\"/setup\">Setup Wifi</a>"; ptr +="<div class=\"col\">";
ptr +="<table style=\"width: 100%;\">\n<tr style=\"border-bottom: 5px solid #444444;\"><td>Name</td><td>Temp</td><td>Status</td></tr>\n"; ptr +="<table>\n<tr><td>Name</td><td>Temp</td><td>Status</td></tr>\n";
for (int i = 0; i < (sizeof(truhen) / sizeof(truhen[0])); i++) { for (int i = 0; i < (sizeof(truhen) / sizeof(truhen[0])); i++) {
ptr +="<tr>\n<td>"; ptr +="<tr style=\"padding: 10px;font-size: 1.8em;\" >\n<td>";
ptr +=truhen[i].getName(); ptr +=truhen[i].getName();
ptr +="</td>\n<td>"; ptr +="</td>\n<td>";
ptr +=String(truhen[i].getCurTemp())+"&#8451;"; ptr +=String(truhen[i].getCurTemp())+"&#8451;";
@ -186,7 +208,11 @@ void handleRoot(){
} }
ptr += "</td>\n</tr>\n"; ptr += "</td>\n</tr>\n";
} }
ptr += "</table>\n"; ptr += "</table>\n";
ptr += "</div>\n";
ptr += "<script>window.setTimeout( function() { window.location.reload();}, 10000);</script>\n";
ptr +="</body>\n"; ptr +="</body>\n";
ptr +="</html>\n"; ptr +="</html>\n";
server.send(200, "text/html", ptr); server.send(200, "text/html", ptr);
@ -205,7 +231,7 @@ void handleNotFound() {
} }
void WifiSetup() { void WifiSetup() {
preferences.begin("my-app", false); preferences.begin("my-app", true);
ssid = preferences.getString("ssid", ssid); ssid = preferences.getString("ssid", ssid);
password = preferences.getString("password", password); password = preferences.getString("password", password);
preferences.end(); preferences.end();