Display widgets based on application

Lillifee · Nov 27, 2020 · 04109da · 04109da
1 parent efb9f85
commit 04109da
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 56 deletions.
diff --git a/data/bundle.js b/data/bundle.js
diff --git a/lib/WebServerHelper/WebServerHelper.cpp b/lib/WebServerHelper/WebServerHelper.cpp
@@ -31,6 +31,17 @@ void WebServerHelperClass::start() {
     }
   });
 
+  WebServerHelper.server.on("/api/application", HTTP_GET, [this](AsyncWebServerRequest *request) {
+    AsyncJsonResponse *response = new AsyncJsonResponse();
+    response->addHeader("Server", "ESP Async Web Server");
+
+    JsonVariant &root = response->getRoot();
+    root["application"] = application;
+
+    response->setLength();
+    request->send(response);
+  });
+
   server.on("/api/esp", HTTP_GET, [this](AsyncWebServerRequest *request) {
     AsyncJsonResponse *response = new AsyncJsonResponse();
     response->addHeader("Server", "ESP Async Web Server");

diff --git a/lib/WebServerHelper/WebServerHelper.h b/lib/WebServerHelper/WebServerHelper.h
@@ -14,6 +14,7 @@ class WebServerHelperClass {
   void uploadFile(int command, AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
 
  public:
+  String application;
   AsyncWebServer server;
   WebServerHelperClass();
   void start();

diff --git a/lib/WiFiHelper/WiFiHelper.cpp b/lib/WiFiHelper/WiFiHelper.cpp
@@ -116,7 +116,7 @@ void WiFiHelperClass::sleep() {
   esp_wifi_stop();
 }
 
-void WiFiHelperClass::server() {
+void WiFiHelperClass::server(String application) {
   Serial.println("Setup WiFi helper");
 
   if (WiFiHelper.connect(true)) {
@@ -125,6 +125,8 @@ void WiFiHelperClass::server() {
     WiFiHelper.setupAP();
   }
 
+  WebServerHelper.application = application;
+
   WebServerHelper.server.on("/api/wifi", HTTP_GET, [this](AsyncWebServerRequest *request) {
     int args = request->args();
 

diff --git a/lib/WiFiHelper/WiFiHelper.h b/lib/WiFiHelper/WiFiHelper.h
@@ -38,7 +38,7 @@ class WiFiHelperClass {
 
  public:
   void setup();
-  void server();
+  void server(String application);
   bool connect(bool firstConnect = false);
   void sleep();
 };

diff --git a/src/co2.cpp b/src/co2.cpp
@@ -8,7 +8,7 @@ void setup() {
   Serial.begin(115200);
 
   WiFiHelper.setup();
-  WiFiHelper.server();
+  WiFiHelper.server("co2");
 
   Co2Helper.setup();
   Co2Helper.server();

diff --git a/src/cube.cpp b/src/cube.cpp
@@ -25,7 +25,7 @@ void setup() {
   if (wakeupReason == ESP_SLEEP_WAKEUP_UNDEFINED) {
     pinMode(LED_BUILTIN, OUTPUT);
 
-    WiFiHelper.server();
+    WiFiHelper.server("cube");
     MpuHelper.server();
 
     WebServerHelper.onSleep(deepSleep);

diff --git a/src/display.cpp b/src/display.cpp
@@ -21,7 +21,7 @@ void setup() {
   if (wakeupReason == ESP_SLEEP_WAKEUP_UNDEFINED) {
     pinMode(LED_BUILTIN, OUTPUT);
 
-    WiFiHelper.server();
+    WiFiHelper.server("display");
     WaveshareHelper.server();
 
     WebServerHelper.onSleep(deepSleep);

diff --git a/src/knob.cpp b/src/knob.cpp
@@ -23,7 +23,7 @@ void setup() {
   wakeupReason = esp_sleep_get_wakeup_cause();
 
   if (wakeupReason == ESP_SLEEP_WAKEUP_UNDEFINED) {
-    WiFiHelper.server();
+    WiFiHelper.server("knob");
     KnobHelper.server();
 
     WebServerHelper.onSleep(deepSleep);