FIX: Aufgeräumt

Author: sochs

Nemesis.ino

@@ -131,8 +131,6 @@ void setup() {
 
     // Check HTTP Update
     check_http_update();
-    
-    chart.on = false;
   }
 }
 

c_bot.h

@@ -40,7 +40,6 @@ void set_iot(bool init) {
     iot.P_MQTT_USER = "";
     iot.P_MQTT_PASS = ""; 
     iot.P_MQTT_QoS = 0;
-    
    }
 
    iot.TS_show8 = false;        

c_fs.h

@@ -272,6 +272,8 @@ bool loadconfig(byte count) {
       else return false;
       if (json.containsKey("god"))      sys.god = json["god"];
       else return false;
+      if (json.containsKey("pitsup"))      sys.pitsupply = json["pitsup"];
+      //else return false;
 
     }
     break;
@@ -443,6 +445,7 @@ bool setconfig(byte count, const char* data[2]) {
       json["batmin"] =      battery.min;
       json["logsec"] =      log_sector;
       json["god"] =         sys.god;
+      json["pitsup"] =      sys.pitsupply;
 
       size_t size = json.measureLength() + 1;
       clearEE(EESYSTEM,EESYSTEMBEGIN);  // Bereich reinigen

c_init.h

@@ -23,17 +23,16 @@
 #include <ESP8266WiFi.h>          // WIFI
 #include <ESP8266WiFiMulti.h>     // WIFI
 //#include <WiFiClientSecure.h>     // HTTPS
-//#include <WiFiUdp.h>              // NTP
 #include <TimeLib.h>              // TIME
 #include <EEPROM.h>               // EEPROM
 #include <FS.h>                   // FILESYSTEM
 #include <ArduinoJson.h>          // JSON
-#include <ESP8266mDNS.h>        
-#include <ESPAsyncTCP.h>
+#include <ESP8266mDNS.h>          // mDNS
+#include <ESPAsyncTCP.h>          // ASYNCTCP
 #include <ESPAsyncWebServer.h>    // https://github.com/me-no-dev/ESPAsyncWebServer/issues/60
-#include "AsyncJson.h"
-#include <AsyncMqttClient.h>
-#include <StreamString.h>
+#include "AsyncJson.h"            // ASYNCJSON
+#include <AsyncMqttClient.h>      // ASYNCMQTT
+//#include <StreamString.h>
 
 extern "C" {
 #include "user_interface.h"
@@ -49,9 +48,9 @@ extern "C" uint32_t _SPIFFS_end;        // FIRST ADRESS AFTER FS
 
 // ++++++++++++++++++++++++++++++++++++++++++++++++++
 // SETTINGS
-int co = 32;
+
 // HARDWARE
-#define FIRMWAREVERSION "v0.7.9"
+#define FIRMWAREVERSION "v0.8.0"
 #define APIVERSION      "v1"
 
 // CHANNELS
@@ -155,13 +154,14 @@ struct ChannelData {
 
 ChannelData ch[CHANNELS];
 
+// SENSORTYP
 String  ttypname[SENSORTYPEN] = {"Maverick","Fantast-Neu","Fantast","iGrill2","ET-73",
                                  "Perfektion","5K3A1B","MOUSER47K","100K6A1B","Weber_6743",
                                  "Santos"};
-
-
+// TEMPERATURE UNIT
 String  temp_unit = "C";
-//String colors[8] = {"#6495ED", "#CD2626", "#66CDAA", "#F4A460", "#D02090", "#FFEC8B", "#BA55D3", "#008B8B"};
+
+// CHANNEL COLORS
 String colors[8] = {"#0C4C88","#22B14C","#EF562D","#FFC100","#A349A4","#804000","#5587A2","#5C7148"};
 
 // PITMASTER
@@ -182,6 +182,7 @@ struct Pitmaster {
 Pitmaster pitmaster;
 int pidsize;
 
+// PID PROFIL
 struct PID {
   String name;
   byte id;
@@ -207,6 +208,7 @@ struct PID {
 };
 PID pid[PITMASTERSIZE];
 
+// AUTOTUNE
 struct AutoTune {
    bool storeValues;
    float temp;             // BETRIEBS-TEMPERATUR
@@ -243,6 +245,7 @@ struct AutoTune {
 
 AutoTune autotune;
 
+// DUTYCYCLE
 struct DutyCycle {
   long timer;
   int value;
@@ -273,15 +276,14 @@ uint32_t log_sector;                // erster Sector von APP2
 uint32_t freeSpaceStart;            // First Sector of OTA
 uint32_t freeSpaceEnd;              // Last Sector+1 of OTA
 
+// NOTIFICATION
 struct Notification {
   byte ch;                          // CHANNEL
   bool limit;                       // LIMIT: 0 = LOW TEMPERATURE, 1 = HIGH TEMPERATURE
 };
 
 Notification notification;
 
-
-
 // SYSTEM
 struct System {
    byte hwversion;           // HARDWARE VERSION
@@ -295,13 +297,13 @@ struct System {
    String getupdate;
    bool autoupdate;
    bool god;
+   bool pitsupply;        
 };
 
 System sys;
 bool stby = false;                // USB POWER SUPPLY?            
 byte pulsalarm = 1;
 
-
 // BATTERY
 struct Battery {
   int voltage;                    // CURRENT VOLTAGE
@@ -342,22 +344,22 @@ struct IoT {
 
 IoT iot;
 
-// Chart
+// CLOUD CHART/LOG
 struct Chart {
-   bool on;                  // NANO CHART ON / OFF
-   String token;             // NANO CHART TOKEN
-   int interval;                  // NANO CHART INTERVALL
+   bool on = false;                  // NANO CHART ON / OFF
+//   String token;             // NANO CHART TOKEN
+//   int interval;                  // NANO CHART INTERVALL
 };
 
 Chart chart;
 
-
 // OLED
 int current_ch = 0;               // CURRENTLY DISPLAYED CHANNEL     
 bool LADENSHOW = false;           // LOADING INFORMATION?
 bool displayblocked = false;                     // No OLED Update
 enum {NO, CONFIGRESET, CHANGEUNIT, OTAUPDATE, HARDWAREALARM, IPADRESSE, AUTOTUNE};
 
+// OLED QUESTION
 struct MyQuestion {
    int typ;    
    int con;            
@@ -388,9 +390,6 @@ struct HoldSSID {
 };
 HoldSSID holdssid;
 
-// NTP
-byte packetBuffer[ NTP_PACKET_SIZE];    //buffer to hold incoming and outgoing packets
-
 // BUTTONS
 byte buttonPins[]={btn_r,btn_l};          // Pins
 #define NUMBUTTONS sizeof(buttonPins)
@@ -528,6 +527,9 @@ void sendDataCloud();
 
 String cloudData();
 
+// ++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Initialize Serial
 void set_serial() {
@@ -554,6 +556,7 @@ void set_system() {
   sys.god = false;
   battery.max = BATTMAX;
   battery.min = BATTMIN;
+  sys.pitsupply = false;
 }
 
 
@@ -627,7 +630,6 @@ void timer_iot() {
 
 }
 
-
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // DataLog Timer
 void timer_datalog() {  
@@ -846,6 +848,25 @@ String getMacAddress()  {
 }
 
 
+// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// Cloud Token Generator
+String newToken() {
+  String stamp = String(now(), HEX);
+  int x = 10 - stamp.length();          //pow(16,(10 - timestamp.length()));
+  long y = 1;    // long geht bis 16^7
+  if (x > 7) {
+    stamp += String(random(268435456), HEX);
+    x -= 7;
+  }
+  for (int i=0;i<x;i++) y *= 16;
+  stamp += String(random(y), HEX);
+  return (String) String(ESP.getChipId(), HEX) + stamp;
+}
+
+
+// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// GET/POST-Request
+
 #define SAVEDATALINK "/saveData.php"
 #define SAVELOGSLINK "/saveLogs.php"
 #define SENDTSLINK "/update.json"
@@ -922,7 +943,6 @@ String createParameter(int para) {
   return command;
 }
 
-
 String createCommand(bool meth, int para, const char * link, const char * host, int content) {
 
   String command;
@@ -998,20 +1018,6 @@ void serverAnswer(String payload, size_t len) {
   }
 }
 
-String newToken() {
-  String stamp = String(now(), HEX);
-  int x = 10 - stamp.length();          //pow(16,(10 - timestamp.length()));
-  long y = 1;    // long geht bis 16^7
-  if (x > 7) {
-    stamp += String(random(268435456), HEX);
-    x -= 7;
-  }
-  for (int i=0;i<x;i++) y *= 16;
-  stamp += String(random(y), HEX);
-  Serial.println(y);
-  return (String) String(ESP.getChipId(), HEX) + stamp;
-}
-
 void printRequest(uint8_t* datas) {
   DPRINTF("[REQUEST]\t%s\r\n", (const char*)datas);
 }

c_ota.h

@@ -22,13 +22,13 @@
  * Example:
  *
  * Check for new update
- * http://nano.wlanthermo.de/checkUpdate.php?device="nano"&serial="Serialnummer"&hw_version="v1"&sw_version="currentVersion"
+ * http://update.wlanthermo.de/checkUpdate.php?device="nano"&serial="Serialnummer"&hw_version="v1"&sw_version="currentVersion"
  * ----------------------------------------------------------------------------------------------------------------------------------------
  * Download Firmware-version XYZ
- * http://nano.wlanthermo.de/checkUpdate.php?device="nano"serial="Serialnummer"&hw_version="v1"&sw_version="currentVersion"&getFirmware="XYZ"
+ * http://update.wlanthermo.de/checkUpdate.php?device="nano"serial="Serialnummer"&hw_version="v1"&sw_version="currentVersion"&getFirmware="XYZ"
  * ----------------------------------------------------------------------------------------------------------------------------------------
  * Download Spiffs-version XYZ
- * http://nano.wlanthermo.de/checkUpdate.php?device="nano"serial="Serialnummer"&hw_version="v1"&sw_version="currentVersion"&getSpiffs="XYZ"
+ * http://update.wlanthermo.de/checkUpdate.php?device="nano"serial="Serialnummer"&hw_version="v1"&sw_version="currentVersion"&getSpiffs="XYZ"
  * ----------------------------------------------------------------------------------------------------------------------------------------
  */ 
 

c_pitmaster.h

@@ -445,13 +445,19 @@ void pitmaster_control() {
       float y;
       pitmaster.last = millis();
 
+      // DUTY CYCLE PROCESS
       if (dutycycle.on)  {
         if (!dutycycle.dc && (millis() - dutycycle.timer < 1000))
           pitmaster.value = 50;
         else pitmaster.value = dutycycle.value;
-        if (dutycycle.aktor == 1) analogWrite(PITMASTER1,map(pitmaster.value,0,100,0,1024));
-        else if (dutycycle.aktor == 0) {
+        if (dutycycle.aktor == 1) {  // FAN
+          if (sys.pitsupply && sys.hwversion > 1) digitalWrite(PITSUPPLY, HIGH);   // 12V Supply
+          else digitalWrite(PITSUPPLY, LOW);
+          analogWrite(PITMASTER1,map(pitmaster.value,0,100,0,1024));
+        }
+        else if (dutycycle.aktor == 0) {    // SSR
           pitmaster.msec = map(pitmaster.value,0,100,0,pitmaster.pause); 
+          if (sys.hwversion > 1) digitalWrite(PITSUPPLY, HIGH);   // 12V Supply
           if (pitmaster.msec > 0) digitalWrite(PITMASTER1, HIGH);
           if (pitmaster.msec < pitmaster.pause) pitmaster.event = true; // außer bei 100%
         }
@@ -460,10 +466,13 @@ void pitmaster_control() {
       else if (autotune.initialized)  pitmaster.value = autotunePID();
       else if (!pitmaster.manual)     pitmaster.value = PID_Regler();
       // falls manual wird value vorgegeben
-      
+
+      // NORMAL PITMASTER PROCESS
       if (pid[pitmaster.pid].aktor == 1) {              // FAN
         int _DCmin = map(pid[pitmaster.pid].DCmin,0,100,0,1024);
         int _DCmax = map(pid[pitmaster.pid].DCmax,0,100,0,1024);
+        if (sys.pitsupply && sys.hwversion > 1) digitalWrite(PITSUPPLY, HIGH);   // 12V Supply
+        else digitalWrite(PITSUPPLY, LOW);
         if (pitmaster.value == 0) {   // bei 0 soll der Lüfter auch stehen
           analogWrite(PITMASTER1,0);
           pitmaster.timer0 = millis();  
@@ -478,14 +487,16 @@ void pitmaster_control() {
         int _DCmin = map(pid[pitmaster.pid].DCmin,0,100,0,pitmaster.pause);
         int _DCmax = map(pid[pitmaster.pid].DCmax,0,100,0,pitmaster.pause);
         pitmaster.msec = map(pitmaster.value,0,100,_DCmin,_DCmax); 
+        if (sys.hwversion > 1) digitalWrite(PITSUPPLY, HIGH);   // 12V Supply
         if (pitmaster.msec > 0) digitalWrite(PITMASTER1, HIGH);
         if (pitmaster.msec < pitmaster.pause) pitmaster.event = true;  // außer bei 100%
       }
     }
-  } else {
-    if (pid[pitmaster.pid].aktor == 1)
+  } else {    // TURN OFF PITMASTER
+    if (pid[pitmaster.pid].aktor == 1)  // FAN
       analogWrite(PITMASTER1, LOW);
-    else digitalWrite(PITMASTER1, LOW);
+    else digitalWrite(PITMASTER1, LOW); // SSR
+    if (sys.hwversion > 1) digitalWrite(PITSUPPLY, LOW);   // 12V Supply
     pitmaster.value = 0;
     pitmaster.event = false;
     pitmaster.msec = 0;

c_server.h

@@ -365,8 +365,13 @@ void server_setup() {
   });
 
   server.on("/pitsupply",[](AsyncWebServerRequest *request){
-    if (sys.hwversion == 2) digitalWrite(PITSUPPLY, HIGH);
-    request->send(200, "text/plain", "aktiviert");
+    if (sys.hwversion > 1 && !sys.pitsupply) {
+      sys.pitsupply = true;
+      request->send(200, "text/plain", "aktiviert");
+    } else {
+      sys.pitsupply = false;
+      request->send(200, "text/plain", "deaktiviert");
+    }
   });
 
   server.on("/startlog",[](AsyncWebServerRequest *request){