11.3.1 fix build with newest esp

.github/workflows/build-test.yml

@@ -4,18 +4,26 @@ on: [push]
 
 jobs:
   build-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
+      fail-fast: false
       matrix:
         example:
           - examples/basic
+        conf:
+          - esp32-idf4-arduino.ini
+          - esp32-idf5-idf.ini
+          - esp32s3-idf4-arduino.ini
+          - esp32s3-idf5-idf.ini
+          - esp32c3-idf4-arduino.ini
+          - esp32c3-idf5-idf.ini
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
       - name: Install dependencies
         run: |
           python3 -m pip install --upgrade pip
           python3 -m pip install platformio
       - name: Build examples
-        run: platformio ci --lib="." --project-conf="./platformio.ini" ${{ matrix.example }} partitions.csv
+        run: platformio ci --lib="." --project-conf="./test-inis/${{ matrix.conf }}" ${{ matrix.example }} partitions.csv

CMakeLists.txt

@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.0)
+
+set(SRCS
+    "src/rbjson.cpp"
+    "src/rbprotocol.cpp"
+    "src/rbtcp.cpp"
+    "src/rbudp.cpp"
+    "src/rbwifi_netif.cpp"
+    "src/rbwifi_tcpip.cpp"
+    "src/mpaland-printf/printf.c"
+    "src/rbwebserver.c"
+)
+
+idf_component_register(
+    SRCS ${SRCS}
+    INCLUDE_DIRS "./src"
+    REQUIRES nvs_flash lwip spiffs esp_netif esp_event
+)

examples/basic/main.cpp

@@ -8,6 +8,13 @@
 #include "rbprotocol.h"
 #include "rbwebserver.h"
 
+#ifndef LX16A_ARDUINO
+void setup();
+extern "C" void app_main() {
+    setup();
+}
+#endif
+
 void onPktReceived(const std::string& command, rbjson::Object* pkt) {
     if (command == "joy") {
         printf("Joy: ");
@@ -22,7 +29,7 @@ void onPktReceived(const std::string& command, rbjson::Object* pkt) {
     }
 }
 
-extern "C" void app_main() {
+void setup() {
     // Create web server, serves static files from the spiffs memory
     rb_web_start(80);
 
@@ -38,4 +45,7 @@ extern "C" void app_main() {
             prot.send_log("Tick #%d\n", i++);
         }
     }
-}
+}
+
+void loop() {
+}

library.json

@@ -1,23 +1,20 @@
 {
-    "name": "RB3201-RBProtocol",
-    "keywords": "ESP32, RBProtocol, RB3201, Robotarna, RobotikaBrno, RoboticsBrno",
-    "description": "Library implementing the RBController protocol by RoboticsBrno.",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/RoboticsBrno/RB3201-RBProtocol-library.git"
-    },
-    "authors": [
-        {
-            "name": "Vojtech Bocek",
-            "email": "vbocek@gmail.com",
-            "maintainer": true
-        }
-    ],
-    "version": "11.3.0",
-    "frameworks": [
-        "espidf",
-        "arduino"
-    ],
-    "platforms": "espressif32"
+  "name": "RB3201-RBProtocol",
+  "keywords": "ESP32, RBProtocol, RB3201, Robotarna, RobotikaBrno, RoboticsBrno",
+  "description": "Library implementing the RBController protocol by RoboticsBrno.",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/RoboticsBrno/RB3201-RBProtocol-library.git"
+  },
+  "authors": [
+    {
+      "name": "Vojtech Bocek",
+      "email": "vbocek@gmail.com",
+      "maintainer": true
+    }
+  ],
+  "version": "11.3.1",
+  "frameworks": ["espidf", "arduino"],
+  "platforms": "espressif32"
 }

library.properties

@@ -1,5 +1,5 @@
 name=RB3201-RBProtocol
-version=11.3.0
+version=11.3.1
 author=Vojtech Bocek <vbocek@gmail.com>
 maintainer=Vojtech Bocek <vbocek@gmail.com>
 sentence=Library implementing the RBController protocol by RoboticsBrno.

platformio.ini

@@ -9,7 +9,7 @@
 ; http://docs.platformio.org/page/projectconf.html
 
 [env:esp32dev]
-platform = espressif32
+platform = espressif32@6.3.2
 board = esp32dev
 framework = espidf
 monitor_speed = 115200