Midroom2 added fade

ESP_Midroom2/src/main.cpp

@@ -45,6 +45,7 @@ unsigned long stled;
 float wMins = 0;
 bool led, aht_pesent;
 uint8_t led_intense;
+uint8_t ledLev;
 
 ESP8266WiFiMulti wifiMulti;
 AsyncWebServer server(80);
@@ -119,10 +120,20 @@ void loop() {
   static unsigned long cRun = millis();
   static byte bSecs = 0;
   char v[10];
+  static unsigned long ledTime = 0;
 
 	ArduinoOTA.handle();
   if(!client.connected()) reconnect();
   client.loop();
+  if(led == false){
+    if(ledLev > 0){
+      if(ledTime + 50 <= millis()){
+        ledTime = millis();
+        ledLev--;
+      }
+      analogWrite(LAMP_OUT, ledLev);
+    }
+  }
   if(stled + 300 < millis()){
     digitalWrite(LED_WRK, HIGH);
   }
@@ -130,8 +141,8 @@ void loop() {
     cRun = millis();
     Serial.println(bSecs);
     if(aht_pesent && aht.getEvent(&humidity, &temp)){
-      temp_out += (temp.temperature- temp_out) / 120;
-      hum_out += (humidity.relative_humidity - hum_out) /120;
+      temp_out += (temp.temperature- temp_out) / 600;
+      hum_out += (humidity.relative_humidity - hum_out) / 600;
       WebSerial.print("Temp: ");
       WebSerial.print(temp.temperature);
       WebSerial.print(", Hum: ");
@@ -181,7 +192,7 @@ void callback(char* topic, byte* payload, unsigned int length) {
   Serial.print(topic);
   Serial.print("] ");
   char val[4];
-  int i;
+  unsigned int i;
   for (i = 0; i < length && i < 3; i++) {
     val[i] = (char)payload[i];
   }
@@ -189,11 +200,12 @@ void callback(char* topic, byte* payload, unsigned int length) {
   val[i] = 0;
   if(strcmp(topic, TOPIC"light") == 0){
     if(atoi(val) == 0){
-      analogWrite(LAMP_OUT, 0);
+      //analogWrite(LAMP_OUT, 0);
       led = false;
     }
     else{
       analogWrite(LAMP_OUT, led_intense);
+      ledLev = led_intense;
       led = true;
     }
   }
@@ -211,11 +223,12 @@ void reconnect() {
     digitalWrite(LED_MQ, LOW);
     Serial.print("Attempting MQTT connection...");
     // Attempt to connect
-    if (client.connect(HOSTNAME)) {
+    if (client.connect(HOSTNAME, TOPIC"online", 1, 1, "0")) {
       Serial.println("connected");
       char v[4];
       client.publish(TOPIC"ledint", itoa(int(led_intense / 2.55), v, 10));
       client.publish(TOPIC"light", led ? "1" : "0");
+      client.publish(TOPIC"online", "1");
       client.subscribe(TOPIC"light");
       client.subscribe(TOPIC"ledint");
     } else {

Poliv/.gitignore

@@ -0,0 +1,5 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch

Poliv/.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

Poliv/include/README

@@ -0,0 +1,39 @@
+
+This directory is intended for project header files.
+
+A header file is a file containing C declarations and macro definitions
+to be shared between several project source files. You request the use of a
+header file in your project source file (C, C++, etc) located in `src` folder
+by including it, with the C preprocessing directive `#include'.
+
+```src/main.c
+
+#include "header.h"
+
+int main (void)
+{
+ ...
+}
+```
+
+Including a header file produces the same results as copying the header file
+into each source file that needs it. Such copying would be time-consuming
+and error-prone. With a header file, the related declarations appear
+in only one place. If they need to be changed, they can be changed in one
+place, and programs that include the header file will automatically use the
+new version when next recompiled. The header file eliminates the labor of
+finding and changing all the copies as well as the risk that a failure to
+find one copy will result in inconsistencies within a program.
+
+In C, the usual convention is to give header files names that end with `.h'.
+It is most portable to use only letters, digits, dashes, and underscores in
+header file names, and at most one dot.
+
+Read more about using header files in official GCC documentation:
+
+* Include Syntax
+* Include Operation
+* Once-Only Headers
+* Computed Includes
+
+https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

Poliv/lib/README

@@ -0,0 +1,46 @@
+
+This directory is intended for project specific (private) libraries.
+PlatformIO will compile them to static libraries and link into executable file.
+
+The source code of each library should be placed in a an own separate directory
+("lib/your_library_name/[here are source files]").
+
+For example, see a structure of the following two libraries `Foo` and `Bar`:
+
+|--lib
+|  |
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
+|  |
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |
+|  |- README --> THIS FILE
+|
+|- platformio.ini
+|--src
+   |- main.c
+
+and a contents of `src/main.c`:
+```
+#include <Foo.h>
+#include <Bar.h>
+
+int main (void)
+{
+  ...
+}
+
+```
+
+PlatformIO Library Dependency Finder will find automatically dependent
+libraries scanning project source files.
+
+More information about PlatformIO Library Dependency Finder
+- https://docs.platformio.org/page/librarymanager/ldf.html

Poliv/platformio.ini

@@ -0,0 +1,20 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[env:esp32dev]
+platform = espressif32
+board = esp32dev
+framework = arduino
+lib_deps =
+  robtillaart/RunningMedian @ ^0.3.3
+  ayushsharma82/WebSerial @ ^1.3.0
+  ottowinter/ESPAsyncWebServer-esphome @ ^3.0.0
+  ayushsharma82/AsyncElegantOTA @ ^2.2.6
+monitor_speed = 115200

Poliv/src/main.cpp

@@ -0,0 +1,46 @@
+#include <Arduino.h>
+#include <WiFi.h>
+#include <WiFiMulti.h>
+#include <ESPAsyncWebServer.h>
+#include <WebSerial.h>
+#include <AsyncElegantOTA.h>
+
+uint16_t chVals[4];
+uint16_t startVals[4];
+uint8_t pinsA[] = {4, 0, 2, 15, 13};
+unsigned long cRun;
+uint8_t secs;
+uint16_t grSP;
+
+void setup() {
+  Serial.begin(115200);
+  cRun = millis();
+  secs = 0;
+}
+
+void loop() {
+  static uint8_t curCh = 0;
+  static uint8_t ch = 255;
+  static uint8_t numPoliv = 0;
+  uint32_t tmStart;
+  if ((cRun + 1000) <= millis()){
+    cRun = millis();
+    for (byte i = 0; i < 5; i++){
+      chVals[i] = analogRead(pinsA[i]);
+    }
+    secs++;
+    if(secs == 59){
+      secs = 0;
+      if(curCh != ch){
+        ch = curCh;
+        startVals[ch] = chVals[ch];
+        numPoliv = 0;
+        if(chVals[ch] < grSP){
+          //Set position
+          //Poliv on
+          tmStart = millis();
+        }
+      }
+    }
+  }
+}

Poliv/test/README

@@ -0,0 +1,11 @@
+
+This directory is intended for PlatformIO Test Runner and project tests.
+
+Unit Testing is a software testing method by which individual units of
+source code, sets of one or more MCU program modules together with associated
+control data, usage procedures, and operating procedures, are tested to
+determine whether they are fit for use. Unit testing finds problems early
+in the development cycle.
+
+More information about PlatformIO Unit Testing:
+- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html