Merge pull request #741 from dontsovcmc/waterius_development

WiFiManagerParameter init() to protected from private
tzapu · Sep 26, 2018 · 37e1006 · 37e1006
2 parents 34e1516 + dbf91a4
commit 37e1006
Show file tree

Hide file tree

Showing 2 changed files with 143 additions and 3 deletions.
diff --git a/WiFiManager.h b/WiFiManager.h
@@ -118,6 +118,11 @@ class WiFiManagerParameter {
     int         getLabelPlacement();
     const char *getCustomHTML();
     void        setValue(const char *defaultValue, int length);
+
+  protected:
+    void init(const char *id, const char *placeholder, const char *defaultValue, int length, const char *custom);
+    void init(const char *id, const char *placeholder, const char *defaultValue, int length, const char *custom, int labelPlacement);
+
   private:
     const char *_id;
     const char *_placeholder;
@@ -126,9 +131,6 @@ class WiFiManagerParameter {
     int         _labelPlacement;
     const char *_customHTML;
 
-    void init(const char *id, const char *placeholder, const char *defaultValue, int length, const char *custom);
-    void init(const char *id, const char *placeholder, const char *defaultValue, int length, const char *custom, int labelPlacement);
-
     friend class WiFiManager;
 };
 

diff --git a/examples/CustomParamsWithConfig/CustomParamsWithConfig.ino b/examples/CustomParamsWithConfig/CustomParamsWithConfig.ino
@@ -0,0 +1,138 @@
+
+#include <WiFiManager.h> // https://github.com/tzapu/WiFiManager
+#include <Arduino.h>
+#include <EEPROM.h>
+
+#define SETUP_PIN 0
+
+class IPAddressParameter : public WiFiManagerParameter {
+public:
+    IPAddressParameter(const char *id, const char *placeholder, IPAddress address)
+        : WiFiManagerParameter("") {
+        init(id, placeholder, address.toString().c_str(), 16, "", WFM_LABEL_BEFORE);
+    }
+
+    bool getValue(IPAddress &ip) {
+        return ip.fromString(WiFiManagerParameter::getValue());
+    }
+};
+
+class IntParameter : public WiFiManagerParameter {
+public:
+    IntParameter(const char *id, const char *placeholder, long value, const uint8_t length = 10)
+        : WiFiManagerParameter("") {
+        init(id, placeholder, String(value).c_str(), length, "", WFM_LABEL_BEFORE);
+    }
+
+    long getValue() {
+        return String(WiFiManagerParameter::getValue()).toInt();
+    }
+};
+
+class FloatParameter : public WiFiManagerParameter {
+public:
+    FloatParameter(const char *id, const char *placeholder, float value, const uint8_t length = 10)
+        : WiFiManagerParameter("") {
+        init(id, placeholder, String(value).c_str(), length, "", WFM_LABEL_BEFORE);
+    }
+
+    float getValue() {
+        return String(WiFiManagerParameter::getValue()).toFloat();
+    }
+};
+
+struct Settings {
+    float f;
+    int i;
+    char s[20];
+    uint32_t ip;
+} sett;
+
+
+void setup() {
+    pinMode(SETUP_PIN, INPUT_PULLUP);
+    Serial.begin(9600); 
+
+    //Delay to push SETUP button
+    Serial.println("Press setup button");
+    for (int sec = 3; sec > 0; sec--) {
+        Serial.print(sec);
+        Serial.print("..");
+        delay(1000);
+    }
+
+    EEPROM.begin( 512 );
+    EEPROM.get(0, sett);
+    Serial.println("Settings loaded");
+
+    if (digitalRead(SETUP_PIN) == LOW) {  
+        // Button pressed 
+        Serial.println("SETUP");
+
+        WiFiManager wm;
+
+        sett.s[19] = '\0';   //add null terminator at the end cause overflow
+        WiFiManagerParameter param_str( "str", "param_string",  sett.s, 20);
+        FloatParameter param_float( "float", "param_float",  sett.f);
+        IntParameter param_int( "int", "param_int",  sett.i);
+
+        IPAddress ip(sett.ip);
+        IPAddressParameter param_ip("ip", "param_ip", ip);
+
+        wm.addParameter( &param_str );
+        wm.addParameter( &param_float );
+        wm.addParameter( &param_int );
+        wm.addParameter( &param_ip );
+
+        //SSID & password parameters already included
+        wm.startConfigPortal();
+
+        strncpy(sett.s, param_str.getValue(), 20);
+        sett.s[19] = '\0'; 
+        sett.f = param_float.getValue();
+        sett.i = param_int.getValue();
+
+        Serial.print("String param: ");
+        Serial.println(sett.s);
+        Serial.print("Float param: ");
+        Serial.println(sett.f);
+        Serial.print("Int param: ");
+        Serial.println(sett.i, DEC);
+
+        if (param_ip.getValue(ip)) {
+            sett.ip = ip;
+
+            Serial.print("IP param: ");
+            Serial.println(ip);
+        } else {
+            Serial.println("Incorrect IP");
+        }
+
+        EEPROM.put(0, sett);
+        if (EEPROM.commit()) {
+            Serial.println("Settings saved");
+        } else {
+            Serial.println("EEPROM error");
+        }
+    } 
+    else {  
+        Serial.println("WORK");
+
+        //connect to saved SSID
+        WiFi.begin();  
+
+        //do smth
+        Serial.print("String param: ");
+        Serial.println(sett.s);
+        Serial.print("Float param: ");
+        Serial.println(sett.f);
+        Serial.print("Int param: ");
+        Serial.println(sett.i, DEC);
+        Serial.print("IP param: ");
+        IPAddress ip(sett.ip);
+        Serial.println(ip);
+    }
+}
+
+void loop() {
+}