iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-27 22:52:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

add analog sensor

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-08-28 02:49:26 +03:00
parent 74a7c8f528
commit c473f616b6
14 changed files with 286 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Cmd.cpp
View File

@@ -3,9 +3,9 @@
#include "Class/Button.h"
#include "Class/Input.h"
#include "Class/LineParsing.h"
#include "Class/OutputModule.h"
#include "Class/Pwm.h"
#include "Class/Switch.h"
#include "Class/OutputModule.h"
//-----------------------------
#include "Class/NotAsinc.h"
#include "Global.h"
@@ -36,7 +36,12 @@ void cmd_init() {
sCmd.addCommand("input-time", inputTime);
sCmd.addCommand("output-text", textOut);
#ifdef ANALOG_ENABLED
sCmd.addCommand("analog-adc", analogAdc);
#endif
@@ -45,11 +50,6 @@ void cmd_init() {
sCmd.addCommand("timerStart", timerStart_);
sCmd.addCommand("timerStop", timerStop_);
#ifdef ANALOG_ENABLED
sCmd.addCommand("analog", analog);
#endif
#ifdef LEVEL_ENABLED
sCmd.addCommand("levelPr", levelPr);
sCmd.addCommand("ultrasonicCm", ultrasonicCm);
@@ -253,7 +253,6 @@ void textOutSet() {
myText->OutputModuleChange(key, state);
}
//void text() {
// String number = sCmd.next();
// String widget_name = sCmd.next();
@@ -490,8 +489,8 @@ void fileExecute(const String &filename) {
csvExecute(cmdStr);
}
void csvExecute(String &cmdStr) {
cmdStr.replace(";"," ");
void csvExecute(String &cmdStr) {
cmdStr.replace(";", " ");
cmdStr += "\r\n";
cmdStr.replace("\r\n", "\n");
cmdStr.replace("\r", "\n");
@@ -499,12 +498,12 @@ void csvExecute(String &cmdStr) {
while (cmdStr.length()) {
String buf = selectToMarker(cmdStr, "\n");
count++;
if (count > 1)sCmd.readStr(buf);
if (count > 1) sCmd.readStr(buf);
cmdStr = deleteBeforeDelimiter(cmdStr, "\n");
}
}
void spaceExecute(String &cmdStr) {
void spaceExecute(String &cmdStr) {
cmdStr += "\r\n";
cmdStr.replace("\r\n", "\n");
cmdStr.replace("\r", "\n");