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

input completed

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-08-02 15:58:10 +02:00
parent 8df3ab8946
commit 6c969a2455
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Class/Input.h
View File

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include <Arduino.h> #include <Arduino.h>
#include "Class/LineParsing.h" #include "Class/LineParsing.h"
#include "Global.h" #include "Global.h"
@@ -14,7 +15,7 @@ class Input : public LineParsing {
void inputSet(String key, String state) { void inputSet(String key, String state) {
eventGen(key, ""); eventGen(key, "");
jsonWriteInt(configLiveJson, key, state.toInt()); jsonWriteFloat(configLiveJson, key, state.toFloat());
MqttClient::publishStatus(key, state); MqttClient::publishStatus(key, state);
} }
}; };

35
include/Class/LineParsing.h
View File

@@ -1,9 +1,10 @@
#pragma once #pragma once
#include <Arduino.h> #include <Arduino.h>
#include "Global.h" #include "Global.h"
class LineParsing { class LineParsing {
protected: protected:
String _key; String _key;
String _file; String _file;
@@ -20,22 +21,22 @@ class LineParsing {
String _db; String _db;
public: public:
LineParsing() : LineParsing() :
_key{""}, _key{""},
_file{""}, _file{""},
_page{""}, _page{""},
_descr{""}, _descr{""},
_order{""}, _order{""},
_addr{""}, _addr{""},
_pin{""}, _pin{""},
_map{""}, _map{""},
_c{""}, _c{""},
_inv{""}, _inv{""},
_state{""}, _state{""},
_db{""} _db{""}
{}; {};
void update() { void update() {
//String order = sCmd.order(); //String order = sCmd.order();
@@ -65,6 +66,10 @@ class LineParsing {
} }
} }
} }
_page.replace("#", " ");
_descr.replace("#", " ");
_page.replace(".", " ");
_descr.replace(".", " ");
createWidgetClass(_descr, _page, _order, _file, _key); createWidgetClass(_descr, _page, _order, _file, _key);
} }

9
src/Cmd.cpp
View File

@@ -177,7 +177,7 @@ void buttonInSet() {
} }
//==========================================Модуль ввода цифровых значений================================== //==========================================Модуль ввода цифровых значений==================================
//digit-input digit1 inputNum Ввод Введите 1 st[60] //input-digit digit1 inputNum Ввод Введите 4 st[60]
//========================================================================================================== //==========================================================================================================
void inputDigit() { void inputDigit() {
myInput = new Input(); myInput = new Input();
@@ -185,12 +185,13 @@ void inputDigit() {
String key = myInput->gkey(); String key = myInput->gkey();
sCmd.addCommand(key.c_str(), inputDigitSet); sCmd.addCommand(key.c_str(), inputDigitSet);
myInput->inputSetDefault(); myInput->inputSetDefault();
myInput->clear();
} }
void inputDigitSet() { void inputDigitSet() {
String key = sCmd.order();
String state = sCmd.next();
myInput->inputSet(key, state);
} }
//===================================================================================================================================== //=====================================================================================================================================