From f92672c9077aa6e265365879ffc1c5f26553e874 Mon Sep 17 00:00:00 2001 From: Nicolas Graziano Date: Wed, 8 Nov 2023 16:20:01 +0100 Subject: [PATCH 1/2] ABP not building correctly Changes example to use directly channel params. --- examples/esp32-deepsleep-abp/.gitignore | 4 ++++ .../.vscode/extensions.json | 10 +++++++++ examples/esp32-deepsleep-abp/platformio.ini | 2 +- examples/esp32-deepsleep-abp/src/main.cpp | 22 +++++++++++-------- 4 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 examples/esp32-deepsleep-abp/.vscode/extensions.json diff --git a/examples/esp32-deepsleep-abp/.gitignore b/examples/esp32-deepsleep-abp/.gitignore index 66fc7a3..80d3bcc 100644 --- a/examples/esp32-deepsleep-abp/.gitignore +++ b/examples/esp32-deepsleep-abp/.gitignore @@ -1 +1,5 @@ .pio/ + +# Autogenerated by PlatformIO +.vscode/c_cpp_properties.json +.vscode/launch.json diff --git a/examples/esp32-deepsleep-abp/.vscode/extensions.json b/examples/esp32-deepsleep-abp/.vscode/extensions.json new file mode 100644 index 0000000..080e70d --- /dev/null +++ b/examples/esp32-deepsleep-abp/.vscode/extensions.json @@ -0,0 +1,10 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" + ] +} diff --git a/examples/esp32-deepsleep-abp/platformio.ini b/examples/esp32-deepsleep-abp/platformio.ini index 91625b8..d9d7eec 100644 --- a/examples/esp32-deepsleep-abp/platformio.ini +++ b/examples/esp32-deepsleep-abp/platformio.ini @@ -22,5 +22,5 @@ build_unflags = -std=gnu++11 lib_deps = - https://github.com/ngraziano/LMICPP-Arduino.git + ngraziano/LMICPP-Arduino \ No newline at end of file diff --git a/examples/esp32-deepsleep-abp/src/main.cpp b/examples/esp32-deepsleep-abp/src/main.cpp index e192cf1..aa5df5c 100644 --- a/examples/esp32-deepsleep-abp/src/main.cpp +++ b/examples/esp32-deepsleep-abp/src/main.cpp @@ -23,7 +23,11 @@ constexpr lmic_pinmap lmic_pins = { .dio = {26, 33}, }; RadioSx1276 radio{lmic_pins}; -LmicEu868 LMIC{radio}; +Aes aes; +LmicRand lmicrand{aes}; +Eu868RegionalChannelParams channelParams{lmicrand}; + +Lmic LMIC{radio, aes, lmicrand, channelParams}; OsTime nextSend; @@ -118,14 +122,14 @@ void setup() { LMIC.setRx2Parameter(869525000, 3); // Channel 0,1,2 : default channel for EU868 - // LMIC.setupChannel(0, 868100000, dr_range_map(0, 5)); - // LMIC.setupChannel(1, 868300000, dr_range_map(0, 5)); - // LMIC.setupChannel(2, 868500000, dr_range_map(0, 5)); - LMIC.setupChannel(3, 867100000, dr_range_map(0, 5)); - LMIC.setupChannel(4, 867300000, dr_range_map(0, 5)); - LMIC.setupChannel(5, 867500000, dr_range_map(0, 5)); - LMIC.setupChannel(6, 867700000, dr_range_map(0, 5)); - LMIC.setupChannel(7, 867900000, dr_range_map(0, 5)); + // channelParams.setupChannel(0, 868100000, dr_range_map(0, 5)); + // channelParams.setupChannel(1, 868300000, dr_range_map(0, 5)); + // channelParams.setupChannel(2, 868500000, dr_range_map(0, 5)); + channelParams.setupChannel(3, 867100000, dr_range_map(0, 5)); + channelParams.setupChannel(4, 867300000, dr_range_map(0, 5)); + channelParams.setupChannel(5, 867500000, dr_range_map(0, 5)); + channelParams.setupChannel(6, 867700000, dr_range_map(0, 5)); + channelParams.setupChannel(7, 867900000, dr_range_map(0, 5)); // Tx Datarate for EU868 0 => SF12 ... 5 => SF7 LMIC.setDrTx(5); From 2cc2140f94c983d9a958e721ef7a26d8dd1e7345 Mon Sep 17 00:00:00 2001 From: Nicolas Graziano Date: Wed, 8 Nov 2023 16:20:42 +0100 Subject: [PATCH 2/2] Add build of ABP example Fixes #37 --- .github/workflows/build-examples.yml | 2 ++ .../esp32-deepsleep-abp/platformio-ci.ini | 21 +++++++++++++++++++ examples/simple/.vscode/extensions.json | 3 +++ 3 files changed, 26 insertions(+) create mode 100644 examples/esp32-deepsleep-abp/platformio-ci.ini diff --git a/.github/workflows/build-examples.yml b/.github/workflows/build-examples.yml index a7daac6..154c83f 100644 --- a/.github/workflows/build-examples.yml +++ b/.github/workflows/build-examples.yml @@ -29,5 +29,7 @@ jobs: run: platformio ci --lib="." --board=ATmega328P --project-option="lib_deps=https://github.com/ngraziano/avr_stl.git" examples/simple_sx1262 - name: Build esp32 exemple run: platformio ci --lib="." examples/esp32 --project-conf examples/esp32/platformio-ci.ini + - name: Build esp32 abp + run: platformio ci --lib="." examples/esp32-deepsleep-abp --project-conf examples/esp32-deepsleep-abp/platformio-ci.ini # - name: Build rak811 exemple # run: platformio ci --lib="." examples/rak811_gps --project-conf examples/rak811_gps/platformio-ci.ini diff --git a/examples/esp32-deepsleep-abp/platformio-ci.ini b/examples/esp32-deepsleep-abp/platformio-ci.ini new file mode 100644 index 0000000..31ee850 --- /dev/null +++ b/examples/esp32-deepsleep-abp/platformio-ci.ini @@ -0,0 +1,21 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; http://docs.platformio.org/page/projectconf.html + +[env:esp32] +platform = espressif32 +board = heltec_wifi_lora_32 +framework = arduino +upload_port = COM9 + +monitor_port = COM9 +monitor_speed = 19200 + +build_flags = -std=gnu++17 -Wall -Wextra -O3 -DENABLE_SAVE_RESTORE +build_unflags = -std=gnu++11 diff --git a/examples/simple/.vscode/extensions.json b/examples/simple/.vscode/extensions.json index e80666b..080e70d 100644 --- a/examples/simple/.vscode/extensions.json +++ b/examples/simple/.vscode/extensions.json @@ -3,5 +3,8 @@ // for the documentation about the extensions.json format "recommendations": [ "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" ] }