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

output text module added

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-08-26 16:39:42 +03:00
parent 90e6822d3b
commit ffc5e6c894
13 changed files with 83 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Class/CallBackTest.cpp
View File

@@ -37,7 +37,7 @@ void CallBackTest::setCallback(AsyncActionCb cb) {
void CallBackTest::setCallback(AsyncParamActionCb pcb) {
_pcb = pcb;
}
CallBackTest* CB;
//CallBackTest* CB;
//CB->setCallback([]() {
// Serial.println("123");

2
src/Class/OutputModule.cpp Normal file
View File

@@ -0,0 +1,2 @@
#include "Class/OutputModule.h"
OutputModule* myText;

60
src/Cmd.cpp
View File

@@ -5,6 +5,7 @@
#include "Class/LineParsing.h"
#include "Class/Pwm.h"
#include "Class/Switch.h"
#include "Class/OutputModule.h"
//-----------------------------
#include "Class/NotAsinc.h"
#include "Global.h"
@@ -32,9 +33,8 @@ void cmd_init() {
sCmd.addCommand("button-in", buttonIn);
sCmd.addCommand("input-digit", inputDigit);
sCmd.addCommand("input-time", inputTime);
sCmd.addCommand("output-text", textOut);
sCmd.addCommand("text", text);
sCmd.addCommand("textSet", textSet);
@@ -235,29 +235,45 @@ void handle_time_init() {
//===============================================Модуль вывода текста============================================
//output-text;id;anydata;Вывод;Сигнализация;order;st[Обнаружено.движение]
//===============================================================================================================
void text() {
String number = sCmd.next();
String widget_name = sCmd.next();
String page_name = sCmd.next();
String page_number = sCmd.next();
createWidget(widget_name, page_name, page_number, "anydata", "text" + number);
void textOut() {
myText = new OutputModule();
myText->update();
String key = myText->gkey();
sCmd.addCommand(key.c_str(), textOutSet);
myText->OutputModuleStateSetDefault();
myText->clear();
}
void textSet() {
String number = sCmd.next();
String text = sCmd.next();
text.replace("_", " ");
if (text.indexOf("-time") >= 0) {
text.replace("-time", "");
text.replace("#", " ");
text = text + " " + timeNow->getDateTimeDotFormated();
}
jsonWriteStr(configLiveJson, "text" + number, text);
MqttClient::publishStatus("text" + number, text);
void textOutSet() {
String key = sCmd.order();
String state = sCmd.next();
myText->OutputModuleChange(key, state);
}
//void text() {
// String number = sCmd.next();
// String widget_name = sCmd.next();
// String page_name = sCmd.next();
// String page_number = sCmd.next();
//
// createWidget(widget_name, page_name, page_number, "anydata", "text" + number);
//}
//
//void textSet() {
// String number = sCmd.next();
// String text = sCmd.next();
// text.replace("_", " ");
//
// if (text.indexOf("-time") >= 0) {
// text.replace("-time", "");
// text.replace("#", " ");
// text = text + " " + timeNow->getDateTimeDotFormated();
// }
//
// jsonWriteStr(configLiveJson, "text" + number, text);
// MqttClient::publishStatus("text" + number, text);
//}
//=====================================================================================================================================
//=========================================Модуль шагового мотора======================================================================
#ifdef STEPPER_ENABLED