wifi task

Firmware/petalot/conf.hpp

@@ -33,7 +33,7 @@ String printConf() {
 }
 
 void saveConfiguration() {
-
+  SPIFFS.remove("/config.json");
   File file = SPIFFS.open("/config.json", "w");
   if (!file) {
     msg = "Failed to create file";
@@ -57,23 +57,24 @@ void saveConfiguration() {
   if (serializeJson(doc, file) == 0) {
     msg = "Failed to write to file";
   }
-
+  Serial.println(printConf());
   file.close();
   analogWrite(PIN_HEATER, 0);
   ESP.restart();
 
 }
 
 void  resetConfiguration(){
+    Serial.println("reset");
     strcpy(ssid, "");         
     strcpy(password, "");
     To = 220;
     Vo = 40;
-    Tm = 250;
+    Tm = 230;
     Kp = 23.0;
     Ki = 0.043;
     Kd = 160.0;
-    Max = 210;
+    Max = 200;
     LocalIP = "";
     Subnet = "255.255.255.0";
     Gateway = "";
@@ -146,11 +147,11 @@ void loadConfiguration(bool reset=false) {
   //To = Tco;
   Vo = doc["Vo"] | 40;
   //Vo = Vco;
-  Tm = doc["Tm"] | 250;
+  Tm = doc["Tm"] | 230;
   Kp = doc["Kp"]?doc["Kp"].as<double>():23.0;
   Ki = doc["Ki"]?doc["Ki"].as<double>():0.043;
   Kd = doc["Kd"]?doc["Kd"].as<double>():160.0;
-  Max = doc["Max"]?doc["Max"].as<double>():210;
+  Max = doc["Max"]?doc["Max"].as<double>():200;
   LocalIP = doc["LocalIP"] | "";
   Subnet = doc["Subnet"] | "255.255.255.0";
   Gateway = doc["Gateway"] | "";

Firmware/petalot/hotend.hpp

@@ -55,8 +55,6 @@ void initHotend(){
 }
 
 
-
-
 void hotendReadTempTask() {
   if (status == "stopped" && myPID.GetMode() == AUTOMATIC){
     myPID.SetMode(MANUAL);

Firmware/petalot/petalot.ino

@@ -7,8 +7,6 @@
 #include "ota.hpp"
 
 void setup() {
-
-
   Serial.begin(115200);
   delay(1000);
   initConf();
@@ -20,12 +18,10 @@ void setup() {
 }
 
 void loop() {
+  wifiTask();
   server.handleClient();
-  //if (!apmode) {
-    hotendReadTempTask();
-    stepperRunTask();
-  //}
+  hotendReadTempTask();
+  stepperRunTask();
   ArduinoOTA.handle();
   readConfigurationSerial();
-
 }

Firmware/petalot/pins.hpp

@@ -5,5 +5,5 @@
 #define PIN_THERMISTOR A0
 #define PIN_HEATER D0
 
-//v1 and v1.1  v0.9 D8
+//v1 and v1.1
 #define PIN_FILAMENT D7

Firmware/petalot/wifi.hpp

@@ -5,8 +5,9 @@
 bool apmode = false;
 IPAddress local_ip;
 
-
-
+double tempLastWifiTask;
+double tempStartWifiTask;
+bool wifiReady  =  false;
 String IpAddress2String(const IPAddress& ipAddress)
 {
   return String(ipAddress[0]) + String(".") +\
@@ -36,48 +37,54 @@ void AP(){
   }
 }
 
-void initWiFi()
-{     
-
-     if (!ssid){
-        AP();
-        //status = "stopped";
+void wifiTask(){
+  if  (!wifiReady){
+    if (millis() >= tempLastWifiTask + 500){
+      if (WiFi.status() == WL_CONNECTED) {
+        MDNS.begin("Petalot");
+        Serial.println();
+        Serial.println(WiFi.localIP());
+        wifiReady=true;
         return;
-     } else {
-      IPAddress localip;
-      localip.fromString(LocalIP.c_str());
-      IPAddress subnet;
-      subnet.fromString(Subnet.c_str());
-      IPAddress gatewayip;
-      gatewayip.fromString(Gateway.c_str());
-
-     WiFi.begin(ssid, password); //Conexión a la red
-     if (!WiFi.config(localip, gatewayip, subnet,IPAddress(8, 8, 8, 8))) {
-      Serial.println("config wifi ips failed");
-     }
-     unsigned long wifiConnectStart = millis();
-    while (WiFi.status() != WL_CONNECTED) {
+      }
       if (WiFi.status() == WL_CONNECT_FAILED) {
         AP();
-        //status = "stopped";
-        Serial.println("Error conectado a la  wifi");
+        wifiReady=true;
         return;
       }
-      if (millis() - wifiConnectStart > 10000) {
+      if (millis() >= tempStartWifiTask + 10000){
         AP();
-        //status = "stopped";
+        wifiReady=true;
         return;
       }
-      delay(500);
       Serial.print(".");
+      tempLastWifiTask = millis();
+
     }
-    if (!MDNS.begin("Petalot")) 
-   {             
-     Serial.println("Error iniciando mDNS");
-   }
-   //Serial.println("mDNS iniciado");
-   Serial.println();
-   Serial.println(WiFi.localIP());
+  }
+}
+
+void initWiFi()
+{
+
+     if (!ssid){
+        AP();
+        wifiReady=true;
+        return;
+     } else {
+       IPAddress localip;
+       localip.fromString(LocalIP.c_str());
+       IPAddress subnet;
+       subnet.fromString(Subnet.c_str());
+       IPAddress gatewayip;
+       gatewayip.fromString(Gateway.c_str());
+       Serial.print("Connecting to ");
+       Serial.print(ssid);
+       WiFi.begin(ssid, password); //Conexión a la red
+       if (!WiFi.config(localip, gatewayip, subnet,IPAddress(8, 8, 8, 8))) {
+        Serial.println("config wifi ips failed");
+       }
+       tempStartWifiTask = millis();
    }
 }