Skip to content
This repository has been archived by the owner on Feb 9, 2022. It is now read-only.

Commit

Permalink
v1.0.3
Browse files Browse the repository at this point in the history 
### Releases v1.0.3

1. Add checksum for config data integrity.
2. Add clearConfigData() to enable forcing into ConfigPortal Mode when necessary
  • Loading branch information
@khoih-prog
khoih-prog authored Feb 25, 2020
1 parent 09a71cb commit 864a584
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 40 deletions.
81 changes: 65 additions & 16 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Also see examples:
6. [Geiger_Counter_OLED_BT_WF](examples/Geiger_Counter_OLED_BT_WF)
7. [Geiger_Counter_OLED_BT_BLE_WF](examples/Geiger_Counter_OLED_BT_BLE_WF)

and real-life project [Hack GMC Geigercounter With Blynk](https://www.instructables.com/id/Hack-GMC-Geigercounter-With-Blynk/) of [Crosswalkersam](https://www.instructables.com/member/Crosswalkersam/)
and real-life project [Hack GMC Geigercounter With Blynk](https://www.instructables.com/id/Hack-GMC-Geigercounter-With-Blynk/) of [Crosswalkersam](https://www.instructables.com/member/Crosswalkersam/)

<p align="center">
<img src="https://github.com/khoih-prog/BlynkESP32_BT_WF/blob/master/examples/Geiger_Counter_OLED/pics/Box1.jpg">
Expand Down Expand Up @@ -92,8 +92,8 @@ Enter your credentials, then click `Save`. After you restarted, you will see you


## Prerequisite
* Release `1.0.4` or newer of the [ESP32 core for Arduino](https://github.com/espressif/arduino-esp32)
* [`Blynk library 0.6.1 or later`](https://github.com/blynkkk/blynk-library/releases)
* `ESP32 core 1.0.4 or later`
* `Blynk library 0.6.1 or later` (https://www.arduino.cc/en/guide/libraries#toc3)

## Sample code
```
Expand Down Expand Up @@ -208,28 +208,68 @@ void loop()
}
```

and this is the terminal debug output when running both WiFi and BT at the same time using example [ESP32_BLE_WF](examples/ESP32_BLE_WF)
and this is the terminal debug output when running both WiFi and BT at the same time using example [Geiger_Counter_OLED_BT_BLE_WF](examples/Geiger_Counter_OLED_BT_BLE_WF)

```
Starting ESP32_BLE_WF
GPIO14 LOW, Use BLE
[51] Load configfile
[52] OK
[52] Header = ESP32_WFM, SSID = ***, PW = ***
[52] Server = account.duckdns.org, Port = 8080, Token = ****
[56] BT Token = ****, BLE Token = ****
[64] Board Name = Geiger-OLED-BLE-BT
Connecting Blynk via BLE, using auth = ****
[149]
Starting Geiger-Counter-OLED-BT-BLE-WF
Use WiFi to connect Blynk
[332] RFC925 Hostname = GeigerCounter-WiFi
[338] Calc Cksum = 0x3446, Read Cksum = 0x3446
[338] Header = ESP32_WFM, SSID = ****, PW = ****
[338] Server = ****.duckdns.org, Port = 8080, Token = ****
[344] BT Token = ****, BLE Token = ****
[352] Board Name = ESP32-BLE-WF
[355]
___ __ __
/ _ )/ /_ _____ / /__
/ _ / / // / _ \/ '_/
/____/_/\_, /_//_/_/\_\
/___/ v0.6.1 on ESP32
[371] con2WF: start
[1872] con2WF: con OK
[1872] IP = 192.168.2.92, GW = 192.168.2.1, SN = 255.255.0.0
[1872] DNS1 = 192.168.2.1, DNS2 = 0.0.0.0
[1872] bg: WiFi connected. Try Blynk
[1875] BlynkArduinoClient.connect: Connecting to ****.duckdns.org:8080
[1956] Ready (ping: 42ms).
[2026] bg: WiFi+Blynk connected
Use BLE to connect Blynk
BLE_auth = ****
[2027]
___ __ __
/ _ )/ /_ _____ / /__
/ _ / / // / _ \/ '_/
/____/_/\_, /_//_/_/\_\
/___/ v0.6.1 on ESP32
[75491] BLE connect
[77327] Ready
[14199] BLE connect
[15191] Ready
cpm = 0 - RadiationValue = 0.000 uSv/h - Equivalent RadiationDose = 0.0000 uSv
cpm = 30 - RadiationValue = 0.197 uSv/h - Equivalent RadiationDose = 0.0008 uSv
cpm = 60 - RadiationValue = 0.395 uSv/h - Equivalent RadiationDose = 0.0025 uSv
cpm = 90 - RadiationValue = 0.592 uSv/h - Equivalent RadiationDose = 0.0049 uSv
cpm = 120 - RadiationValue = 0.790 uSv/h - Equivalent RadiationDose = 0.0082 uSv
cpm = 150 - RadiationValue = 0.987 uSv/h - Equivalent RadiationDose = 0.0123 uSv
cpm = 180 - RadiationValue = 1.184 uSv/h - Equivalent RadiationDose = 0.0173 uSv
cpm = 210 - RadiationValue = 1.382 uSv/h - Equivalent RadiationDose = 0.0230 uSv
cpm = 240 - RadiationValue = 1.579 uSv/h - Equivalent RadiationDose = 0.0296 uSv
cpm = 270 - RadiationValue = 1.777 uSv/h - Equivalent RadiationDose = 0.0370 uSv
cpm = 300 - RadiationValue = 1.974 uSv/h - Equivalent RadiationDose = 0.0452 uSv
cpm = 330 - RadiationValue = 2.171 uSv/h - Equivalent RadiationDose = 0.0543 uSv
cpm = 360 - RadiationValue = 2.369 uSv/h - Equivalent RadiationDose = 0.0642 uSv
cpm = 390 - RadiationValue = 2.566 uSv/h - Equivalent RadiationDose = 0.0748 uSv
cpm = 420 - RadiationValue = 2.764 uSv/h - Equivalent RadiationDose = 0.0864 uSv
cpm = 450 - RadiationValue = 2.961 uSv/h - Equivalent RadiationDose = 0.0987 uSv
cpm = 480 - RadiationValue = 3.158 uSv/h - Equivalent RadiationDose = 0.1119 uSv
cpm = 510 - RadiationValue = 3.356 uSv/h - Equivalent RadiationDose = 0.1258 uSv
cpm = 540 - RadiationValue = 3.553 uSv/h - Equivalent RadiationDose = 0.1406 uSv
cpm = 570 - RadiationValue = 3.751 uSv/h - Equivalent RadiationDose = 0.1563 uSv
cpm = 600 - RadiationValue = 3.948 uSv/h - Equivalent RadiationDose = 0.1727 uSv
cpm = 630 - RadiationValue = 4.145 uSv/h - Equivalent RadiationDose = 0.1900 uSv
```

Expand All @@ -246,6 +286,15 @@ Connecting Blynk via BLE, using auth = ****
9. Add configurable Static IP, GW, Subnet Mask and 2 DNS Servers' IP Addresses.
10. Use dynamically alocated Config Portal WebServer
11. Fix BT/BLE login timeout
12. Add checksum for config data integrity
13. Add clearConfigData() to enable forcing into ConfigPortal Mode when necessary

### Releases v1.0.3

***Why this version***

1. Add checksum for config data integrity.
2. Add clearConfigData() to enable forcing into ConfigPortal Mode when necessary

### Releases v1.0.2

Expand Down
1 change: 1 addition & 0 deletions keywords.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ getBlynkBLEToken KEYWORD2
getBoardName KEYWORD2
getHWPort KEYWORD2
getFullConfigData KEYWORD2
clearConfigData KEYWORD2

# Handler helpers
BLYNK_READ KEYWORD2
Expand Down
2 changes: 1 addition & 1 deletion library.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "BlynkESP32_BT_WF",
"version": "1.0.2",
"version": "1.0.3",
"description": "Build a smartphone app for your project in minutes. Blynk allows creating IoT solutions easily. It supports WiFi, BLE, Bluetooth, Ethernet, GSM, USB, Serial. Works with many boards like ESP8266, ESP32, Arduino UNO, Nano, Due, Mega, Zero, MKR100, Yun, Raspberry Pi, Particle, Energia, ARM mbed, Intel Edison/Galileo/Joule, BBC micro:bit, DFRobot, RedBearLab, Microduino, LinkIt ONE ...",
"keywords": "sensors, control, device, smartphone, mobile, app, web, cloud, communication, protocol, iot, m2m, wifi, ble, bluetooth, ethernet, usb, serial, gsm, gprs, 3g, data, esp8266, http",
"authors":
Expand Down
6 changes: 3 additions & 3 deletions library.properties
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name=BlynkESP32_BT_WF
version=1.0.2
version=1.0.3
author=Khoi Hoang
license=MIT
maintainer=Khoi Hoang <[email protected]>
sentence=Enable inclusion of both ESP32 Blynk BT/BLE and WiFi libraries. Then run both WiFi and BT/BLE simultaneously, or select one to use at runtime after reboot.
paragraph=Eliminate hardcoding your Wifi and Blynk credentials and configuration data saved in either SPIFFS or EEPROM.
sentence=Enable inclusion of both ESP32 Blynk BT/BLE and WiFi libraries. Then select one at reboot or run both. Eliminate hardcoding your Wifi and Blynk credentials and configuration data saved in either SPIFFS or EEPROM.
paragraph=Library for inclusion of both ESP32 Blynk BT/BLE and WiFi libraries. Then select one at reboot or run both. Eliminate hardcoding your Wifi and Blynk credentials and configuration data saved in either SPIFFS or EEPROM.
category=Communication
url=https://github.com/khoih-prog/BlynkESP32_BT_WF
architectures=esp32
Expand Down
5 changes: 3 additions & 2 deletions src/BlynkSimpleEsp32_BLE_WF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@
* Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases
* Built by Khoi Hoang https://github.com/khoih-prog/BlynkGSM_ESPManager
* Licensed under MIT license
* Version: 1.0.2
* Version: 1.0.3
*
* Original Blynk Library author:
* @file BlynkSimpleESP32.h
* @author Volodymyr Shymanskyy
* @license This project is released under the MIT License (MIT)
* @copyright Copyright (c) 2015 Volodymyr Shymanskyy
* @date Nov 2017
* @date Oct 2016
* @brief
*
* Version Modified By Date Comments
* ------- ----------- ---------- -----------
* 1.0.0 K Hoang 25/01/2020 Initial coding
* 1.0.1 K Hoang 27/01/2020 Enable simultaneously running BT/BLE and WiFi
* 1.0.2 K Hoang 04/02/2020 Add Blynk WiFiManager support similar to Blynk_WM library
* 1.0.3 K Hoang 24/02/2020 Add checksum, clearConfigData()
*****************************************************************************************************************************/

#ifndef BlynkSimpleEsp32_BLE_WF_h
Expand Down
5 changes: 3 additions & 2 deletions src/BlynkSimpleEsp32_BT_WF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@
* Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases
* Built by Khoi Hoang https://github.com/khoih-prog/BlynkGSM_ESPManager
* Licensed under MIT license
* Version: 1.0.2
* Version: 1.0.3
*
* Original Blynk Library author:
* @file BlynkSimpleESP32.h
* @author Volodymyr Shymanskyy
* @license This project is released under the MIT License (MIT)
* @copyright Copyright (c) 2015 Volodymyr Shymanskyy
* @date Nov 2017
* @date Oct 2016
* @brief
*
* Version Modified By Date Comments
* ------- ----------- ---------- -----------
* 1.0.0 K Hoang 25/01/2020 Initial coding
* 1.0.1 K Hoang 27/01/2020 Enable simultaneously running BT/BLE and WiFi
* 1.0.2 K Hoang 04/02/2020 Add Blynk WiFiManager support similar to Blynk_WM library
* 1.0.3 K Hoang 24/02/2020 Add checksum, clearConfigData()
*****************************************************************************************************************************/

#ifndef BlynkSimpleEsp32_BT_WF_h
Expand Down
3 changes: 2 additions & 1 deletion src/BlynkSimpleEsp32_WF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Forked from Blynk library v0.6.1 https://github.com/blynkkk/blynk-library/releases
* Built by Khoi Hoang https://github.com/khoih-prog/BlynkGSM_ESPManager
* Licensed under MIT license
* Version: 1.0.2
* Version: 1.0.3
*
* Original Blynk Library author:
* @file BlynkSimpleESP32.h
Expand All @@ -21,6 +21,7 @@
* 1.0.0 K Hoang 25/01/2020 Initial coding
* 1.0.1 K Hoang 27/01/2020 Enable simultaneously running BT/BLE and WiFi
* 1.0.2 K Hoang 04/02/2020 Add Blynk WiFiManager support similar to Blynk_WM library
* 1.0.3 K Hoang 24/02/2020 Add checksum, clearConfigData()
*****************************************************************************************************************************/

#ifndef BlynkSimpleEsp32_WF_h
Expand Down
Loading

0 comments on commit 864a584

Please sign in to comment.