jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16344 from s-hadinger/zigbee_plugin_add

Browse Source 
Zigbee change offset: to add:
This commit is contained in:
s-hadinger 2022-08-26 08:44:31 +02:00 committed by GitHub
commit 25d023875e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_6_plugin.ino
View File

@ -22,7 +22,7 @@
const char Z_MUL[] PROGMEM = "mul:"; const char Z_MUL[] PROGMEM = "mul:";
const char Z_DIV[] PROGMEM = "div:"; const char Z_DIV[] PROGMEM = "div:";
const char Z_MANUF[] PROGMEM = "manuf:"; const char Z_MANUF[] PROGMEM = "manuf:";
const char Z_OFFSET[] PROGMEM = "offset:"; const char Z_ADD[] PROGMEM = "add:";
char * Z_subtoken(char * token, const char * prefix) { char * Z_subtoken(char * token, const char * prefix) {
size_t prefix_len = strlen_P(prefix); size_t prefix_len = strlen_P(prefix);
@ -268,7 +268,7 @@ bool ZbLoad(const char *filename_raw) {
divider = strtol(sub_token, nullptr, 10); // negative to indicate divider divider = strtol(sub_token, nullptr, 10); // negative to indicate divider
} }
// look for offset (base) // look for offset (base)
else if (sub_token = Z_subtoken(token, Z_OFFSET)) { else if (sub_token = Z_subtoken(token, Z_ADD)) {
base = strtol(sub_token, nullptr, 10); // negative to indicate divider base = strtol(sub_token, nullptr, 10); // negative to indicate divider
} }
// look for `manuf:HHHH` // look for `manuf:HHHH`
@ -318,7 +318,7 @@ bool ZbLoad(const char *filename_raw) {
divider = strtol(sub_token, nullptr, 10); // negative to indicate divider divider = strtol(sub_token, nullptr, 10); // negative to indicate divider
} }
// look for offset (base) // look for offset (base)
else if (sub_token = Z_subtoken(token, Z_OFFSET)) { else if (sub_token = Z_subtoken(token, Z_ADD)) {
base = strtol(sub_token, nullptr, 10); // negative to indicate divider base = strtol(sub_token, nullptr, 10); // negative to indicate divider
} }
else { else {
@ -389,7 +389,7 @@ void Z_AppendModifiers(char * buf, size_t buf_len, int8_t multiplier, int8_t div
ext_snprintf_P(buf, buf_len, "%s,%s%i", buf, Z_DIV, divider); ext_snprintf_P(buf, buf_len, "%s,%s%i", buf, Z_DIV, divider);
} }
if (base != 0) { if (base != 0) {
ext_snprintf_P(buf, buf_len, "%s,%s%i", buf, Z_OFFSET, base); ext_snprintf_P(buf, buf_len, "%s,%s%i", buf, Z_ADD, base);
} }
if (manuf) { if (manuf) {
ext_snprintf_P(buf, buf_len, "%s,%s%04X", buf, Z_MANUF, manuf); ext_snprintf_P(buf, buf_len, "%s,%s%04X", buf, Z_MANUF, manuf);