Fixed Ultrasonic, Start uart

src/BufferExecute.cpp

@@ -2,6 +2,7 @@
 #include "Global.h"
 //
 #include "items/vSensorDallas.h"
+#include "items/vSensorUltrasonic.h"
 #include "items/vButtonOut.h"
 #include "items/vPwmOut.h"
 #include "items/vInOutput.h"
@@ -53,7 +54,7 @@ void csvCmdExecute(String& cmdStr) {
                 sCmd.addCommand(order.c_str(), analogAdc);
             }
             else if (order == F("ultrasonic-cm")) {
-                sCmd.addCommand(order.c_str(), ultrasonicCm);
+                sCmd.addCommand(order.c_str(), ultrasonic);
             }
             else if (order == F("dallas-temp")) {
                 sCmd.addCommand(order.c_str(), dallas);

src/Init.cpp

@@ -6,6 +6,7 @@
 #include "items/vImpulsOut.h"
 #include "items/vButtonOut.h"
 #include "items/vSensorDallas.h"
+#include "items/vSensorUltrasonic.h"
 #include "items/vInOutput.h"
 #include "items/vPwmOut.h"
 #include "items/vCountDown.h"
@@ -43,6 +44,10 @@ void Device_init() {
     if (mySensorDallas2 != nullptr) {
         mySensorDallas2->clear();
     }
+    //======clear ultrasonic params======
+    if (mySensorUltrasonic != nullptr) {
+        mySensorUltrasonic->clear();
+    }
     //======clear logging params======
     if (myLogging != nullptr) {
         myLogging->clear();

src/SoftUART.cpp

@@ -0,0 +1,27 @@
+#include "SoftUART.h"
+
+SoftwareSerial* myUART{ nullptr };
+
+void uartInit() {
+    if (!myUART) {
+        myUART = new SoftwareSerial(4, 5);
+    }
+}
+
+void uartHandle() {
+    static String incStr;
+    if (myUART->available()) {
+        char inc;
+        inc = myUART->read();
+        incStr += inc;
+        if (inc == 0x0A) {
+            parse(incStr);
+            incStr = "";
+        }
+    }
+}
+
+void parse(String& incStr) {
+
+    
+}

src/items/SensorUltrasonicClass.cpp

@@ -1,20 +1,20 @@
-#include "BufferExecute.h"
-#include "items/SensorUltrasonicClass.h"
-//#ifdef SensorUltrasonicEnabled
-//=========================================Модуль ультрозвукового дальномера==================================================================
-//ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;pin[12,13];map[1,100,1,100];c[1]
-//=========================================================================================================================================
-SensorUltrasonic mySensorUltrasonic;
-void ultrasonicCm() {
-    mySensorUltrasonic.update();
-    String key = mySensorUltrasonic.gkey();
-    sCmd.addCommand(key.c_str(), ultrasonicReading);
-    mySensorUltrasonic.init();
-    mySensorUltrasonic.clear();
-}
-
-void ultrasonicReading() {
-    String key = sCmd.order();
-    mySensorUltrasonic.SensorUltrasonicRead(key);
-}
-//#endif
+//#include "BufferExecute.h"
+//#include "items/SensorUltrasonicClass.h"
+////#ifdef SensorUltrasonicEnabled
+////=========================================Модуль ультрозвукового дальномера==================================================================
+////ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;pin[12,13];map[1,100,1,100];c[1]
+////=========================================================================================================================================
+//SensorUltrasonic mySensorUltrasonic;
+//void ultrasonicCm() {
+//    mySensorUltrasonic.update();
+//    String key = mySensorUltrasonic.gkey();
+//    sCmd.addCommand(key.c_str(), ultrasonicReading);
+//    mySensorUltrasonic.init();
+//    mySensorUltrasonic.clear();
+//}
+//
+//void ultrasonicReading() {
+//    String key = sCmd.order();
+//    mySensorUltrasonic.SensorUltrasonicRead(key);
+//}
+////#endif

src/items/vSensorUltrasonic.cpp

@@ -0,0 +1,89 @@
+#include "items/vSensorUltrasonic.h"
+#include "Class/LineParsing.h"
+#include "Global.h"
+#include "BufferExecute.h"
+#include <Arduino.h>
+
+GMedian<5, int> testFilter;
+
+SensorUltrasonic::SensorUltrasonic(String key, unsigned long interval, unsigned int trig, unsigned int echo, int map1, int map2, int map3, int map4, float c) {
+    _interval = interval * 1000;
+    _key = key;
+    _trig = trig;
+    _echo = echo;
+
+    _map1 = map1;
+    _map2 = map2;
+    _map3 = map3;
+    _map4 = map4;
+
+    _c = c;
+
+    pinMode(_trig, OUTPUT);
+    pinMode(_echo, INPUT);
+}
+
+SensorUltrasonic::~SensorUltrasonic() {}
+
+void SensorUltrasonic::loop() {
+    currentMillis = millis();
+    difference = currentMillis - prevMillis;
+    if (difference >= _interval) {
+        prevMillis = millis();
+        readUltrasonic();
+    }
+}
+
+void SensorUltrasonic::readUltrasonic() {
+
+    static unsigned int counter;
+    counter++;
+
+    int value;
+
+    digitalWrite(_trig, LOW);
+    delayMicroseconds(2);
+    digitalWrite(_trig, HIGH);
+    delayMicroseconds(10);
+    digitalWrite(_trig, LOW);
+    long duration_ = pulseIn(_echo, HIGH, 30000);  // 3000 µs = 50cm // 30000 µs = 5 m
+    value = duration_ / 29 / 2;
+
+    value = testFilter.filtered(value);
+
+    value = map(value, _map1, _map2, _map3, _map4);
+    float valueFloat = value * _c;
+
+    if (counter > 10) {
+        eventGen2(_key, String(valueFloat));
+        jsonWriteStr(configLiveJson, _key, String(valueFloat));
+        publishStatus(_key, String(valueFloat));
+        SerialPrint("I", "Sensor", "'" + _key + "' data: " + String(valueFloat));    
+    }
+}
+
+MySensorUltrasonicVector* mySensorUltrasonic = nullptr;
+
+void ultrasonic() {
+    myLineParsing.update();
+    String interval = myLineParsing.gint();
+    String pin = myLineParsing.gpin();
+    String key = myLineParsing.gkey();
+    String map = myLineParsing.gmap();
+    String c = myLineParsing.gc();
+    myLineParsing.clear();
+
+    unsigned int trig = selectFromMarkerToMarker(pin, ",", 0).toInt();
+    unsigned int echo = selectFromMarkerToMarker(pin, ",", 1).toInt();
+
+    int map1 = selectFromMarkerToMarker(map, ",", 0).toInt();
+    int map2 = selectFromMarkerToMarker(map, ",", 1).toInt();
+    int map3 = selectFromMarkerToMarker(map, ",", 2).toInt();
+    int map4 = selectFromMarkerToMarker(map, ",", 3).toInt();
+
+    static bool firstTime = true;
+    if (firstTime) mySensorUltrasonic = new MySensorUltrasonicVector();
+    firstTime = false;
+    mySensorUltrasonic->push_back(SensorUltrasonic(key, interval.toInt(), trig, echo, map1, map2, map3, map4, c.toFloat()));
+}
+

src/main.cpp

@@ -19,6 +19,7 @@
 #include "items/vImpulsOut.h"
 #include "items/vSensorDallas.h"
 #include "items/vCountDown.h"
+#include "items/vSensorUltrasonic.h"
 #include "Telegram.h"
 
 void not_async_actions();
@@ -169,6 +170,11 @@ void loop() {
             mySensorDallas2->at(i).loop();
         }
     }
+    if (mySensorUltrasonic != nullptr) {
+        for (unsigned int i = 0; i < mySensorUltrasonic->size(); i++) {
+            mySensorUltrasonic->at(i).loop();
+        }
+    }
     if (myCountDown != nullptr) {
         for (unsigned int i = 0; i < myCountDown->size(); i++) {
             myCountDown->at(i).loop();