Better support for triple and quadruple clicks (#10472)

Co-authored-by: Stephan Hadinger <stephan.hadinger@gmail.com>
This commit is contained in:
s-hadinger 2021-01-09 14:48:51 +01:00 committed by GitHub
parent f0f36fb5b5
commit 5661c1d1c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 9 deletions

View File

@ -1799,33 +1799,49 @@ void ZCLFrame::syntheticAqaraCubeOrButton(class Z_attribute_list &attr_list, cla
// presentValue = x + 512 = double tap while side x is on top
} else if (modelId.startsWith(F("lumi.remote")) || modelId.startsWith(F("lumi.sensor_swit"))) { // only for Aqara buttons WXKG11LM & WXKG12LM, 'swit' because of #9923
int32_t val = attr.getInt();
const __FlashStringHelper *aqara_click = F("click");
const __FlashStringHelper *aqara_action = F("action");
const __FlashStringHelper *aqara_click = F("click"); // deprecated
const __FlashStringHelper *aqara_action = F("action"); // deprecated
static const char * aqara_Click = PSTR("Click");
static const char * aqara_Action = PSTR("Action");
switch (val) {
case 0:
attr_list.addAttribute(aqara_action).setStr(PSTR("hold"));
attr_list.addAttribute(aqara_action).setStr(PSTR("hold")); // deprecated
attr_list.addAttribute(aqara_Action, true).setStr(PSTR("hold"));
break;
case 1:
attr_list.addAttribute(aqara_click).setStr(PSTR("single"));
attr_list.addAttribute(aqara_click).setStr(PSTR("single")); // deprecated
attr_list.addAttribute(aqara_Click, true).setStr(PSTR("single"));
break;
case 2:
attr_list.addAttribute(aqara_click).setStr(PSTR("double"));
attr_list.addAttribute(aqara_click).setStr(PSTR("double")); // deprecated
attr_list.addAttribute(aqara_Click, true).setStr(PSTR("double"));
break;
case 3:
attr_list.addAttribute(aqara_Click, true).setStr(PSTR("triple"));
break;
case 4:
attr_list.addAttribute(aqara_Click, true).setStr(PSTR("quadruple"));
break;
case 16:
attr_list.addAttribute(aqara_action).setStr(PSTR("hold"));
attr_list.addAttribute(aqara_action).setStr(PSTR("hold")); // deprecated
attr_list.addAttribute(aqara_Action, true).setStr(PSTR("hold"));
break;
case 17:
attr_list.addAttribute(aqara_action).setStr(PSTR("release"));
attr_list.addAttribute(aqara_action).setStr(PSTR("release")); // deprecated
attr_list.addAttribute(aqara_Action, true).setStr(PSTR("release"));
break;
case 18:
attr_list.addAttribute(aqara_action).setStr(PSTR("shake"));
attr_list.addAttribute(aqara_action).setStr(PSTR("shake")); // deprecated
attr_list.addAttribute(aqara_Action, true).setStr(PSTR("shake"));
break;
case 255:
attr_list.addAttribute(aqara_action).setStr(PSTR("release"));
attr_list.addAttribute(aqara_action).setStr(PSTR("release")); // deprecated
attr_list.addAttribute(aqara_Action, true).setStr(PSTR("release"));
break;
default:
attr_list.addAttribute(aqara_click).setUInt(val);
attr_list.addAttribute(aqara_Click, true).setStr(PSTR("release"));
break;
}
}