mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 22:22:16 +03:00
working version
This commit is contained in:
@@ -1 +1 @@
|
||||
analog-adc;id;anydata;Сенсоры;Аналоговый;order;pin-adc;map[1,1024,1,1024];c[1]
|
||||
analog-adc;id;anydata;Сенсоры;Аналоговый;order;gol;map[0,1024,0,1024];c[1]
|
||||
@@ -1 +1 @@
|
||||
dallas-temp;id;anydata;Сенсоры;Температура;order;pin;c[1]
|
||||
dallas-temp;id;anydata;Сенсоры;Температура;order;sal;c[1]
|
||||
@@ -1 +1 @@
|
||||
ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;pin[12,13];map[1,100,1,100];c[1]
|
||||
ultrasonic-cm;id;anydata;Сенсоры;Расстояние;order;cin;map[0,500,0,100];c[1]
|
||||
@@ -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();
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#pragma once
|
||||
#include <Arduino.h>
|
||||
|
||||
#include "Class/LineParsing.h"
|
||||
#include "Global.h"
|
||||
#include "items/SensorConvertingClass.h"
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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", "");
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user