Update decoder version. (#1151)

* Update decoder version. * Add new devices and sort list Co-authored-by: Florian <[email protected]>
1technophile · Jan 27, 2022 · 0a8458f · 0a8458f
1 parent ef41546
commit 0a8458f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 23 deletions.
diff --git a/docs/prerequisites/devices.md b/docs/prerequisites/devices.md
@@ -18,43 +18,47 @@ Added to that it retrieves the measures from the devices below. By default the d
 
 |Devices|Model|Measurements|
 |-|:-:|:-:|
+| ATorch Battery Capacity Monitor (c)|DT24|volt/amp/watt|
 | BLE watches with fixed mac||rssi for presence detection|
 | BLE beacons keychains||rssi for presence detection|
-| Vegtrug ||temperature/moisture/luminance/fertility|
-| XIAOMI Mi Flora |HHCCJCY01HHCC|temperature/moisture/luminance/fertility/battery(1)(c)|
-| XIAOMI Mi Jia |LYWSDCGO|temperature/humidity/battery|
-| XIAOMI Mi Jia 2 (1)(c)|LYWSD03MMC|temperature/humidity/battery/volt|
-| XIAOMI Mi Jia 2 custom firmware (2)|LYWSD03MMC ATC|temperature/humidity/battery/volt|
-| XIAOMI Mi Jia 2 custom firmware (3)|LYWSD03MMC PVVX|temperature/humidity/battery/volt|
-| XIAOMI MHO-C401 (1)(c)|MHO-C401|temperature/humidity/battery/volt|
-| XIAOMI Mi Lamp |MUE4094RT|presence|
+| BlueMaestro|TempoDisc|temperature/humidity/duepoint/voltage|
+| ClearGrass |CGG1|temperature/humidity/battery|
+| ClearGrass alarm clock|CGD1|temperature/humidity|
+| ClearGrass with atmospheric pressure |CGP1W|temperature/humidity/air pressure|
+| Clock |LYWDS02|temperature/humidity|
+| Eddystone TLM|protocol|temperature/count/volt/time|
 | GOVEE |H5075|temperature/humidity/battery|
 | GOVEE |H5072|temperature/humidity/battery|
 | GOVEE |H5102|temperature/humidity/battery|
 | HONEYWELL |JQJCY01YM|formaldehyde/temperature/humidity/battery|
+| Ibeacon|protocol|UUID/MFID/Major/Minor/Power|
 | INKBIRD (1)|IBS-TH1|temperature/humidity/battery|
 | INKBIRD (1)|IBS-TH2|temperature/battery|
 | INKBIRD (1)|IBT-2X|temperature1/temperature2|
 | INKBIRD (1)|IBT-4XS|temperature1/temperature2/temperature3/temperature4|
 | INKBIRD (1)|IBT-6XS|temperature1/temperature2/temperature3/temperature4/temperature5/temperature6|
-| ClearGrass |CGG1|temperature/humidity/battery|
+| iNode Energy Meter (1)||power/energy/battery|
+| Mokosmart (1)|M1|x_axis/y_axis/z_axis/battery|
+| Mokosmart (1)|H4|temperature/humidity/volt|
 | Qingping |CGDK2|temperature/humidity|
 | Qingping |CGH1|open|
 | Qingping |CGPR1|presence/luminance|
-| ClearGrass alarm clock|CGD1|temperature/humidity|
-| ClearGrass with atmospheric pressure |CGP1W|temperature/humidity/air pressure|
-| Clock |LYWDS02|temperature/humidity|
+| RuuviTag Raw V1|RuuviTag|temperature/humidity/pressure/acceleration/volt|
+| RuuviTag Raw V2|RuuviTag|temperature/humidity/pressure/acceleration/volt/TX power/movement/counter/sequence number|
+| Thermobeacon|WS02|temperature/humidity/volt|
+| Thermobeacon|WS08|temperature/humidity/volt|
+| TPMS|TPMS|temperature/pressure/battery/alarm/count|
+| Vegtrug ||temperature/moisture/luminance/fertility|
+| XIAOMI Mi Flora |HHCCJCY01HHCC|temperature/moisture/luminance/fertility/battery(1)(c)|
+| XIAOMI Mi Jia |LYWSDCGO|temperature/humidity/battery|
+| XIAOMI Mi Jia 2 (1)(c)|LYWSD03MMC|temperature/humidity/battery/volt|
+| XIAOMI Mi Jia 2 custom firmware (2)|LYWSD03MMC ATC|temperature/humidity/battery/volt|
+| XIAOMI Mi Jia 2 custom firmware (3)|LYWSD03MMC PVVX|temperature/humidity/battery/volt|
+| XIAOMI MHO-C401 (1)(c)|MHO-C401|temperature/humidity/battery/volt|
+| XIAOMI Mi Lamp |MUE4094RT|presence|
 | XIAOMI Mi Scale v1 (1)|XMTZC04HM|weight|
 | XIAOMI Mi Scale v2 (1)|XMTZC05HM|weight|
 | XIAOMI Mi band (1)||steps|
-| iNode Energy Meter (1)||power/energy/battery|
-| Thermobeacon|WS02|temperature/humidity/volt|
-| ATorch Battery Capacity Monitor (c)|DT24|volt/amp/watt|
-| Eddystone TLM|protocol|temperature/count/volt/time|
-| Ibeacon|protocol|UUID/MFID/Major/Minor/Power|
-| Mokosmart (1)|M1|x_axis/y_axis/z_axis/battery|
-| Mokosmart (1)|H4|temperature/humidity/volt|
-| TPMS|TPMS|temperature/pressure/battery/alarm/count|
 
 Exhaustive list [here](https://compatible.openmqttgateway.com/index.php/devices/ble-devices/)
 

diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino
@@ -824,8 +824,9 @@ void launchBTDiscovery() {
 #    endif
     BLEdevice* p = *it;
     Log.trace(F("Device mac %s" CR), p->macAdr);
-    if (p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::UNKNOWN_MODEL &&
-        p->sensorModel_id < BLEconectable::id::MIN && !isDiscovered(p)) {
+    if (p->sensorModel_id > TheengsDecoder::BLE_ID_NUM::UNKNOWN_MODEL &&
+        p->sensorModel_id < TheengsDecoder::BLE_ID_NUM::BLE_ID_MAX &&
+        !isDiscovered(p)) {
       String macWOdots = String(p->macAdr);
       macWOdots.replace(":", "");
       Log.trace(F("Looking for Model_id: %d" CR), p->sensorModel_id);

diff --git a/platformio.ini b/platformio.ini
@@ -130,7 +130,7 @@ [email protected]
 rtl_433_ESP = https://github.com/NorthernMan54/rtl_433_ESP.git#v0.0.4
 emodbus =  miq19/[email protected]
 gfSunInverter = https://github.com/BlackSmith/GFSunInverter.git#v1.0.1
-decoder = https://github.com/theengs/decoder.git#v0.1.7
+decoder = https://github.com/theengs/decoder.git#v0.1.8
 
 [env]
 framework = arduino