port: support ESP32 v3.x

yoursunny · Jun 6, 2024 · f9f10d9 · f9f10d9
1 parent f9485ba
commit f9f10d9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,20 +15,18 @@ jobs:
             fqbn: esp8266:esp8266:nodemcuv2
           - chip: ESP32
             core-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-            core-version: '@2.0.17'
             fqbn: esp32:esp32:esp32wrover
-            build-args: --build-property=build.partitions=default_ffat
+            build-args: --build-property=build.custom_partitions=noota_ffat
             arduino-libs: NimBLE-Arduino
           - chip: ESP32S2
             core-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
             core-version: '@2.0.17'
             fqbn: esp32:esp32:adafruit_magtag29_esp32s2
-            build-args: --build-property=build.partitions=default_ffat
+            build-args: --build-property=build.custom_partitions=noota_ffat
           - chip: ESP32C3
             core-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-            core-version: '@2.0.17'
             fqbn: esp32:esp32:esp32c3
-            build-args: --build-property=build.partitions=default_ffat
+            build-args: --build-property=build.custom_partitions=noota_ffat
             arduino-libs: NimBLE-Arduino
           - chip: nRF52
             fqbn: adafruit:nrf52:feather52832

diff --git a/README.md b/README.md
@@ -4,8 +4,6 @@
 
 **esp8266ndn** library enables [Named Data Networking](https://named-data.net/) application development in Arduino environment. It supports [ESP8266](https://github.com/esp8266/Arduino), [ESP32, ESP32-S2, ESP32-C3](https://github.com/espressif/arduino-esp32), and [Adafruit nRF52](https://github.com/adafruit/Adafruit_nRF52_Arduino) microcontrollers.
 
-Note: currently NDNph and esp8266ndn are compatible with ESP32 Arduino core v2.x; it is incompatible with ESP32 Arduino core v3.x at the moment.
-
 * [Doxygen documentation](https://esp8266ndn.ndn.today/)
 * [#esp8266ndn on Twitter](https://twitter.com/hashtag/esp8266ndn) for announcements
 * [GitHub Issues](https://github.com/yoursunny/esp8266ndn) for bug reports and best-effort support

diff --git a/examples/BlePingServer/.ci.json b/examples/BlePingServer/.ci.json
@@ -2,11 +2,11 @@
   "ESP8266": [],
   "ESP32": [
     "",
-    "--build-property=compiler.cpp.extra_flags=-DDEMO_BLEPINGSERVER_DISABLE_NIMBLE=1"
+    "--build-property=build.defines=-DDEMO_BLEPINGSERVER_DISABLE_NIMBLE=1"
   ],
   "ESP32S2": [],
   "ESP32C3": [
     "",
-    "--build-property=compiler.cpp.extra_flags=-DDEMO_BLEPINGSERVER_DISABLE_NIMBLE=1"
+    "--build-property=build.defines=-DDEMO_BLEPINGSERVER_DISABLE_NIMBLE=1"
   ]
 }
diff --git a/src/port/random.cpp b/src/port/random.cpp
@@ -3,7 +3,7 @@
 #if defined(ARDUINO_ARCH_ESP8266)
 #include <Arduino.h>
 #elif defined(ARDUINO_ARCH_ESP32)
-#include <esp_system.h>
+#include <esp_random.h>
 #elif defined(ARDUINO_ARCH_NRF52)
 #include <Arduino.h>
 #include <algorithm>

diff --git a/src/transport/ble-server-transport.hpp b/src/transport/ble-server-transport.hpp
@@ -69,7 +69,7 @@ class BleServerTransport : public BleServerTransportBase {
 
   /** @brief Retrieve BLE address and address type. */
   String getAddr() const {
-    return String(::BLEDevice::getAddress().toString().data()) + " (addr-type=public)";
+    return String(::BLEDevice::getAddress().toString().c_str()) + " (addr-type=public)";
   }
 
 private:
@@ -102,8 +102,8 @@ class BleServerTransport : public BleServerTransportBase {
       if (chr != m_transport.m_cs) {
         return;
       }
-      std::string value = chr->getValue();
-      m_transport.handleReceive(reinterpret_cast<const uint8_t*>(value.data()), value.size(), 0);
+      auto value = chr->getValue();
+      m_transport.handleReceive(reinterpret_cast<const uint8_t*>(value.c_str()), value.length(), 0);
     }
 
   private: