Merge with latest changes from 2.3

This commit is contained in:
Bertrand Songis
2019-03-16 14:29:18 +01:00
27 changed files with 414 additions and 27 deletions
@@ -268,7 +268,13 @@ void menuModelLogicalSwitches(event_t event)
POPUP_MENU_ADD_ITEM(STR_PASTE);
if (cs->func || cs->v1 || cs->v2 || cs->delay || cs->duration || cs->andsw)
POPUP_MENU_ADD_ITEM(STR_CLEAR);
POPUP_MENU_START(onLogicalSwitchesMenu);
if(popupMenuNoItems == 1) {
popupMenuNoItems = 0;
s_currIdx = sub;
pushMenu(menuModelLogicalSwitchOne);
}
else
POPUP_MENU_START(onLogicalSwitchesMenu);
}
for (uint8_t i=0; i<LCD_LINES-1; i++) {