Archives/device-epd
2
0
Fork 0
mirror of https://github.com/paperdash/device-epd.git synced 2024-11-04 12:00:27 +00:00
Code Issues Projects Releases Wiki Activity

#54 fixed some todos

Browse Source
This commit is contained in:
Thomas Ballmann 2021-01-08 20:58:19 +01:00
parent 59322547e0
commit 8a37073204
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/.keep
View File

BIN
data/faceToday.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

7
lib/app/app.cpp
View File

@ -100,7 +100,6 @@ void setupApp()
request->send(404);
});
// TODO response
server.on("/stats", HTTP_GET, [](AsyncWebServerRequest *request) {
AsyncResponseStream *response = request->beginResponseStream("application/json");
const size_t capacity = 5 * JSON_OBJECT_SIZE(2) + JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(5) + JSON_OBJECT_SIZE(7) + JSON_OBJECT_SIZE(8) + 410;
@ -142,10 +141,6 @@ void setupApp()
doc["app"]["created"] = appConfig.buildTime;
doc["app"]["rev"] = appConfig.buildRev;
//JsonArray capability = doc.createNestedArray("capability");
//capability.add("jpg");
//capability.add("wbmp");
serializeJson(doc, *response);
request->send(response);
});
@ -329,7 +324,7 @@ void setupApiDevice()
size_t cnt = 0;
for (size_t i = 0; i < n; ++i)
{
// checking for epd
// checking for paperdash device
if (MDNS.hasTxt(i, "paperdash"))
{
if (cnt)

2
lib/settings/settings.cpp
View File

@ -13,8 +13,6 @@ void setupSettings()
void settingsFactoryReset()
{
NVS.eraseAll();
// TODO remove also json db file
}
void loadSettingsColor()

6
lib/wlan/wlan.cpp
View File

@ -15,8 +15,7 @@ void setupWlan()
String ssid = NVS.getString("wifi.ssid");
String password = NVS.getString("wifi.password");
// TODO count failed connecting wifiFailedCount <=3
if (!ssid.isEmpty() && !password.isEmpty() && wifiFailedCount <=3) // && wifiFailedCount <=3
if (!ssid.isEmpty() && !password.isEmpty() && wifiFailedCount <=3)
{
// client mode
initClientMode(ssid.c_str(), password.c_str());
@ -52,7 +51,7 @@ void initClientMode(const char *ssid, const char *password)
Serial.print(".");
if (!tryCount--)
{
// todo, hier passt was nicht
// TODO is this correct?
wifiFailedCount++;
if (wifiFailedCount > 3) {
Serial.println(" wifi is not reachable...");
@ -88,6 +87,7 @@ void initAPMode()
{
Serial.println(" init AP (Access Point)");
//WiFi.disconnect();
WiFi.softAP("paperdash.io");
IPAddress IP = WiFi.softAPIP();