[BT] Bump Theengs Decoder to 1.6.7 & prmac conversion to RMAC (#1844)
• Bump Theengs Decoder to 1.6.7 • Conversion of prmac decoders to RMAC, for RMAC filtering of random MAC devices, until and if OpenMQTTGateway gets Identity MAC/IRK functionality. •HA discovery lock class added
This commit is contained in:
1 parent
b317063cc4
commit
f2d3239350
3 files changed
+11
-1
No files matched your search
@@ -1121,6 +1121,15 @@ void PublishDeviceData(JsonObject& BLEdata) {
|
|||||||
if (abs((int)BLEdata["rssi"] | 0) < abs(BTConfig.minRssi)) { // process only the devices close enough
|
if (abs((int)BLEdata["rssi"] | 0) < abs(BTConfig.minRssi)) { // process only the devices close enough
|
||||||
// Decode the payload
|
// Decode the payload
|
||||||
process_bledata(BLEdata);
|
process_bledata(BLEdata);
|
||||||
|
// Convert prmacs to RMACS until and if OMG gets Identity MAC/IRK decoding
|
||||||
|
if (BLEdata["prmac"]) {
|
||||||
|
BLEdata.remove("prmac");
|
||||||
|
if (BLEdata["track"]) {
|
||||||
|
BLEdata.remove("track");
|
||||||
|
}
|
||||||
|
BLEdata["type"] = "RMAC";
|
||||||
|
Log.trace(F("Potential RMAC (prmac) converted to RMAC" CR));
|
||||||
|
}
|
||||||
// If the device is a random MAC and pubRandomMACs is false we don't publish this payload
|
// If the device is a random MAC and pubRandomMACs is false we don't publish this payload
|
||||||
if (!BTConfig.pubRandomMACs && (BLEdata["type"].as<string>()).compare("RMAC") == 0) {
|
if (!BTConfig.pubRandomMACs && (BLEdata["type"].as<string>()).compare("RMAC") == 0) {
|
||||||
Log.trace(F("Random MAC, device filtered" CR));
|
Log.trace(F("Random MAC, device filtered" CR));
|
||||||
|
|||||||
@@ -195,6 +195,7 @@ const char* availableHASSClasses[] = {"battery",
|
|||||||
"humidity",
|
"humidity",
|
||||||
"illuminance",
|
"illuminance",
|
||||||
"irradiance",
|
"irradiance",
|
||||||
|
"lock",
|
||||||
"motion",
|
"motion",
|
||||||
"moving",
|
"moving",
|
||||||
"pm10",
|
"pm10",
|
||||||
|
|||||||
+1
-1
@@ -154,7 +154,7 @@ somfy_remote=Somfy_Remote_Lib@0.3.0
|
|||||||
rtl_433_ESP = https://github.com/NorthernMan54/rtl_433_ESP.git#v0.3.2
|
rtl_433_ESP = https://github.com/NorthernMan54/rtl_433_ESP.git#v0.3.2
|
||||||
emodbus = miq19/eModbus@1.0.0
|
emodbus = miq19/eModbus@1.0.0
|
||||||
gfSunInverter = https://github.com/BlackSmith/GFSunInverter.git#v1.0.1
|
gfSunInverter = https://github.com/BlackSmith/GFSunInverter.git#v1.0.1
|
||||||
decoder = https://github.com/theengs/decoder.git#v1.6.4
|
decoder = https://github.com/theengs/decoder.git#v1.6.7
|
||||||
ssd1306 = https://github.com/ThingPulse/esp8266-oled-ssd1306.git#f96fd6a
|
ssd1306 = https://github.com/ThingPulse/esp8266-oled-ssd1306.git#f96fd6a
|
||||||
lm75 = jeremycole/I2C Temperature Sensors derived from the LM75@^1.0.3
|
lm75 = jeremycole/I2C Temperature Sensors derived from the LM75@^1.0.3
|
||||||
rn8209 = https://github.com/theengs/RN8209C-SDK.git#arduino
|
rn8209 = https://github.com/theengs/RN8209C-SDK.git#arduino
|
||||||
|
|||||||
Reference in new issue
Block a user