Adding Backendcode for #10 graph and #9 number controls

src/ESPUI.cpp

@@ -251,10 +251,13 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
       ESPUI.updateSwitcher(c->id, false);
       c->callback(*c, S_INACTIVE);
     } else if (msg.startsWith("slvalue:")) {
-      int value =
+      int value = msg.substring(msg.indexOf(':') + 1, msg.lastIndexOf(':')).toInt();
-        msg.substring(msg.indexOf(':') + 1, msg.lastIndexOf(':')).toInt();
       ESPUI.updateSlider(c->id, value, client->id());
       c->callback(*c, SL_VALUE);
+    } else if (msg.startsWith("nvalue:")) {
+      int value = msg.substring(msg.indexOf(':') + 1, msg.lastIndexOf(':')).toInt();
+      ESPUI.updateNumber(c->id, value, client->id());
+      c->callback(*c, N_VALUE);
     }
   }
   break;
@@ -265,9 +268,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
 
 int ESPUIClass::label(const char *label, int color, String value) {
   if (labelExists(label)) {
-    if (debug)
+    if (debug) Serial.println("UI ERROR: Element " + String(label) + " exists, skipping creating element!");
-      Serial.println("UI ERROR: Element " + String(label) +
-                     " exists, skipping creating element!");
     return -1;
   }
 
@@ -286,9 +287,24 @@ int ESPUIClass::label(const char *label, int color, String value) {
   return cIndex - 1;
 }
 
+int ESPUIClass::graph(const char *label, int color) {
+  if (labelExists(label)) {
+    if (debug) Serial.println("UI ERROR: Element " + String(label) + " exists, skipping creating element!");
+    return -1;
+  }
+
+  Control *newG = new Control();
+  newG->type = UI_GRAPH;
+  newG->label = label;
+  newG->color = color;
+  newG->id = cIndex;
+  controls[cIndex] = newG;
+  cIndex++;
+  return cIndex - 1;
+}
+
 // TODO: this still needs a range setting
-int ESPUIClass::slider(const char *label, void (*callBack)(Control, int),
+int ESPUIClass::slider(const char *label, void (*callBack)(Control, int), int color, String value) {
-                       int color, String value) {
   if (labelExists(label)) {
     if (debug)
       Serial.println("UI ERROR: Element " + String(label) +
@@ -337,8 +353,7 @@ int ESPUIClass::button(const char *label, void (*callBack)(Control, int),
   return cIndex - 1;
 }
 
-int ESPUIClass::switcher(const char *label, bool startState,
+int ESPUIClass::switcher(const char *label, bool startState, void (*callBack)(Control, int), int color) {
-                         void (*callBack)(Control, int), int color) {
   if (labelExists(label)) {
     if (debug)
       Serial.println("UI ERROR: Element " + String(label) +
@@ -381,6 +396,26 @@ int ESPUIClass::pad(const char *label, bool center,
   return cIndex - 1;
 }
 
+// TODO: min and max need to be saved, they also need to be sent to the frontend
+int ESPUIClass::number(const char *label, void (*callBack)(Control, int), int color, int number, int min, int max) {
+  if (labelExists(label)) {
+    if (debug)
+      Serial.println("UI ERROR: Element " + String(label) + " exists, skipping creating element!");
+    return -1;
+  }
+
+  Control *newN = new Control();
+  newN->type = UI_NUMBER;
+  newN->label = label;
+  newN->color = color;
+  newN->value = String(number);
+  newN->callback = callBack;
+  newN->id = cIndex;
+  controls[cIndex] = newN;
+  cIndex++;
+  return cIndex - 1;
+}
+
 void ESPUIClass::print(int id, String value) {
   if (id < cIndex && controls[id]->type == UI_LABEL) {
     controls[id]->value = value;
@@ -408,24 +443,6 @@ void ESPUIClass::print(String label, String value) {
   print(getIdByLabel(label), value);
 }
 
-void ESPUIClass::updateSwitcher(int id, bool nValue, int clientId) {
-  if (id < cIndex && controls[id]->type == UI_SWITCHER) {
-    controls[id]->value = nValue ? 1 : 0;
-    String json;
-    StaticJsonBuffer<200> jsonBuffer;
-    JsonObject &root = jsonBuffer.createObject();
-    root["type"] = UPDATE_SWITCHER;
-    root["value"] = nValue ? 1 : 0;
-    root["id"] = String(id);
-    root.printTo(json);
-    textThem(json, clientId);
-  } else {
-    if (debug)
-      Serial.println(String("Error: ") + String(id) +
-                     String(" is no switcher"));
-  }
-}
-
 void ESPUIClass::updateSlider(int id, int nValue, int clientId) {
   if (id < cIndex && controls[id]->type == UI_SLIDER) {
     controls[id]->value = nValue;
@@ -443,16 +460,55 @@ void ESPUIClass::updateSlider(int id, int nValue, int clientId) {
   }
 }
 
+void ESPUIClass::updateSwitcher(int id, bool nValue, int clientId) {
+  if (id < cIndex && controls[id]->type == UI_SWITCHER) {
+    controls[id]->value = nValue ? 1 : 0;
+    String json;
+    StaticJsonBuffer<200> jsonBuffer;
+    JsonObject &root = jsonBuffer.createObject();
+    root["type"] = UPDATE_SWITCHER;
+    root["value"] = nValue ? 1 : 0;
+    root["id"] = String(id);
+    root.printTo(json);
+    textThem(json, clientId);
+  } else {
+    if (debug) Serial.println(String("Error: ") + String(id) + String(" is no switcher"));
+  }
+}
+
 void ESPUIClass::updateSwitcher(String label, bool nValue, int clientId) {
   if (!labelExists(label)) {
     if (debug)
-      Serial.println("UI ERROR: Element does not " + String(label) +
+      Serial.println("UI ERROR: Element does not " + String(label) + " exist, cannot update!");
-                     " exist, cannot update!");
     return;
   }
   updateSwitcher(getIdByLabel(label), nValue, clientId);
 }
 
+void ESPUIClass::updateNumber(int id, int number, int clientId) {
+  if (id < cIndex && controls[id]->type == UI_NUMBER) {
+    controls[id]->value = number;
+    String json;
+    StaticJsonBuffer<200> jsonBuffer;
+    JsonObject &root = jsonBuffer.createObject();
+    root["type"] = UPDATE_NUMBER;
+    root["value"] = String(number);
+    root["id"] = String(id);
+    root.printTo(json);
+    textThem(json, clientId);
+  } else {
+    if (debug) Serial.println(String("Error: ") + String(id) + String(" is no number"));
+  }
+}
+
+void ESPUIClass::updateNumber(String label, int number, int clientId) {
+  if (!labelExists(label)) {
+    if (debug) Serial.println("UI ERROR: Element does not " + String(label) + " exist, cannot update!");
+    return;
+  }
+  updateNumber(getIdByLabel(label), number, clientId);
+}
+
 // This is a hacky workaround because ESPAsyncWebServer does not have a function
 // like this and it's clients array is private
 void ESPUIClass::textThem(String text, int clientId) {

src/ESPUI.h

@@ -39,7 +39,7 @@ typedef struct Control {
   unsigned int color;
 } Control;
 
-// Types
+// Message Types (and control types)
 #define UI_TITEL 0
 #define UI_LABEL 1
 #define UI_BUTTON 2
@@ -50,6 +50,12 @@ typedef struct Control {
 #define UPDATE_SWITCHER 7
 #define UI_SLIDER 8
 #define UPDATE_SLIDER 9
+#define UI_NUMBER 10
+#define UPDATE_NUMBER 11
+#define UI_GRAPH 12
+#define CLEAR_GRAPH 13
+#define ADD_GRAPH_POINT 14
+
 
 // Values
 #define B_DOWN -1
@@ -70,7 +76,7 @@ typedef struct Control {
 #define S_INACTIVE 7
 
 #define SL_VALUE 8
-
+#define N_VALUE 9
 
 // Colors
 #define COLOR_TURQUOISE 0
@@ -92,15 +98,16 @@ void beginSPIFFS(const char *_title); // Setup servers and page in SPIFFSmode
 void prepareFileSystem();   // Initially preps the filesystem and loads a lot of stuff into SPIFFS
 void list();
 // Creating Elements
-int label(const char *label, int color, String value = "");   // Create Label
+
-int button(const char *label, void (*callBack)(Control, int), int color,
+int button(const char *label, void (*callBack)(Control, int), int color, String value = "");   // Create Event Button
-           String value = "");    // Create Event Button
+int switcher(const char *label, bool startState, void (*callBack)(Control, int), int color);   // Create Toggle Button
-int switcher(const char *label, bool startState,
+int pad(const char *label, bool centerButton, void (*callBack)(Control, int), int color);  // Create Pad Control
-             void (*callBack)(Control, int),
-             int color);    // Create Toggle Button
-int pad(const char *label, bool centerButton, void (*callBack)(Control, int),
-        int color);    // Create Pad Control
 int slider(const char *label, void (*callBack)(Control, int), int color, String value);    // Create Slider Control
+int number(const char *label, void (*callBack)(Control, int), int color, int number, int min, int max);    // Create a Number Input Control
+
+// Output only
+int label(const char *label, int color, String value = ""); // Create Label
+int graph(const char *label, int color); // Create Graph display
 
 // Update Elements
 void print(int id, String value);
@@ -112,6 +119,16 @@ void updateSwitcher(String label, bool nValue, int clientId = -1);
 void updateSlider(int id, int nValue, int clientId = -1);
 void updateSlider(String label, int nValue, int clientId = -1);
 
+void updateNumber(int id, int nValue, int clientId = -1);
+void updateNumber(String label, int nValue, int clientId = -1);
+
+void clearGraph(int id, int clientId = -1);
+void clearGraph(String label, int clientId = -1);
+
+void addGraphPoint(int id, int nValue, int clientId = -1);
+void addGraphPoint(String label, int nValue, int clientId = -1);
+
+
 void textThem(String text, int clientId);
 
 // Variables ---