impuls bug fixed

This commit is contained in:
Dmitry Borisenko
2020-11-02 15:20:04 +03:00
parent 50590bc90e
commit 777a04b901
4 changed files with 23 additions and 16 deletions

View File

@@ -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, ",");

View File

@@ -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

View File

@@ -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) {