From 551b35ff4f505e40718449acd3870332ac5986b6 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Fri, 4 Sep 2020 00:35:38 +0300
Subject: [PATCH] working version

---
 data/items/analog-adc.txt             |  2 +-
 data/items/dallas-tmp.txt             |  2 +-
 data/items/ultrasonic-cm.txt          |  2 +-
 include/Cmd.h                         |  2 +-
 include/items/SensorUltrasonicClass.h |  1 -
 src/Cmd.cpp                           |  6 ++----
 src/Init.cpp                          |  6 +-----
 src/ItemsList.cpp                     | 11 ++++++++---
 src/items/SensorUltrasonicClass.cpp   |  1 -
 9 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/data/items/analog-adc.txt b/data/items/analog-adc.txt
index ad72b7f9..73e84382 100644
--- a/data/items/analog-adc.txt
+++ b/data/items/analog-adc.txt
@@ -1 +1 @@
-analog-adc;id;anydata;Сенсоры;Аналоговый;order;pin-adc;map[1,1024,1,1024];c[1]
\ No newline at end of file
+analog-adc;id;anydata;Сенсоры;Аналоговый;order;gol;map[0,1024,0,1024];c[1]
\ No newline at end of file
diff --git a/data/items/dallas-tmp.txt b/data/items/dallas-tmp.txt
index a710b34d..bdc19b76 100644
--- a/data/items/dallas-tmp.txt
+++ b/data/items/dallas-tmp.txt
@@ -1 +1 @@
-dallas-temp;id;anydata;Сенсоры;Температура;order;pin;c[1]
\ No newline at end of file
+dallas-temp;id;anydata;Сенсоры;Температура;order;sal;c[1]
\ No newline at end of file
diff --git a/data/items/ultrasonic-cm.txt b/data/items/ultrasonic-cm.txt
index c666305f..8792229c 100644
--- a/data/items/ultrasonic-cm.txt
+++ b/data/items/ultrasonic-cm.txt
@@ -1 +1 @@
-ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;pin[12,13];map[1,100,1,100];c[1]
\ No newline at end of file
+ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;cin;map[0,500,0,100];c[1]
\ No newline at end of file
diff --git a/include/Cmd.h b/include/Cmd.h
index 948440d3..705b7eb4 100644
--- a/include/Cmd.h
+++ b/include/Cmd.h
@@ -15,7 +15,7 @@ extern void analog_reading2();
 extern void dallas_reading();
 extern void dhtT_reading();
 
-extern void dallas();
+//extern void dallas();
 
 extern void bmp280T();
 extern void bmp280P();
diff --git a/include/items/SensorUltrasonicClass.h b/include/items/SensorUltrasonicClass.h
index bd49cc44..001cc89b 100644
--- a/include/items/SensorUltrasonicClass.h
+++ b/include/items/SensorUltrasonicClass.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <Arduino.h>
-
 #include "Class/LineParsing.h"
 #include "Global.h"
 #include "items/SensorConvertingClass.h"
diff --git a/src/Cmd.cpp b/src/Cmd.cpp
index 7e5b5912..1a5b03c4 100644
--- a/src/Cmd.cpp
+++ b/src/Cmd.cpp
@@ -30,7 +30,7 @@ void cmd_init() {
     sCmd.addCommand("output-text", textOut);
 
     sCmd.addCommand("analog-adc", analogAdc);
-    sCmd.addCommand("ultrasonicCm", ultrasonicCm);
+    sCmd.addCommand("ultrasonic-cm", ultrasonicCm);
     sCmd.addCommand("dallas-temp", dallasTemp);
 
 
@@ -41,9 +41,7 @@ void cmd_init() {
 
     sCmd.addCommand("timerStart", timerStart_);
     sCmd.addCommand("timerStop", timerStop_);
-#ifdef DALLAS_ENABLED
-    sCmd.addCommand("dallas", dallas);
-#endif
+
 #ifdef DHT_ENABLED
     sCmd.addCommand("dhtT", dhtT);
     sCmd.addCommand("dhtH", dhtH);
diff --git a/src/Init.cpp b/src/Init.cpp
index f2f54098..85630012 100644
--- a/src/Init.cpp
+++ b/src/Init.cpp
@@ -25,17 +25,13 @@ void all_init() {
 void Device_init() {
 
      sensorReadingMap = "";
+     dallasEnterCounter = -1;
 
 
 
 
 
     logging_value_names_list = "";
-
-
-
-
-
     enter_to_logging_counter = LOG1 - 1;
     //analog_value_names_list = "";
     //enter_to_analog_counter = 0;
diff --git a/src/ItemsList.cpp b/src/ItemsList.cpp
index dcb194f7..b0ef9d36 100644
--- a/src/ItemsList.cpp
+++ b/src/ItemsList.cpp
@@ -9,11 +9,16 @@ void addItem(String name) {
     name = deleteToMarkerLast(name, "-");
     item.replace("id", name + String(getNewElementNumber("id.txt")));
     item.replace("order", String(getNewElementNumber("order.txt")));
-    if (item.indexOf("pin-adc") != -1) {
-        item.replace("pin-adc", "pin[" + String(getFreePinAnalog()) + "]");
-    } else if (item.indexOf("pin") != -1) {
+    if (item.indexOf("pin") != -1) {  //all cases
         item.replace("pin", "pin[" + String(getFreePinAll()) + "]");
+    } else if (item.indexOf("gol") != -1) {  //analog
+        item.replace("gol", "pin[" + String(getFreePinAnalog()) + "]");
+    } else if (item.indexOf("cin") != -1) {  //ultrasonic
+        item.replace("cin", "pin[" + String(getFreePinAll()) + "," + String(getFreePinAll()) + "]");
+    } else if (item.indexOf("sal") != -1) {  //dallas
+        item.replace("sal", "pin[2]");
     }
+
     item.replace("\r\n", "");
     item.replace("\r", "");
     item.replace("\n", "");
diff --git a/src/items/SensorUltrasonicClass.cpp b/src/items/SensorUltrasonicClass.cpp
index 02d5456e..3ae3f062 100644
--- a/src/items/SensorUltrasonicClass.cpp
+++ b/src/items/SensorUltrasonicClass.cpp
@@ -8,7 +8,6 @@ SensorUltrasonic mySensorUltrasonic;
 void ultrasonicCm() {
     mySensorUltrasonic.update();
     String key = mySensorUltrasonic.gkey();
-    String pin = mySensorUltrasonic.gpin();
     sCmd.addCommand(key.c_str(), ultrasonicReading);
     mySensorUltrasonic.init();
     mySensorUltrasonic.clear();