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

Changes

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-09-04 18:58:03 +03:00
parent a258c8c1b6
commit 799118d763
29 changed files with 630 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/BufferExecute.h Normal file
View File

@@ -0,0 +1,8 @@
#pragma once
#include <Arduino.h>
extern void loopCmdAdd(const String &cmdStr);
extern void fileCmdExecute(const String &filename);
extern void csvCmdExecute(String &cmdStr);
extern void spaceCmdExecute(String &cmdStr);
extern void loopCmdExecute();

2
include/Class/ScenarioClass.h
View File

@@ -98,7 +98,7 @@ class Scenario {
if (this->isConditionSatisfied()) { //если вошедшее событие выполняет условие сценария
_scenBlok = deleteBeforeDelimiter(_scenBlok, "\n");
//Serial.println(" [>] Making: " + _scenBlok);
spaceExecute(_scenBlok);
spaceCmdExecute(_scenBlok);
}
}
this->delOneScenBlock(); //удалим использованный блок

6
include/Cmd.h
View File

@@ -60,6 +60,6 @@ extern void firmwareVersion();
extern void firmwareUpdate();
extern void loadScenario();
extern void fileExecute(const String& filename);
extern void csvExecute(String& cmdStr);
extern void spaceExecute(String& cmdStr);
extern void fileCmdExecute(const String& filename);
extern void csvCmdExecute(String& cmdStr);
extern void spaceCmdExecute(String& cmdStr);

2
include/Consts.h
View File

@@ -30,7 +30,7 @@
//#define WEBSOCKET_ENABLED
//#define LAYOUT_IN_RAM
//#define UDP_ENABLED
#define SSDP
#define SSDP_EN
/*
* Sensor

6
include/Global.h
View File

@@ -139,11 +139,7 @@ extern void udpInit();
extern void do_udp_data_parse();
extern void do_mqtt_send_settings_to_udp();
extern void addCommandLoop(const String& cmdStr);
extern void loopSerial();
extern void loopCmd();
extern void loopScenario();
extern void loopUdp();
extern void do_update();

0
include/items/itemsGlobal.h → include/ItemsCmd.h
View File

2
include/Module/Runner.h
View File

@@ -12,6 +12,6 @@ class CmdRunner : public Runner {
public:
void run(const char* cmd, Print* out) override {
String cmdStr{cmd};
csvExecute(cmdStr);
csvCmdExecute(cmdStr);
}
};

3
include/SSDP.h
View File

@@ -1,6 +1,7 @@
#pragma once
#ifdef SSDP
#include "Global.h"
#include <Arduino.h>
#ifdef SSDP_EN
extern void SsdpInit();
extern String xmlNode(String tags, String data);
extern String decToHex(uint32_t decValue, byte desiredStringLength);