+
# RELEASE NOTES
@@ -10,8 +10,13 @@ See [wiki migration path](https://github.com/arendst/Sonoff-Tasmota/wiki/Upgrade
3. Migrate to **Sonoff-Tasmota 5.14**
4. Migrate to **Sonoff-Tasmota 6.x**
-## Core version 2.3.0 vs 2.4.2
-This release is based on ESP8266/Arduino library core 2.3.0 (again) as some people encountered wifi related issues on core 2.4.2. For others core 2.4.2 is working just fine. Both version are available from http://thehackbox.org/tasmota/release/
+## Support of TLS
+TLS support for core 2.3.0 is removed.
+
+TLS is supported on core 2.4.2 and up. To save resources when TLS is enabled mDNS needs to be disabled. In addition to TLS using fingerprints now also user supplied CA certs and AWS IoT is supported. See full documentation on https://github.com/arendst/Sonoff-Tasmota/wiki/AWS-IoT
+
+## Core version 2.3.0 vs 2.4.2 vs 2.5.2
+This release is based on ESP8266/Arduino library core 2.3.0 as some people encountered wifi related issues on core 2.4.2 and 2.5.2. For others core 2.4.2 or 2.5.2 is working just fine. All version are available from http://thehackbox.org/tasmota/release/
## Change in default initial configuration tool
Firmware binary **sonoff-classic.bin** supports **WifiManager, Wps and SmartConfig** for initial configuration. The default tool is **Wps**.
@@ -92,6 +97,7 @@ Module | Description
67 SP10 | Tuya SP10 Wifi Smart Switch with Energy Monitoring
68 WAGA CHCZ02MB | WAGA life CHCZ02MB Wifi Smart Switch with Energy Monitoring
69 SYF05 | Sunyesmart SYF05 RGBWW Wifi Led Bulb
+70 Sonoff L1 | Sonoff L1 light strip
## Provided Binary Downloads
The following binary downloads have been compiled with ESP8266/Arduino library core version **2.3.0**.
@@ -107,6 +113,8 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
Core version **2.4.2** binaries can be found at http://thehackbox.org/tasmota/release/020402/
+Core version **2.5.2** binaries can be found at http://thehackbox.org/tasmota/release/020502/
+
## Available Features and Sensors
| Feature or Sensor | minimal | basic | classic | sonoff | knx | sensors | display | Remarks
@@ -118,9 +126,12 @@ Core version **2.4.2** binaries can be found at http://thehackbox.org/tasmota/re
| USE_DOMOTICZ | - | - | x | x | x | x | - |
| USE_HOME_ASSISTANT | - | - | - | x | x | x | - |
| USE_MQTT_TLS | - | - | - | - | - | - | - |
+| USE_MQTT_TLS_CA_CERT | - | - | - | - | - | - | - |
+| USE_MQTT_AWS_IOT | - | - | - | - | - | - | - |
| USE_KNX | - | - | - | - | x | - | - |
| USE_WEBSERVER | x | x | x | x | x | x | x | WifiManager
-| USE_EMULATION | - | x | x | x | - | x | - |
+| USE_EMULATION_HUE | - | x | x | x | - | x | - |
+| USE_EMULATION_WEMO | - | x | x | x | - | x | - |
| USE_DISCOVERY | - | - | x | x | x | x | x |
| WEBSERVER_ADVERTISE | - | - | x | x | x | x | x |
| MQTT_HOST_DISCOVERY | - | - | x | x | x | x | x |
@@ -128,12 +139,15 @@ Core version **2.4.2** binaries can be found at http://thehackbox.org/tasmota/re
| USE_TIMERS_WEB | - | x | - | x | x | x | x |
| USE_SUNRISE | - | x | - | x | x | x | x |
| USE_RULES | - | x | - | x | x | x | x |
+| USE_SCRIPT | - | - | - | - | - | - | - |
| USE_EXPRESSION | - | - | - | - | - | - | - |
| | | | | | | | |
-| USE_ADC_VCC | x | x | x | x | x | - | x |
+| USE_ADC_VCC | x | x | x | - | - | - | - |
+| USE_COUNTER | - | - | - | x | x | x | x |
| USE_DS18B20 | - | - | - | - | - | - | - | Single sensor
| USE_DS18x20 | - | - | x | x | x | x | x | Multiple sensors
| USE_DS18x20_LEGACY | - | - | - | - | - | - | - | Multiple sensors
+| USE_DHT | - | - | x | x | x | x | x |
| | | | | | | | |
| Feature or Sensor | minimal | basic | classic | sonoff | knx | sensors | display | Remarks
| USE_I2C | - | - | - | x | x | x | x |
@@ -162,6 +176,10 @@ Core version **2.4.2** binaries can be found at http://thehackbox.org/tasmota/re
| USE_MGC3130 | - | - | - | - | - | - | - |
| USE_MAX44009 | - | - | - | - | - | - | - |
| USE_SCD30 | - | - | - | - | - | x | - |
+| USE_SPS30 | - | - | - | - | - | - | - |
+| USE_ADE7953 | - | - | - | x | x | x | x |
+| USE_VL53L0X | - | - | - | - | - | - | - |
+| USE_MLX90614 | - | - | - | - | - | - | - |
| | | | | | | | |
| Feature or Sensor | minimal | basic | classic | sonoff | knx | sensors | display | Remarks
| USE_SPI | - | - | - | - | - | - | x |
@@ -206,81 +224,80 @@ Core version **2.4.2** binaries can be found at http://thehackbox.org/tasmota/re
| USE_DISPLAY_EPAPER_29 | - | - | - | - | - | - | x | Disabled for core 2.3.0
## Changelog
-Version 6.5.0 20190319
- * Remove commands SetOption14 and SetOption63 as it has been superseded by command Interlock
- * Remove command SetOption35 0-255 for mDNS start-up delay (#4793)
- * Remove support for MQTT_LIBRARY_TYPE, MQTT_ARDUINOMQTT and MQTT_TASMOTAMQTT (#5474)
- * Change webserver content handling from single String to small Chunks increasing RAM
- * Change code use of boolean to bool and byte to uint8_t
- * Change code uint8_t flags to bool flags
- * Change sonoff_template.h layout regarding optional module flags like ADC0
- * Change sonoff_template.h module lay-out by removing non-configurable GPIOs
- * Change button driver making it modular
- * Change switch driver making it modular and introduce input filter (#4665, #4724)
- * Change switch input detection by optimizing switch debounce (#4724)
- * Change web authentication (#4865)
- * Change image name BE_MINIMAL to FIRMWARE_MINIMAL and USE_xyz to FIRMWARE_xyz (#5106)
- * Change GUI weblog from XML to plain text solving possible empty screens (#5154)
- * Fix most compiler warnings
- * Fix Display exception 28 when JSON value is NULL received
- * Fix epaper driver (#4785)
- * Fix HAss Sensor Discovery Software Watchdog restart (#4831, #4988)
- * Fix allowable MAX_RULE_VARS to 16 (#4933)
- * Fix mDNS addService (#4938, #4951)
- * Fix HAss discovery of MHZ19(B) sensors (#4992)
- * Fix some exceptions and watchdogs due to lack of stack space (#5215)
- * Fix GUI wifi password acception starting with asteriks (*) (#5231, #5242)
- * Fix command WebSend intermittent results (#5273, #5304)
- * Fix additional characters in fallbacktopic, hostname and mqttclient on core 2.5.0 (#5359, #5417)
- * Fix Energy TotalStartTime when commands EnergyReset0 and/or EnergyReset3 used (#5373)
- * Fix DS18S20 temperature calculation (#5375)
- * Fix float calculations in range from 0 to -1 (#5386)
- * Fix exception on GUI Configure Logging and Configure Other (#5424)
- * Add commands PowerCal, VoltageCal and CurrentCal for HLW8012, HJL01 and BL0937 based energy sensors
- * Add command SerialDelimiter 128 to filter reception of only characters between ASCII 32 and 127 (#5131)
- * Add command SSerialSend5 \| \").replace(/{m}/g,\" | \").replace(/{e}/g,\" |
|---|---|
| "; + +const char SCRIPT_MSG_BUTTONb[] PROGMEM = + " |
%s%s%s
"
"";
-const char SCRIPT_MSG_BUTTON[] PROGMEM =
- "";
-
const char SCRIPT_MSG_CHKBOX[] PROGMEM =
"%s
"),tmp);
} else {
WSContentSend_PD(PSTR("{s}%s{e}"),tmp);
}
@@ -3916,6 +4437,7 @@ bool Xdrv10(uint8_t function)
if (bitRead(Settings.rule_enabled, 0)) {
Run_Scripter(">B",2,0);
fast_script=Run_Scripter(">F",-2,0);
+ Script_Check_Hue(0);
}
break;
case FUNC_EVERY_100_MSECOND:
@@ -3954,12 +4476,16 @@ bool Xdrv10(uint8_t function)
break;
#ifdef SUPPORT_MQTT_EVENT
case FUNC_MQTT_DATA:
- result = ScriptMqttData();
+ if (bitRead(Settings.rule_enabled, 0)) {
+ result = ScriptMqttData();
+ }
break;
#endif //SUPPORT_MQTT_EVENT
#ifdef USE_SCRIPT_WEB_DISPLAY
case FUNC_WEB_SENSOR:
- ScriptWebShow();
+ if (bitRead(Settings.rule_enabled, 0)) {
+ ScriptWebShow();
+ }
break;
#endif //USE_SCRIPT_WEB_DISPLAY
diff --git a/sonoff/xdrv_20_hue.ino b/sonoff/xdrv_20_hue.ino
index afb11deb5..d39da9a4c 100644
--- a/sonoff/xdrv_20_hue.ino
+++ b/sonoff/xdrv_20_hue.ino
@@ -276,6 +276,12 @@ void HueLightStatus1(uint8_t device, String *response)
if (bri > 254) bri = 254; // Philips Hue bri is between 1 and 254
if (bri < 1) bri = 1;
+#ifdef USE_SHUTTER
+ if (ShutterState(device)) {
+ bri = (float)(Settings.shutter_invert[device-1] ? 100 - Settings.shutter_position[device-1] : Settings.shutter_position[device-1]) / 100;
+ }
+#endif
+
if (light_type) {
light_state.getHSB(&hue, &sat, nullptr);
@@ -364,30 +370,51 @@ void HueLightStatus2(uint8_t device, String *response)
char fname[33];
strcpy(fname, Settings.friendlyname[MAX_FRIENDLYNAMES-1]);
uint32_t fname_len = strlen(fname);
- if (fname_len >= 33-3) {
- fname[33-3] = 0x00;
- fname_len = 33-3;
- }
+ if (fname_len > 30) { fname_len = 30; }
fname[fname_len++] = '-';
- fname[fname_len++] = '0' + device - MAX_FRIENDLYNAMES;
+ if (device - MAX_FRIENDLYNAMES < 10) {
+ fname[fname_len++] = '0' + device - MAX_FRIENDLYNAMES;
+ } else {
+ fname[fname_len++] = 'A' + device - MAX_FRIENDLYNAMES - 10;
+ }
+ fname[fname_len] = 0x00;
+
response->replace("{j1", fname);
}
response->replace("{j2", GetHueDeviceId(device));
}
// generate a unique lightId mixing local IP address and device number
-// it is limited to 16 devices.
-// last 24 bits of Mac address + 4 bits of local light
-uint32_t EncodeLightId(uint8_t idx)
+// it is limited to 32 devices.
+// last 24 bits of Mac address + 4 bits of local light + high bit for relays 16-31, relay 32 is mapped to 0
+uint32_t EncodeLightId(uint8_t relay_id)
{
uint8_t mac[6];
WiFi.macAddress(mac);
- uint32_t id = (mac[3] << 20) | (mac[4] << 12) | (mac[5] << 4) | (idx & 0xF);
+ uint32_t id = 0;
+
+ if (relay_id >= 32) { // for Relay #32, we encode as 0
+ relay_id = 0;
+ }
+ if (relay_id > 15) {
+ id = (1 << 28);
+ }
+
+ id |= (mac[3] << 20) | (mac[4] << 12) | (mac[5] << 4) | (relay_id & 0xF);
return id;
}
-uint32_t DecodeLightId(uint32_t id) {
- return id & 0xF;
+// get hue_id and decode the relay_id
+// 4 LSB decode to 1-15, if bit 28 is set, it encodes 16-31, if 0 then 32
+uint32_t DecodeLightId(uint32_t hue_id) {
+ uint8_t relay_id = hue_id & 0xF;
+ if (hue_id & (1 << 28)) { // check if bit 25 is set, if so we have
+ relay_id += 16;
+ }
+ if (0 == relay_id) { // special value 0 is actually relay #32
+ relay_id = 32;
+ }
+ return relay_id;
}
static const char * FIRST_GEN_UA[] = { // list of User-Agents signature
@@ -476,12 +503,22 @@ void HueLights(String *path)
response += ",\"";
}
}
+#ifdef USE_SCRIPT
+ Script_Check_Hue(&response);
+#endif
response += "}";
}
else if (path->endsWith("/state")) { // Got ID/state
path->remove(0,8); // Remove /lights/
path->remove(path->indexOf("/state")); // Remove /state
device = DecodeLightId(atoi(path->c_str()));
+
+#ifdef USE_SCRIPT
+ if (device>devices_present) {
+ return Script_Handle_Hue(path);
+ }
+#endif
+
if ((device < 1) || (device > maxhue)) {
device = 1;
}
@@ -498,19 +535,32 @@ void HueLights(String *path)
response.replace("{id", String(EncodeLightId(device)));
response.replace("{cm", "on");
- on = hue_json["on"];
- switch(on)
- {
- case false : ExecuteCommandPower(device, POWER_OFF, SRC_HUE);
- response.replace("{re", "false");
- break;
- case true : ExecuteCommandPower(device, POWER_ON, SRC_HUE);
- response.replace("{re", "true");
- break;
- default : response.replace("{re", (power & (1 << (device-1))) ? "true" : "false");
- break;
+#ifdef USE_SHUTTER
+ if (ShutterState(device)) {
+ if (!change) {
+ on = hue_json["on"];
+ bri = on ? 1.0f : 0.0f; // when bri is not part of this request then calculate it
+ change = true;
+ }
+ response.replace("{re", on ? "true" : "false");
+ } else {
+#endif
+ on = hue_json["on"];
+ switch(on)
+ {
+ case false : ExecuteCommandPower(device, POWER_OFF, SRC_HUE);
+ response.replace("{re", "false");
+ break;
+ case true : ExecuteCommandPower(device, POWER_ON, SRC_HUE);
+ response.replace("{re", "true");
+ break;
+ default : response.replace("{re", (power & (1 << (device-1))) ? "true" : "false");
+ break;
+ }
+ resp = true;
+#ifdef USE_SHUTTER
}
- resp = true;
+#endif // USE_SHUTTER
}
if (light_type && (local_light_subtype >= LST_SINGLE)) {
@@ -616,6 +666,12 @@ void HueLights(String *path)
resp = true;
}
if (change) {
+#ifdef USE_SHUTTER
+ if (ShutterState(device)) {
+ AddLog_P2(LOG_LEVEL_DEBUG, PSTR("Settings.shutter_invert: %d"), Settings.shutter_invert[device-1]);
+ ShutterSetPosition(device, bri * 100.0f );
+ } else
+#endif
if (light_type && (local_light_subtype > LST_NONE)) { // not relay
if (!Settings.flag3.pwm_multi_channels) {
if (g_gotct) {
@@ -649,6 +705,14 @@ void HueLights(String *path)
AddLog_P2(LOG_LEVEL_DEBUG_MORE, "/lights path=%s", path->c_str());
path->remove(0,8); // Remove /lights/
device = DecodeLightId(atoi(path->c_str()));
+
+#ifdef USE_SCRIPT
+ if (device>devices_present) {
+ Script_HueStatus(&response,device-devices_present-1);
+ goto exit;
+}
+#endif
+
if ((device < 1) || (device > maxhue)) {
device = 1;
}
@@ -660,6 +724,7 @@ void HueLights(String *path)
response = "{}";
code = 406;
}
+ exit:
AddLog_P2(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_HTTP D_HUE " Result (%s)"), response.c_str());
WSSend(code, CT_JSON, response);
}
diff --git a/sonoff/xdrv_23_zigbee_4_converters.ino b/sonoff/xdrv_23_zigbee_4_converters.ino
index 3f13d08f6..09b2872b9 100644
--- a/sonoff/xdrv_23_zigbee_4_converters.ino
+++ b/sonoff/xdrv_23_zigbee_4_converters.ino
@@ -75,7 +75,7 @@ public:
XdrvRulesProcess();
}
- static ZCLFrame parseRawFrame(SBuffer &buf, uint8_t offset, uint8_t len, uint16_t clusterid, uint16_t groupid) { // parse a raw frame and build the ZCL frame object
+ static ZCLFrame parseRawFrame(const SBuffer &buf, uint8_t offset, uint8_t len, uint16_t clusterid, uint16_t groupid) { // parse a raw frame and build the ZCL frame object
uint32_t i = offset;
ZCLHeaderFrameControl_t frame_control;
uint16_t manuf_code = 0;
@@ -133,6 +133,16 @@ private:
SBuffer _payload;
};
+char Hex36Char(uint8_t value) {
+ // convert an integer from 0 to 46, to a single digit 0-9A-Z
+ if (value < 10) {
+ return '0' + value;
+ } else if (value < 46) {
+ return 'A' + value - 10;
+ } else {
+ return '?'; // out of range
+ }
+}
// Zigbee ZCL converters
@@ -374,17 +384,17 @@ uint32_t parseSingleAttribute(JsonObject& json, char *attrid_str, class SBuffer
void ZCLFrame::parseRawAttributes(JsonObject& json, uint8_t offset) {
uint32_t i = offset;
uint32_t len = _payload.len();
- uint32_t attrid = _cluster_id << 16; // set high 16 bits with cluster id
- while (len + offset - i >= 3) {
- attrid = (attrid & 0xFFFF0000) | _payload.get16(i); // get lower 16 bits
+ while (len - i >= 3) {
+ uint16_t attrid = _payload.get16(i);
i += 2;
- char shortaddr[12];
- snprintf_P(shortaddr, sizeof(shortaddr), PSTR("0x%08X"), attrid);
+ char shortaddr[16];
+ snprintf_P(shortaddr, sizeof(shortaddr), PSTR("%c_%04X_%04X"),
+ Hex36Char(_cmd_id), _cluster_id, attrid);
// exception for Xiaomi lumi.weather - specific field to be treated as octet and not char
- if (0x0000FF01 == attrid) {
+ if ((0x0000 == _cluster_id) && (0xFF01 == attrid)) {
if (0x42 == _payload.get8(i)) {
_payload.set8(i, 0x41); // change type from 0x42 to 0x41
}
@@ -394,14 +404,13 @@ void ZCLFrame::parseRawAttributes(JsonObject& json, uint8_t offset) {
}
// Parse non-normalized attributes
-// The key is 24 bits, high 16 bits is cluserid, low 8 bits is command id
+// The key is "s_" followed by 16 bits clusterId, "_" followed by 8 bits command id
void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
uint32_t i = offset;
uint32_t len = _payload.len();
- uint32_t attrid = _cluster_id << 8 | _cmd_id;
char attrid_str[12];
- snprintf_P(attrid_str, sizeof(attrid_str), PSTR("0x%06X"), attrid); // 24 bits
+ snprintf_P(attrid_str, sizeof(attrid_str), PSTR("s_%04X_%02X"), _cluster_id, _cmd_id);
char hex_char[_payload.len()*2+2];
ToHex_P((unsigned char*)_payload.getBuffer(), _payload.len(), hex_char, sizeof(hex_char));
@@ -409,211 +418,333 @@ void ZCLFrame::parseClusterSpecificCommand(JsonObject& json, uint8_t offset) {
json[attrid_str] = hex_char;
}
-#define ZCL_MODELID "0x00000005" // Cluster 0x0000, attribute 0x05
-#define ZCL_TEMPERATURE "0x04020000" // Cluster 0x0402, attribute 0x00
-#define ZCL_PRESSURE "0x04030000" // Cluster 0x0403, attribute 0x00
-#define ZCL_PRESSURE_SCALED "0x04030010" // Cluster 0x0403, attribute 0x10
-#define ZCL_PRESSURE_SCALE "0x04030014" // Cluster 0x0403, attribute 0x14
-#define ZCL_HUMIDITY "0x04050000" // Cluster 0x0403, attribute 0x00
-#define ZCL_LUMI_WEATHER "0x0000FF01" // Cluster 0x0000, attribute 0xFF01 - proprietary
+// return value:
+// 0 = keep initial value
+// 1 = remove initial value
+typedef int32_t (*Z_AttrConverter)(JsonObject& json, const char *name, JsonVariant& value, const char *new_name, void * param);
+typedef struct Z_AttributeConverter {
+ const char * filter;
+ const char * name;
+ Z_AttrConverter func;
+ void * param;
+} Z_AttributeConverter;
-#define ZCL_OO_OFF "0x000600" // Cluster 0x0006, cmd 0x00 - On/Off - Off
-#define ZCL_OO_ON "0x000601" // Cluster 0x0006, cmd 0x01 - On/Off - On
-#define ZCL_COLORTEMP_MOVE "0x03000A" // Cluster 0x0300, cmd 0x0A, Move to Color Temp
-#define ZCL_LC_MOVE "0x000800" // Cluster 0x0008, cmd 0x00, Level Control Move to Level
-#define ZCL_LC_MOVE_1 "0x000801" // Cluster 0x0008, cmd 0x01, Level Control Move
-#define ZCL_LC_STEP "0x000802" // Cluster 0x0008, cmd 0x02, Level Control Step
-#define ZCL_LC_STOP "0x000803" // Cluster 0x0008, cmd 0x03, Level Control Stop
-#define ZCL_LC_MOVE_WOO "0x000804" // Cluster 0x0008, cmd 0x04, Level Control Move to Level, with On/Off
-#define ZCL_LC_MOVE_1_WOO "0x000805" // Cluster 0x0008, cmd 0x05, Level Control Move, with On/Off
-#define ZCL_LC_STEP_WOO "0x000806" // Cluster 0x0008, cmd 0x05, Level Control Step, with On/Off
-#define ZCL_LC_STOP_WOO "0x000807" // Cluster 0x0008, cmd 0x07, Level Control Stop
+const float Z_100 PROGMEM = 100.0f;
+const float Z_10 PROGMEM = 10.0f;
-void ZCLFrame::postProcessAttributes(JsonObject& json) {
- const __FlashStringHelper *key;
+// list of post-processing directives
+const Z_AttributeConverter Z_PostProcess[] = {
+ { "A_0000_0005", D_JSON_MODEL D_JSON_ID, &Z_Copy, nullptr }, // ModelID
- // ModelID ZCL 3.2
- key = F(ZCL_MODELID);
- if (json.containsKey(key)) {
- json[F(D_JSON_MODEL D_JSON_ID)] = json[key];
- json.remove(key);
- }
+ { "A_0400_0000", D_JSON_ILLUMINANCE, &Z_Copy, nullptr }, // Illuminance (in Lux)
+ { "A_0400_0004", "LightSensorType", &Z_Copy, nullptr }, // LightSensorType
+ { "A_0400_????", nullptr, &Z_Remove, nullptr }, // Remove all other values
- // Temperature ZCL 4.4
- key = F(ZCL_TEMPERATURE);
- if (json.containsKey(key)) {
- // parse temperature
- int32_t temperature = json[key];
- json.remove(key);
- json[F(D_JSON_TEMPERATURE)] = temperature / 100.0f;
- }
+ { "A_0401_0000", "LevelStatus", &Z_Copy, nullptr }, // Illuminance (in Lux)
+ { "A_0401_0001", "LightSensorType", &Z_Copy, nullptr }, // LightSensorType
+ { "A_0401_????", nullptr, &Z_Remove, nullptr }, // Remove all other values
- // Pressure ZCL 4.5
- key = F(ZCL_PRESSURE);
- if (json.containsKey(key)) {
- json[F(D_JSON_PRESSURE)] = json[key];
- json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE); // hPa
- json.remove(key);
- }
- json.remove(F(ZCL_PRESSURE_SCALE));
- json.remove(F(ZCL_PRESSURE_SCALED));
+ { "A_0402_0000", D_JSON_TEMPERATURE, &Z_ConvFloatDivider, (void*) &Z_100 }, // Temperature
+ { "A_0402_????", nullptr, &Z_Remove, nullptr }, // Remove all other values
- // Humidity ZCL 4.7
- key = F(ZCL_HUMIDITY);
- if (json.containsKey(key)) {
- // parse temperature
- uint32_t humidity = json[key];
- json.remove(key);
- json[F(D_JSON_HUMIDITY)] = humidity / 100.0f;
- }
+ { "A_0403_0000", D_JSON_PRESSURE_UNIT, &Z_Const_Keep, (void*) D_UNIT_PRESSURE}, // Pressure Unit
+ { "A_0403_0000", D_JSON_PRESSURE, &Z_Copy, nullptr }, // Pressure
+ { "A_0403_????", nullptr, &Z_Remove, nullptr }, // Remove all other Pressure values
- // Osram Mini Switch
- key = F(ZCL_OO_OFF);
- if (json.containsKey(key)) {
- json.remove(key);
- json[F(D_CMND_POWER)] = F("Off");
- }
- key = F(ZCL_OO_ON);
- if (json.containsKey(key)) {
- json.remove(key);
- json[F(D_CMND_POWER)] = F("On");
- }
- key = F(ZCL_COLORTEMP_MOVE);
- if (json.containsKey(key)) {
- String hex = json[key];
- SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
- uint16_t color_temp = buf2.get16(0);
- uint16_t transition_time = buf2.get16(2);
- json.remove(key);
- json[F("ColorTemp")] = color_temp;
- json[F("TransitionTime")] = transition_time / 10.0f;
- }
- key = F(ZCL_LC_MOVE_WOO);
- if (json.containsKey(key)) {
- String hex = json[key];
- SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
- uint8_t level = buf2.get8(0);
- uint16_t transition_time = buf2.get16(1);
- json.remove(key);
- json[F("Dimmer")] = changeUIntScale(level, 0, 255, 0, 100); // change to percentage
- json[F("TransitionTime")] = transition_time / 10.0f;
- if (0 == level) {
- json[F(D_CMND_POWER)] = F("Off");
- } else {
- json[F(D_CMND_POWER)] = F("On");
- }
- }
- key = F(ZCL_LC_MOVE);
- if (json.containsKey(key)) {
- String hex = json[key];
- SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
- uint8_t level = buf2.get8(0);
- uint16_t transition_time = buf2.get16(1);
- json.remove(key);
- json[F("Dimmer")] = changeUIntScale(level, 0, 255, 0, 100); // change to percentage
- json[F("TransitionTime")] = transition_time / 10.0f;
- }
- key = F(ZCL_LC_MOVE_1);
- if (json.containsKey(key)) {
- String hex = json[key];
- SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
- uint8_t move_mode = buf2.get8(0);
- uint8_t move_rate = buf2.get8(1);
- json.remove(key);
- json[F("Move")] = move_mode ? F("Down") : F("Up");
- json[F("Rate")] = move_rate;
- }
- key = F(ZCL_LC_MOVE_1_WOO);
- if (json.containsKey(key)) {
- String hex = json[key];
- SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
- uint8_t move_mode = buf2.get8(0);
- uint8_t move_rate = buf2.get8(1);
- json.remove(key);
- json[F("Move")] = move_mode ? F("Down") : F("Up");
- json[F("Rate")] = move_rate;
- if (0 == move_mode) {
- json[F(D_CMND_POWER)] = F("On");
- }
- }
- key = F(ZCL_LC_STEP);
- if (json.containsKey(key)) {
- String hex = json[key];
- SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
- uint8_t step_mode = buf2.get8(0);
- uint8_t step_size = buf2.get8(1);
- uint16_t transition_time = buf2.get16(2);
- json.remove(key);
- json[F("Step")] = step_mode ? F("Down") : F("Up");
- json[F("StepSize")] = step_size;
- json[F("TransitionTime")] = transition_time / 10.0f;
- }
- key = F(ZCL_LC_STEP_WOO);
- if (json.containsKey(key)) {
- String hex = json[key];
- SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
- uint8_t step_mode = buf2.get8(0);
- uint8_t step_size = buf2.get8(1);
- uint16_t transition_time = buf2.get16(2);
- json.remove(key);
- json[F("Step")] = step_mode ? F("Down") : F("Up");
- json[F("StepSize")] = step_size;
- json[F("TransitionTime")] = transition_time / 10.0f;
- if (0 == step_mode) {
- json[F(D_CMND_POWER)] = F("On");
- }
- }
- key = F(ZCL_LC_STOP);
- if (json.containsKey(key)) {
- json.remove(key);
- json[F("Stop")] = 1;
- }
- key = F(ZCL_LC_STOP_WOO);
- if (json.containsKey(key)) {
- json.remove(key);
- json[F("Stop")] = 1;
- }
+ { "A_0404_0000", D_JSON_FLOWRATE, &Z_ConvFloatDivider, (void*) &Z_10 }, // Flow (in m3/h)
+ { "A_0404_????", nullptr, &Z_Remove, nullptr }, // Remove all other values
- // Lumi.weather proprietary field
- key = F(ZCL_LUMI_WEATHER);
- if (json.containsKey(key)) {
- String hex = json[key];
- SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
- DynamicJsonBuffer jsonBuffer;
- JsonObject& json_lumi = jsonBuffer.createObject();
- uint32_t i = 0;
- uint32_t len = buf2.len();
- char shortaddr[8];
+ { "A_0405_0000", D_JSON_HUMIDITY, &Z_ConvFloatDivider, (void*) &Z_100 }, // Humidity
+ { "A_0405_????", nullptr, &Z_Remove, nullptr }, // Remove all other values
- while (len - i >= 2) {
- uint8_t attrid = buf2.get8(i++);
+ { "A_0406_0000", "Occupancy", &Z_Copy, nullptr }, // Occupancy (map8)
+ { "A_0406_0001", "OccupancySensorType", &Z_Copy, nullptr }, // OccupancySensorType
+ { "A_0406_????", nullptr, &Z_Remove, nullptr }, // Remove all other values
- snprintf_P(shortaddr, sizeof(shortaddr), PSTR("0x%02X"), attrid);
-
- i += parseSingleAttribute(json_lumi, shortaddr, buf2, i, len);
- }
- // parse output
- if (json_lumi.containsKey("0x64")) { // Temperature
- int32_t temperature = json_lumi["0x64"];
- json[F(D_JSON_TEMPERATURE)] = temperature / 100.0f;
- }
- if (json_lumi.containsKey("0x65")) { // Humidity
- uint32_t humidity = json_lumi["0x65"];
- json[F(D_JSON_HUMIDITY)] = humidity / 100.0f;
- }
- if (json_lumi.containsKey("0x66")) { // Pressure
- int32_t pressure = json_lumi["0x66"];
- json[F(D_JSON_PRESSURE)] = pressure / 100.0f;
- json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE); // hPa
- }
- if (json_lumi.containsKey("0x01")) { // Battery Voltage
- uint32_t voltage = json_lumi["0x01"];
- json[F(D_JSON_VOLTAGE)] = voltage / 1000.0f;
- json[F("Battery")] = toPercentageCR2032(voltage);
- }
- json.remove(key);
- }
+ // Cmd 0x0A - Cluster 0x0000, attribute 0xFF01 - proprietary
+ { "A_0000_FF01", nullptr, &Z_AqaraSensor, nullptr }, // Occupancy (map8)
+ // // 0x0b04 Electrical Measurement
+ // { "A_0B04_0100", "DCVoltage", &Z_Copy, nullptr }, // Occupancy (map8)
+ // { "A_0B04_0001", "OccupancySensorType", &Z_Copy, nullptr }, // OccupancySensorType
+ // { "A_0B04_????", "", &Z_Remove, nullptr }, // Remove all other values
+};
+// ======================================================================
+// Remove attribute
+int32_t Z_Remove(JsonObject& json, const char *name, JsonVariant& value, const char *new_name, void * param) {
+ return 1; // remove original key
}
+// Copy value as-is
+int32_t Z_Copy(JsonObject& json, const char *name, JsonVariant& value, const char *new_name, void * param) {
+ json[new_name] = value;
+ return 1; // remove original key
+}
+
+// Copy value as-is
+int32_t Z_Const_Keep(JsonObject& json, const char *name, JsonVariant& value, const char *new_name, void * param) {
+ json[new_name] = (char*)param;
+ return 0; // keep original key
+}
+
+// Convert int to float with divider
+int32_t Z_ConvFloatDivider(JsonObject& json, const char *name, JsonVariant& value, const char *new_name, void * param) {
+ float f_value = value;
+ float *divider = (float*) param;
+ json[new_name] = f_value / *divider;
+ return 1; // remove original key
+}
+
+int32_t Z_AqaraSensor(JsonObject& json, const char *name, JsonVariant& value, const char *new_name, void * param) {
+ String hex = value;
+ SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+ uint32_t i = 0;
+ uint32_t len = buf2.len();
+ char shortaddr[8];
+ char tmp[] = "tmp"; // for obscure reasons, it must be converted from const char* to char*, otherwise ArduinoJson gets confused
+
+ JsonVariant sub_value;
+
+ while (len - i >= 2) {
+ uint8_t attrid = buf2.get8(i++);
+
+ i += parseSingleAttribute(json, tmp, buf2, i, len);
+ float val = json[tmp];
+ json.remove(tmp);
+ if (0x64 == attrid) {
+ json[F(D_JSON_TEMPERATURE)] = val / 100.0f;
+ } else if (0x65 == attrid) {
+ json[F(D_JSON_HUMIDITY)] = val / 100.0f;
+ } else if (0x66 == attrid) {
+ json[F(D_JSON_PRESSURE)] = val / 100.0f;
+ json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE); // hPa
+ } else if (0x01 == attrid) {
+ json[F(D_JSON_VOLTAGE)] = val / 1000.0f;
+ json[F("Battery")] = toPercentageCR2032(val);
+ }
+ }
+ return 1; // remove original key
+}
+// ======================================================================
+
+#define ZCL_MODELID "A_0000_0005" // Cmd 0x0A - Cluster 0x0000, attribute 0x05
+#define ZCL_TEMPERATURE "A_0402_0000" // Cmd 0x0A - Cluster 0x0402, attribute 0x00
+#define ZCL_PRESSURE "A_0403_0000" // Cmd 0x0A - Cluster 0x0403, attribute 0x00
+#define ZCL_PRESSURE_SCALED "A_0403_0010" // Cmd 0x0A - Cluster 0x0403, attribute 0x10
+#define ZCL_PRESSURE_SCALE "A_0403_0014" // Cmd 0x0A - Cluster 0x0403, attribute 0x14
+#define ZCL_HUMIDITY "A_0405_0000" // Cmd 0x0A - Cluster 0x0403, attribute 0x00
+#define ZCL_LUMI_WEATHER "A_0000_FF01" // Cmd 0x0A - Cluster 0x0000, attribute 0xFF01 - proprietary
+
+// Cluster Specific commands
+#define ZCL_OO_OFF "s_0006_00" // Cluster 0x0006, cmd 0x00 - On/Off - Off
+#define ZCL_OO_ON "s_0006_01" // Cluster 0x0006, cmd 0x01 - On/Off - On
+#define ZCL_COLORTEMP_MOVE "s_0300_0A" // Cluster 0x0300, cmd 0x0A, Move to Color Temp
+#define ZCL_LC_MOVE "s_0008_00" // Cluster 0x0008, cmd 0x00, Level Control Move to Level
+#define ZCL_LC_MOVE_1 "s_0008_01" // Cluster 0x0008, cmd 0x01, Level Control Move
+#define ZCL_LC_STEP "s_0008_02" // Cluster 0x0008, cmd 0x02, Level Control Step
+#define ZCL_LC_STOP "s_0008_03" // Cluster 0x0008, cmd 0x03, Level Control Stop
+#define ZCL_LC_MOVE_WOO "s_0008_04" // Cluster 0x0008, cmd 0x04, Level Control Move to Level, with On/Off
+#define ZCL_LC_MOVE_1_WOO "s_0008_05" // Cluster 0x0008, cmd 0x05, Level Control Move, with On/Off
+#define ZCL_LC_STEP_WOO "s_0008_06" // Cluster 0x0008, cmd 0x05, Level Control Step, with On/Off
+#define ZCL_LC_STOP_WOO "s_0008_07" // Cluster 0x0008, cmd 0x07, Level Control Stop
+
+// inspired from https://github.com/torvalds/linux/blob/master/lib/glob.c
+bool mini_glob_match(char const *pat, char const *str) {
+ for (;;) {
+ unsigned char c = *str++;
+ unsigned char d = *pat++;
+
+ switch (d) {
+ case '?': /* Wildcard: anything but nul */
+ if (c == '\0')
+ return false;
+ break;
+ case '\\':
+ d = *pat++;
+ /*FALLTHROUGH*/
+ default: /* Literal character */
+ if (c == d) {
+ if (d == '\0')
+ return true;
+ break;
+ }
+ return false; /* No point continuing */
+ }
+ }
+}
+
+void ZCLFrame::postProcessAttributes(JsonObject& json) {
+ // iterate on json elements
+ for (auto kv : json) {
+ String key = kv.key;
+ JsonVariant& value = kv.value;
+
+ // Iterate on filter
+ for (uint32_t i = 0; i < sizeof(Z_PostProcess) / sizeof(Z_PostProcess[0]); i++) {
+ const Z_AttributeConverter *converter = &Z_PostProcess[i];
+
+ if (mini_glob_match(converter->filter, key.c_str())) {
+ int32_t drop = (*converter->func)(json, key.c_str(), value, converter->name, converter->param);
+ if (drop) {
+ json.remove(key);
+ }
+
+ }
+ }
+ }
+}
+
+//void ZCLFrame::postProcessAttributes2(JsonObject& json) {
+// void postProcessAttributes2(JsonObject& json) {
+// const __FlashStringHelper *key;
+//
+// // Osram Mini Switch
+// key = F(ZCL_OO_OFF);
+// if (json.containsKey(key)) {
+// json.remove(key);
+// json[F(D_CMND_POWER)] = F("Off");
+// }
+// key = F(ZCL_OO_ON);
+// if (json.containsKey(key)) {
+// json.remove(key);
+// json[F(D_CMND_POWER)] = F("On");
+// }
+// key = F(ZCL_COLORTEMP_MOVE);
+// if (json.containsKey(key)) {
+// String hex = json[key];
+// SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+// uint16_t color_temp = buf2.get16(0);
+// uint16_t transition_time = buf2.get16(2);
+// json.remove(key);
+// json[F("ColorTemp")] = color_temp;
+// json[F("TransitionTime")] = transition_time / 10.0f;
+// }
+// key = F(ZCL_LC_MOVE_WOO);
+// if (json.containsKey(key)) {
+// String hex = json[key];
+// SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+// uint8_t level = buf2.get8(0);
+// uint16_t transition_time = buf2.get16(1);
+// json.remove(key);
+// json[F("Dimmer")] = changeUIntScale(level, 0, 255, 0, 100); // change to percentage
+// json[F("TransitionTime")] = transition_time / 10.0f;
+// if (0 == level) {
+// json[F(D_CMND_POWER)] = F("Off");
+// } else {
+// json[F(D_CMND_POWER)] = F("On");
+// }
+// }
+// key = F(ZCL_LC_MOVE);
+// if (json.containsKey(key)) {
+// String hex = json[key];
+// SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+// uint8_t level = buf2.get8(0);
+// uint16_t transition_time = buf2.get16(1);
+// json.remove(key);
+// json[F("Dimmer")] = changeUIntScale(level, 0, 255, 0, 100); // change to percentage
+// json[F("TransitionTime")] = transition_time / 10.0f;
+// }
+// key = F(ZCL_LC_MOVE_1);
+// if (json.containsKey(key)) {
+// String hex = json[key];
+// SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+// uint8_t move_mode = buf2.get8(0);
+// uint8_t move_rate = buf2.get8(1);
+// json.remove(key);
+// json[F("Move")] = move_mode ? F("Down") : F("Up");
+// json[F("Rate")] = move_rate;
+// }
+// key = F(ZCL_LC_MOVE_1_WOO);
+// if (json.containsKey(key)) {
+// String hex = json[key];
+// SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+// uint8_t move_mode = buf2.get8(0);
+// uint8_t move_rate = buf2.get8(1);
+// json.remove(key);
+// json[F("Move")] = move_mode ? F("Down") : F("Up");
+// json[F("Rate")] = move_rate;
+// if (0 == move_mode) {
+// json[F(D_CMND_POWER)] = F("On");
+// }
+// }
+// key = F(ZCL_LC_STEP);
+// if (json.containsKey(key)) {
+// String hex = json[key];
+// SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+// uint8_t step_mode = buf2.get8(0);
+// uint8_t step_size = buf2.get8(1);
+// uint16_t transition_time = buf2.get16(2);
+// json.remove(key);
+// json[F("Step")] = step_mode ? F("Down") : F("Up");
+// json[F("StepSize")] = step_size;
+// json[F("TransitionTime")] = transition_time / 10.0f;
+// }
+// key = F(ZCL_LC_STEP_WOO);
+// if (json.containsKey(key)) {
+// String hex = json[key];
+// SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+// uint8_t step_mode = buf2.get8(0);
+// uint8_t step_size = buf2.get8(1);
+// uint16_t transition_time = buf2.get16(2);
+// json.remove(key);
+// json[F("Step")] = step_mode ? F("Down") : F("Up");
+// json[F("StepSize")] = step_size;
+// json[F("TransitionTime")] = transition_time / 10.0f;
+// if (0 == step_mode) {
+// json[F(D_CMND_POWER)] = F("On");
+// }
+// }
+// key = F(ZCL_LC_STOP);
+// if (json.containsKey(key)) {
+// json.remove(key);
+// json[F("Stop")] = 1;
+// }
+// key = F(ZCL_LC_STOP_WOO);
+// if (json.containsKey(key)) {
+// json.remove(key);
+// json[F("Stop")] = 1;
+// }
+//
+// // Lumi.weather proprietary field
+// key = F(ZCL_LUMI_WEATHER);
+// if (json.containsKey(key)) {
+// String hex = json[key];
+// SBuffer buf2 = SBuffer::SBufferFromHex(hex.c_str(), hex.length());
+// DynamicJsonBuffer jsonBuffer;
+// JsonObject& json_lumi = jsonBuffer.createObject();
+// uint32_t i = 0;
+// uint32_t len = buf2.len();
+// char shortaddr[8];
+//
+// while (len - i >= 2) {
+// uint8_t attrid = buf2.get8(i++);
+//
+// snprintf_P(shortaddr, sizeof(shortaddr), PSTR("0x%02X"), attrid);
+//
+// //json[shortaddr] = parseSingleAttribute(json_lumi, buf2, i, len, nullptr, 0);
+// }
+// // parse output
+// if (json_lumi.containsKey("0x64")) { // Temperature
+// int32_t temperature = json_lumi["0x64"];
+// json[F(D_JSON_TEMPERATURE)] = temperature / 100.0f;
+// }
+// if (json_lumi.containsKey("0x65")) { // Humidity
+// uint32_t humidity = json_lumi["0x65"];
+// json[F(D_JSON_HUMIDITY)] = humidity / 100.0f;
+// }
+// if (json_lumi.containsKey("0x66")) { // Pressure
+// int32_t pressure = json_lumi["0x66"];
+// json[F(D_JSON_PRESSURE)] = pressure / 100.0f;
+// json[F(D_JSON_PRESSURE_UNIT)] = F(D_UNIT_PRESSURE); // hPa
+// }
+// if (json_lumi.containsKey("0x01")) { // Battery Voltage
+// uint32_t voltage = json_lumi["0x01"];
+// json[F(D_JSON_VOLTAGE)] = voltage / 1000.0f;
+// json[F("Battery")] = toPercentageCR2032(voltage);
+// }
+// json.remove(key);
+// }
+//
+// }
+
#endif // USE_ZIGBEE
diff --git a/sonoff/xdrv_23_zigbee_6_devices.ino b/sonoff/xdrv_23_zigbee_6_devices.ino
new file mode 100644
index 000000000..128f11857
--- /dev/null
+++ b/sonoff/xdrv_23_zigbee_6_devices.ino
@@ -0,0 +1,169 @@
+/*
+ xdrv_23_zigbee.ino - zigbee support for Sonoff-Tasmota
+
+ Copyright (C) 2019 Theo Arends and Stephan Hadinger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see