working version

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);

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;

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", "");

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();