diff --git a/README.md b/README.md index 21a5ba9..aa476f5 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Upload OpenMQTTGateway directly from the [upload page](https://docs.openmqttgate ### Theengs Bridge, BLE gateway with external antenna -[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerfull BLE to MQTT gateway for over [80 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity. +[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerfull BLE to MQTT gateway for over [90 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity. [![Theengs bridge view](./docs/img/Theengs-Bridge-ble-gateway.png)](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) diff --git a/docs/README.md b/docs/README.md index a990024..ee539ab 100644 --- a/docs/README.md +++ b/docs/README.md @@ -60,7 +60,7 @@ Under the hood, OpenMQTTGateway offers features such as: ### Theengs Bridge, BLE gateway with external antenna -[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerfull BLE to MQTT gateway for over [80 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity. +[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerfull BLE to MQTT gateway for over [90 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity. [![Theengs bridge view](./img/Theengs-Bridge-ble-gateway.png)](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) diff --git a/docs/prerequisites/board.md b/docs/prerequisites/board.md index 39df635..2ebaa0c 100644 --- a/docs/prerequisites/board.md +++ b/docs/prerequisites/board.md @@ -15,7 +15,7 @@ If you want to use the BLE decoding capabilities of OpenMQTTGateway with a Raspb If you want to use the BLE decoding capabilities of OpenMQTTGateway with a tablet or smartphone you can use [Theengs App](https://app.theengs.io/). ::: -[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerfull BLE to MQTT gateway for over [80 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity. +[Theengs bridge](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) is a powerful BLE to MQTT gateway for over [90 sensors](https://decoder.theengs.io/devices/devices.html). Equipped with an Ethernet port, and external antenna, ensuring an enhanced range for your BLE sensors. It supports also WiFi connectivity. [![Theengs bridge view](../img/Theengs-Bridge-ble-gateway.png)](https://shop.theengs.io/products/theengs-bridge-esp32-ble-mqtt-gateway-with-ethernet-and-external-antenna) diff --git a/docs/upload/builds.md b/docs/upload/builds.md index 2ea4da8..b3afc02 100644 --- a/docs/upload/builds.md +++ b/docs/upload/builds.md @@ -111,7 +111,7 @@ upload_flags = ::: warning Note Adding manual WiFi and MQTT credentials to an environment also requires to define `'-DESPWifiManualSetup=true'` -for the credetials to be registered correctly. +for the credentials to be registered correctly. ::: ::: warning Note @@ -236,7 +236,7 @@ upload_flags = * Choose the board on the Arduino IDE * Select the port corresponding to the board * Note that for using BLE on ESP32 you will need to select *Minimal SPIFFS* into Tools->Partition Scheme -* Open the serial monitor and set 115200 bauds +* Open the serial monitor and set 115200 baud * Upload ➡️ * You should see the logs in the serial monitor diff --git a/docs/use/boards.md b/docs/use/boards.md index 9015027..9f226dd 100644 --- a/docs/use/boards.md +++ b/docs/use/boards.md @@ -14,7 +14,7 @@ On M5Stack boards you may do a long press to these buttons in low power mode 0 ( You can also do a long press when powering the board to reset it, this press must be done during the first 5 seconds after the start. ### Wifi interference on sensors when using an ESP ### -Certain sensors like HC-SR501 is prone to generate false signals / triggers when used on a ESP with Wifi enabled. To reduce or elimate the effect the board must be put into Wifi B/G with lower TX power. +Certain sensors like HC-SR501 is prone to generate false signals / triggers when used on a ESP with Wifi enabled. To reduce or eliminate the effect the board must be put into Wifi B/G with lower TX power. This can be achieved with the following macro, `WifiGMode` defined true and `WifiPower` to e.g. WIFI_POWER_11dBm (ESP32) or 11 (ESP8266). diff --git a/docs/use/rf.md b/docs/use/rf.md index b988698..7820cd9 100644 --- a/docs/use/rf.md +++ b/docs/use/rf.md @@ -60,7 +60,7 @@ This feature is only available on a ESP32 based device with a supported transcei ### Supported hardware combinations - ESP32 based device with a CC1101 transceiver -- Heltec WiFi LoRa 32 (V2.1) and LilyGo Lora 32 V2.1 +- Heltec WiFi LoRa 32 (V2.1) and LilyGo LoRa 32 V2.1 - ESP32 DOIT DevKit V1 and Ai-Thinker R01 (SX1278) - ESP32 + SX1278/SX1276 diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino index 7346453..210aa05 100644 --- a/main/ZgatewayBT.ino +++ b/main/ZgatewayBT.ino @@ -404,6 +404,7 @@ void updateDevicesStatus() { unsigned long now = millis(); // Device tracker devices if (BTConfig.presenceEnable && (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::NUT || + p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::NUTALE || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::MIBAND || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::TAGIT || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::TILE || @@ -976,6 +977,7 @@ void launchBTDiscovery(bool overrideDiscovery) { p->sensorModel_id < TheengsDecoder::BLE_ID_NUM::BLE_ID_MAX && p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::HHCCJCY01HHCC && p->sensorModel_id != TheengsDecoder::BLE_ID_NUM::BM2) { // Exception on HHCCJCY01HHCC and BM2 as these ones are discoverable and connectable if (p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::NUT || + p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::NUTALE || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::MIBAND || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::TAGIT || p->sensorModel_id == TheengsDecoder::BLE_ID_NUM::TILE || diff --git a/platformio.ini b/platformio.ini index 39af0d0..c04da23 100644 --- a/platformio.ini +++ b/platformio.ini @@ -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.1 emodbus = miq19/eModbus@1.0.0 gfSunInverter = https://github.com/BlackSmith/GFSunInverter.git#v1.0.1 -decoder = https://github.com/theengs/decoder.git#v1.6.3 +decoder = https://github.com/theengs/decoder.git#v1.6.4 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