group restore/interim fix

This commit is contained in:
2019-09-14 06:53:04 +03:00
parent 4b1be34561
commit 206355b3ec
3 changed files with 6 additions and 4 deletions

View File

@@ -431,14 +431,15 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int suffixCode
debugSerial<<F("<")<<Par[i]<<F(">"); debugSerial<<F("<")<<Par[i]<<F(">");
} }
debugSerial<<F(")")<<endl; debugSerial<<F(")")<<endl;
int itemCategory = itemType;
/*
if (itemType == CH_GROUP && !send) if (itemType == CH_GROUP && !send)
{ {
debugSerial<<F("Skip Grp")<<endl; debugSerial<<F("Skip Grp")<<endl;
return -1; return -1;
} }
*/
int iaddr = getArg(); int iaddr = getArg();
int chActive =isActive(); int chActive =isActive();

View File

@@ -265,8 +265,9 @@ else
Item item(itemName); Item item(itemName);
if (item.isValid()) { if (item.isValid()) {
/*
if (item.itemType == CH_GROUP && (lanStatus == RETAINING_COLLECTING)) if (item.itemType == CH_GROUP && (lanStatus == RETAINING_COLLECTING))
return; //Do not restore group channels - they consist not relevant data return; //Do not restore group channels - they consist not relevant data */
item.Ctrl((char *)payload, !(lanStatus == RETAINING_COLLECTING),subItem); item.Ctrl((char *)payload, !(lanStatus == RETAINING_COLLECTING),subItem);
} //valid item } //valid item
} }

View File

@@ -18,7 +18,7 @@
#define THERMO_OVERHEAT_CELSIUS 38. #define THERMO_OVERHEAT_CELSIUS 38.
#define FM_OVERHEAT_CELSIUS 40. #define FM_OVERHEAT_CELSIUS 40.
#define MIN_VOLUME 10 #define MIN_VOLUME 25
#define INIT_VOLUME 50 #define INIT_VOLUME 50
#define MAXFLASHSTR 32 #define MAXFLASHSTR 32