mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 22:22:16 +03:00
impuls bug fixed
This commit is contained in:
@@ -74,13 +74,13 @@ void sensorsInit() {
|
||||
nullptr, true);
|
||||
}
|
||||
|
||||
void addKey(String& key, int number) {
|
||||
impulsKeyList += key + " " + String(number) + ",";
|
||||
void addKey(String& key, String& keyNumberTable, int number) {
|
||||
keyNumberTable += key + " " + String(number) + ",";
|
||||
}
|
||||
|
||||
int getKeyNum(String& key) {
|
||||
String keyNumberTableBuf = impulsKeyList;
|
||||
//SerialPrint("","",impulsKeyList);
|
||||
int getKeyNum(String& key, String& keyNumberTable) {
|
||||
String keyNumberTableBuf = keyNumberTable;
|
||||
//SerialPrint("","",keyNumberTable);
|
||||
int number = -1;
|
||||
while (keyNumberTableBuf.length()) {
|
||||
String tmp = selectToMarker(keyNumberTableBuf, ",");
|
||||
|
||||
12
src/Init.cpp
12
src/Init.cpp
@@ -3,6 +3,7 @@
|
||||
#include "Cmd.h"
|
||||
#include "Global.h"
|
||||
#include "items/LoggingClass.h"
|
||||
#include "items/ImpulsOutClass.h"
|
||||
|
||||
void loadConfig() {
|
||||
configSetupJson = readFile("config.json", 4096);
|
||||
@@ -26,18 +27,25 @@ void all_init() {
|
||||
}
|
||||
|
||||
void Device_init() {
|
||||
|
||||
sensorReadingMap10sec = "";
|
||||
|
||||
dallasEnterCounter = -1;
|
||||
|
||||
//======clear logging params======
|
||||
if (myLogging != nullptr) {
|
||||
myLogging->clear();
|
||||
}
|
||||
|
||||
loggingKeyList = "";
|
||||
|
||||
//======clear impuls params=======
|
||||
if (myImpulsOut != nullptr) {
|
||||
myImpulsOut->clear();
|
||||
}
|
||||
impulsKeyList = "";
|
||||
impulsEnterCounter = -1;
|
||||
|
||||
|
||||
|
||||
#ifdef LAYOUT_IN_RAM
|
||||
all_widgets = "";
|
||||
#else
|
||||
|
||||
@@ -45,7 +45,7 @@ void impuls() {
|
||||
myLineParsing.clear();
|
||||
|
||||
impulsEnterCounter++;
|
||||
addKey(key, impulsEnterCounter);
|
||||
addKey(key, impulsKeyList, impulsEnterCounter);
|
||||
|
||||
static bool firstTime = true;
|
||||
if (firstTime) myImpulsOut = new MyImpulsOutVector();
|
||||
@@ -60,8 +60,7 @@ void impulsExecute() {
|
||||
String impulsPeriod = sCmd.next();
|
||||
String impulsCount = sCmd.next();
|
||||
|
||||
int number = getKeyNum(key);
|
||||
SerialPrint("I", "Impuls", key + " " + String(number));
|
||||
int number = getKeyNum(key, impulsKeyList);
|
||||
|
||||
if (myImpulsOut != nullptr) {
|
||||
if (number != -1) {
|
||||
|
||||
Reference in New Issue
Block a user