From 5a36034a2f090279a419e98e3a525a29f43f7aff Mon Sep 17 00:00:00 2001 From: Florian Date: Sun, 12 Nov 2023 13:00:28 -0600 Subject: [PATCH] [BT] - Bump decoder to v1.6.2 (#1797) * [BT] Bump decoder to v1.6.2 * Replace separators / by commas for consistency with Theengs --- docs/prerequisites/devices.md | 171 ++++++++++++++++++---------------- platformio.ini | 2 +- 2 files changed, 92 insertions(+), 81 deletions(-) diff --git a/docs/prerequisites/devices.md b/docs/prerequisites/devices.md index cab4b36890..a473ba471a 100644 --- a/docs/prerequisites/devices.md +++ b/docs/prerequisites/devices.md @@ -18,91 +18,102 @@ Added to that it retrieves the measures from the devices below. By default the d |Devices|Model|Measurements| |-|:-:|:-:| -| Amazfit|Smart Watch/Band|steps, activity heart rate (when activated in the Zepp Life settings)| -| April Brother|ABTemp|uuid/mfid/major/txpower @ 1 m/temperature/battery| -| April Brother|N03|temperature/humidity/luminance/battery| -| ATorch Battery Capacity Monitor (c)|DT24|voltage/amp/watt| +| Amazfit|Smart Watch, Band|steps, activity heart rate (when activated in the Zepp Life settings)| +| April Brother|ABTemp|uuid, mfid, major, txpower @ 1 m, temperature, battery| +| April Brother|N03|temperature, humidity, luminance, battery| +| April Brother|N07|temperature, humidity, battery, packet ID| +| ATorch Battery Capacity Monitor (c)|DT24|voltage, amp, watt| | BLE watches with fixed MAC||rssi for presence detection| | BLE beacons keychains||rssi for presence detection| -| BlueCharm|BC08|acceleration x/y/z-axis/voltage/temperature| -| BlueCharm|BC04P|acceleration x/y/z-axis/voltage/temperature| -| BlueCharm|BC021|acceleration x/y/z-axis/voltage/temperature| -| BlueMaestro|TempoDisc 1 in 1|temperature/battery| -| BlueMaestro|TempoDisc 3 in 1|temperature/humidity/dew point/battery| -| BlueMaestro|TempoDisc 4 in 1|temperature/humidity/pressure/battery| -| BM2 Battery Monitor|BM2|battery/volt(c)| -| ClearGrass|CGG1|temperature/humidity/battery/voltage (depending on which CGG1 firmware is installed)| -| ClearGrass alarm clock|CGD1|temperature/humidity/battery| -| ClearGrass alarm clock|CGC1|temperature/humidity/battery| -| ClearGrass with atmospheric pressure|CGP1W|temperature/humidity/air pressure| -| ClearGrass Clock|LYWSD02|temperature/humidity/battery| -| GOVEE|H5055|temperature1/temperature2/temperature3/temperature4/temperature5/temperature6/battery| -| GOVEE|H5074|temperature/humidity/battery| -| GOVEE|H5075|temperature/humidity/battery| -| GOVEE|H5072|temperature/humidity/battery| -| GOVEE|H5101|temperature/humidity/battery| -| GOVEE|H5102|temperature/humidity/battery| -| GOVEE|H5106|PM2.5/temperature/humidity/battery| -| GOVEE|H5174|temperature/humidity/battery| -| GOVEE|H5177|temperature/humidity/battery| -| HONEYWELL|JQJCY01YM|formaldehyde/temperature/humidity/battery| -| Hydractiva Digital | Amphiro/Oras|sessions/time/litres/temperature/energy| -| iBeacon|protocol|uuid/mfid/major/minor/txpower @ 1 m/voltage| -| Jaalee|JHT F525|temperature/humidity/battery| -| INKBIRD|IBS-TH1|temperature/humidity/battery| -| INKBIRD|IBS-TH2/P01B|temperature/battery| -| INKBIRD|IBT-2X|temperature1/temperature2| -| INKBIRD|IBT-4X(S/C)|temperature1/temperature2/temperature3/temperature4| -| INKBIRD|IBT-6XS|temperature1/temperature2/temperature3/temperature4/temperature5/temperature6| -| iNode|Energy Meter|Current average and aggregate kW(h)/m³/battery| -| KKM |K6P|temperature/humidity/voltage| -| KKM |K9|temperature/humidity/voltage/acceleration x/y/z-axis (optional - without recognised as K6P)| -| Oria/Brifit/SigmaWit/SensorPro|TH Sensor T201|temperature/humidity/battery| -| Oria/Brifit/SigmaWit/SensorPro|TH Sensor T301|temperature/humidity/battery| -| Mokosmart|M1|acceleration x/y/z-axis/battery| -| Mokosmart|H4|temperature/humidity/voltage| -| Mopeka|Pro|temperature/level/sync status/voltage/battery/reading quality/acceleration x/y-axis| -| Otio/BeeWi|Door & Window Sensor|contact/battery| +| BlueCharm|BC08|acceleration x, y, z-axis, voltage, temperature| +| BlueCharm|BC04P|acceleration x, y, z-axis, voltage, temperature| +| BlueCharm|BC021|acceleration x, y, z-axis, voltage, temperature| +| BlueMaestro|TempoDisc 1 in 1|temperature, battery| +| BlueMaestro|TempoDisc 3 in 1|temperature, humidity, dew point, battery| +| BlueMaestro|TempoDisc 4 in 1|temperature, humidity, pressure, battery| +| BM2 Battery Monitor|BM2|battery, volt(c)| +| BM6 Battery Monitor|BM6|battery| +| ClearGrass|CGG1|temperature, humidity, battery, voltage (depending on which CGG1 firmware is installed)| +| ClearGrass alarm clock|CGD1|temperature, humidity, battery| +| ClearGrass alarm clock|CGC1|temperature, humidity, battery| +| ClearGrass with atmospheric pressure|CGP1W|temperature, humidity, air pressure| +| ClearGrass Clock|LYWSD02|temperature, humidity, battery| +| GOVEE|H5055|temperature1, temperature2, temperature3, temperature4, temperature5, temperature6, battery| +| GOVEE|H5074|temperature, humidity, battery| +| GOVEE|H5075|temperature, humidity, battery| +| GOVEE|H5072|temperature, humidity, battery| +| GOVEE|H5100|temperature, humidity, battery| +| GOVEE|H5101|temperature, humidity, battery| +| GOVEE|H5102|temperature, humidity, battery| +| GOVEE|H5104|temperature, humidity, battery| +| GOVEE|H5106|PM2.5, temperature, humidity, battery| +| GOVEE|H5174|temperature, humidity, battery| +| GOVEE|H5177|temperature, humidity, battery| +| GOVEE|H5179|temperature, humidity, battery| +| HONEYWELL|JQJCY01YM|formaldehyde, temperature, humidity, battery| +| Hydractiva Digital | Amphiro, Oras|sessions, time, litres, temperature, energy| +| iBeacon|protocol|uuid, mfid, major, minor, txpower @ 1 m, voltage| +| Jaalee|JHT F525|temperature, humidity, battery| +| INKBIRD|IBS-TH1|temperature, humidity, battery| +| INKBIRD|IBS-TH12S|temperature, humidity, battery| +| INKBIRD|IBS-TH2, P01B|temperature, battery| +| INKBIRD|IBT-2X|temperature1, temperature2| +| INKBIRD|IBT-4X(S, C)|temperature1, temperature2, temperature3, temperature4| +| INKBIRD|IBT-6XS|temperature1, temperature2, temperature3, temperature4, temperature5, temperature6| +| iNode|Energy Meter|Current average and aggregate kW(h), m³, battery| +| KKM |K6P|temperature, humidity, voltage| +| KKM |K9|temperature, humidity, voltage, acceleration x, y, z-axis (optional - without recognised as K6P)| +| Oral B| Toothbrush| state, mode, sector, pressure, time| +| Oria, Brifit, SigmaWit, SensorPro|TH Sensor T201|temperature, humidity, battery| +| Oria, Brifit, SigmaWit, SensorPro|TH Sensor T301|temperature, humidity, battery| +| Mokosmart|M1|acceleration x, y, z-axis, battery| +| Mokosmart|H4|temperature, humidity, voltage| +| Mopeka|Pro|temperature, level, sync status, voltage, battery, reading quality, acceleration x, y-axis| +| Lippert|BottleCheck|temperature, level, sync status, voltage, battery, reading quality, acceleration x, y-axis| +| Otio, BeeWi|Door & Window Sensor|contact, battery| | Polar|H10 Chest strap|activity heart rate| -| Qingping|CGDK2|temperature/humidity| +| Qingping|CGDK2|temperature, humidity| | Qingping|CGH1|open| -| Qingping|CGPR1|presence/luminance/battery| -| Qingping|CGDN1|temperature/humidity/PM2.5/PM10/carbon dioxide| -| RDL52832||mfid/uuid/minor/major/txpower @ 1 m/temperature/humidity/acceleration x/y/z-axis| -| RBaron|b-parasite|moisture/temperature/humidity/luminance (v1.1.0+)/voltage| -| RuuviTag Raw V1|RuuviTag|temperature/humidity/pressure/acceleration x/y/z-axis/voltage| -| RuuviTag Raw V2|RuuviTag|temperature/humidity/pressure/acceleration x/y/z-axis/voltage/TX power/movement/counter/sequence number| -| SmartDry|Laundry Sensor|temperature/humidity/shake/voltage/wake| -| Sensirion|MyCO₂/CO₂ Gadget|temperature/humidity/carbon dioxide| -| Sensirion|SHT4X TH sensor|temperature/humidity| -| Shelly|Button1|button press type, battery, packet ID| -| Switchbot|Bot (c)|mode/state/battery| -| Switchbot|Motion Sensor|movement/light level/sensing distance/led/scope tested/battery| -| Switchbot|Contact Sensor|contact/movement/scope tested/light level/in count/out count/push count/battery| -| Switchbot|Curtain|motion state/position/light level/battery/calibration state| -| Switchbot|Meter (Plus)|temperature/humidity/battery| -| Switchbot|Outdoor Meter|temperature/humidity/battery| -| Thermobeacon|WS02|temperature/humidity/voltage/timestamp/maximum temperature/maximum temperature timestamp/minimum temperature/minimum temperature timestamp| -| Thermobeacon|WS08|temperature/humidity/voltage/timestamp/maximum temperature/maximum temperature timestamp/minimum temperature/minimum temperature timestamp| -| ThermoPro|TP357|temperature/humidity| -| ThermoPro|TP358|temperature/humidity| -| ThermoPro|TP359|temperature/humidity| -| ThermoPro|TP393|temperature/humidity| -| TPMS|TPMS|temperature/pressure/battery/alarm/count| -| Vegtrug||temperature/moisture/luminance/fertility| -| XIAOMI Mi Flora|HHCCJCY01HHCC|temperature/moisture/luminance/fertility/battery(c) firmware >3.1.8| -| XIAOMI Ropot|HHCCPOT002|temperature/moisture/fertility| -| XIAOMI Mi Jia|LYWSDCGO|temperature/humidity/battery| -| XIAOMI Mi Jia|LYWSD02|temperature/humidity/battery| -| XIAOMI Mi Jia 2(c)|LYWSD03MMC|temperature/humidity/battery/voltage| -| XIAOMI Mi Jia 2 custom firmware (2)|LYWSD03MMC ATC|temperature/humidity/battery/voltage| -| XIAOMI Mi Jia 2 custom firmware (3)|LYWSD03MMC PVVX|temperature/humidity/battery/voltage| +| Qingping|CGPR1|presence, luminance, battery| +| Qingping|CGDN1|temperature, humidity, PM2.5, PM10, carbon dioxide| +| RDL52832||mfid, uuid, minor, major, txpower @ 1 m, temperature, humidity, acceleration x, y, z-axis| +| RBaron|b-parasite|moisture, temperature, humidity, luminance (v1.1.0+), voltage| +| RuuviTag Raw V1|RuuviTag|temperature, humidity, pressure, acceleration x, y, z-axis, voltage| +| RuuviTag Raw V2|RuuviTag|temperature, humidity, pressure, acceleration x, y, z-axis, voltage, TX power, movement, counter, sequence number| +| SmartDry|Laundry Sensor|temperature, humidity, shake, voltage, wake| +| Sensirion|MyCO₂, CO₂ Gadget|temperature, humidity, carbon dioxide| +| Sensirion|SHT4X TH sensor|temperature, humidity| +| ShellyBlu|Button1|button press type, battery, packet ID| +| ShellyBlu|Door, Window|contact, rotation, battery, packet ID| +| ShellyBlu|Motion|motion, illuminance, battery, packet ID| +| Switchbot|Bot (c)|mode, state, battery| +| Switchbot|Motion Sensor|movement, light level, sensing distance, led, scope tested, battery| +| Switchbot|Contact Sensor|contact, movement, scope tested, light level, in count, out count, push count, battery| +| Switchbot|Curtain|motion state, position, light level, battery, calibration state| +| Switchbot|Meter (Plus)|temperature, humidity, battery| +| Switchbot|Outdoor Meter|temperature, humidity, battery| +| Thermobeacon|WS02|temperature, humidity, voltage, timestamp, maximum temperature, maximum temperature timestamp, minimum temperature, minimum temperature timestamp| +| Thermobeacon|WS08|temperature, humidity, voltage, timestamp, maximum temperature, maximum temperature timestamp, minimum temperature, minimum temperature timestamp| +| ThermoPro|TP357|temperature, humidity| +| ThermoPro|TP357s|temperature, humidity| +| ThermoPro|TP358|temperature, humidity| +| ThermoPro|TP359|temperature, humidity| +| ThermoPro|TP393|temperature, humidity| +| TPMS|TPMS|temperature, pressure, battery, alarm, count| +| Vegtrug||temperature, moisture, luminance, fertility| +| XIAOMI Mi Flora|HHCCJCY01HHCC|temperature, moisture, luminance, fertility, battery(c) firmware >3.1.8| +| XIAOMI Ropot|HHCCPOT002|temperature, moisture, fertility| +| XIAOMI Mi Jia|LYWSDCGO|temperature, humidity, battery| +| XIAOMI Mi Jia|LYWSD02|temperature, humidity, battery| +| XIAOMI Mi Jia 2(c)|LYWSD03MMC|temperature, humidity, battery, voltage| +| XIAOMI Mi Jia 2 custom firmware (2)|LYWSD03MMC ATC|temperature, humidity, battery, voltage| +| XIAOMI Mi Jia 2 custom firmware (3)|LYWSD03MMC PVVX (encrypted or not)|temperature, humidity, battery, voltage| | XIAOMI Mi Lamp|MUE4094RT|presence| -| XIAOMI Mi Smart Scale|XMTZC01HM/XMTZC04HM|weighing mode/unit/weight| -| XIAOMI Mi Body Composition Scale|XMTZC02HM/XMTZC05HM|weighing mode/unit/weight/impedance| -| XIAOMI Mi Temp/Humidity v1(c)|MHO-C401|temperature/humidity/battery/voltage| -| XIAOMI Mi Temp/Humidity v2(c)|XMWSDJ04MMC|temperature/humidity/battery/voltage| -| XIAOMI|Mi band|steps/activity heart rate (when activated in the Zepp Life settings)| +| XIAOMI Mi Smart Scale|XMTZC01HM, XMTZC04HM|weighing mode, unit, weight| +| XIAOMI Mi Body Composition Scale|XMTZC02HM, XMTZC05HM|weighing mode, unit, weight, impedance| +| XIAOMI Mi Temp, Humidity v1(c)|MHO-C401|temperature, humidity, battery, voltage| +| XIAOMI Mi Temp, Humidity v2(c)|XMWSDJ04MMC|temperature, humidity, battery, voltage| +| XIAOMI|Mi band|steps, activity heart rate (when activated in the Zepp Life settings)| Exhaustive list [here](https://compatible.openmqttgateway.com/index.php/devices/ble-devices/) diff --git a/platformio.ini b/platformio.ini index 64dcfa8085..b208df6e46 100644 --- a/platformio.ini +++ b/platformio.ini @@ -151,7 +151,7 @@ somfy_remote=Somfy_Remote_Lib@0.3.0 rtl_433_ESP = https://github.com/NorthernMan54/rtl_433_ESP.git#v0.3.0 emodbus = miq19/eModbus@1.0.0 gfSunInverter = https://github.com/BlackSmith/GFSunInverter.git#v1.0.1 -decoder = https://github.com/theengs/decoder.git +decoder = https://github.com/theengs/decoder.git#v1.6.2 ssd1306 = https://github.com/ThingPulse/esp8266-oled-ssd1306.git#f96fd6a lm75 = jeremycole/I2C Temperature Sensors derived from the LM75@^1.0.3 rn8209 = https://github.com/theengs/RN8209C-SDK.git#arduino