Skip to content

Commit

Permalink
Make ESP32 work with WisBlock-API-V2
Browse files Browse the repository at this point in the history
  • Loading branch information
beegee-tokyo committed Dec 7, 2023
1 parent cf1a78a commit e06a98c
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Arduino library for RAKWireless WisBlock Core modules that takes all the LoRaWAN

# Release Notes

## 2.0.15 Fix ESP32
- Make ESP32 work with WisBlock-API-V2

## 2.0.14 Fix AT+PRECV command
- Set RX_CONTINOUS depending on receive mode and re-initialize the LoRa transceiver

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,8 @@ AT Command functions: Taylor Lee ([email protected])
# Changelog
[Code releases](CHANGELOG.md)

- 2023-12-07 Fix ESP32
- Make ESP32 work with WisBlock-API-V2
- 2023-11-22 Fix AT+PRECV command
- Set RX_CONTINOUS depending on receive mode and re-initialize the LoRa transceiver
- 2023-09-01 New feature/bug-fix
Expand Down
6 changes: 4 additions & 2 deletions library.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
{
"name": "WisBlock-API-V2",
"version": "2.0.14",
"version": "2.0.15",
"keywords": [
"lora",
"Semtech",
"SX126x",
"RAK4630",
"RAK11200",
"WisBlock"
],
"description": "An RUI3 AT command compatible library that covers the complete LoRa/LoRaWAN, BLE and AT command handling. Just write your application specific functions and leave the rest to the API",
"frameworks": [
"arduino"
],
"platforms": [
"nordicnrf52"
"nordicnrf52",
"espressif32"
],
"license": "MIT",
"authors": [
Expand Down
4 changes: 2 additions & 2 deletions library.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name=WisBlock-API-V2
version=2.0.14
version=2.0.15
author=Bernd Giesecke <[email protected]>
maintainer=Bernd Giesecke <[email protected]>
sentence=API for WisBlock Core module
paragraph=An RUI3 AT command compatible library that covers the complete LoRa/LoRaWAN, BLE and AT command handling. Just write your application specific functions and leave the rest to the API
category=Communication
url=https://github.com/beegee-tokyo/WisBlock-API-V2/
architectures=nordicnrf52,nrf52
architectures=nordicnrf52,nrf52,esp32
depends=SX126x-Arduino, CayenneLPP
1 change: 1 addition & 0 deletions src/WisBlock-API-V2.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ using namespace std::chrono;
#endif

#ifdef ESP32
#include <WiFi.h>
#include <Preferences.h>
#include <nvs.h>
#include <nvs_flash.h>
Expand Down
1 change: 1 addition & 0 deletions src/at_cmd.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ extern uint8_t g_last_fport;
#ifdef ESP32
#define AT_PRINTF(...) \
Serial.printf(__VA_ARGS__); \
Serial.printf("\n"); \
if (g_ble_uart_is_connected) \
{ \
char buff[255]; \
Expand Down
2 changes: 1 addition & 1 deletion src/ble-esp32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class WiFiCallBackHandler : public BLECharacteristicCallbacks

/** Json object for incoming data */
auto json_error = deserializeJson(json_buffer, (char *)&rx_value[0]);
if (json_error == 0)
if (json_error == DeserializationError::Ok)
{
if (json_buffer.containsKey("ssidPrim") &&
json_buffer.containsKey("pwPrim") &&
Expand Down

0 comments on commit e06a98c

Please sign in to comment.