From 88a14212baaea0ebfbd28eb7c434c4afaf58524b Mon Sep 17 00:00:00 2001 From: Dan Theisen Date: Wed, 15 Jul 2026 22:21:07 -0700 Subject: [PATCH 1/2] rename `examples/` directory to `apps/` --- .github/workflows/pr-build-check.yml | 4 +- CONTRIBUTING.md | 2 +- README.md | 12 ++-- .../companion_radio/AbstractUITask.h | 0 .../companion_radio/DataStore.cpp | 0 .../companion_radio/DataStore.h | 0 {examples => apps}/companion_radio/MyMesh.cpp | 0 {examples => apps}/companion_radio/MyMesh.h | 0 .../companion_radio/NodePrefs.h | 0 {examples => apps}/companion_radio/main.cpp | 0 .../companion_radio/ui-new/UITask.cpp | 0 .../companion_radio/ui-new/UITask.h | 0 .../companion_radio/ui-new/icons.h | 0 .../companion_radio/ui-orig/Button.cpp | 0 .../companion_radio/ui-orig/Button.h | 0 .../companion_radio/ui-orig/UITask.cpp | 0 .../companion_radio/ui-orig/UITask.h | 0 .../ui-tiny/ScrollingStatusBar.h | 0 .../companion_radio/ui-tiny/UITask.cpp | 0 .../companion_radio/ui-tiny/UITask.h | 0 .../companion_radio/ui-tiny/u8g2_icons.h | 0 {examples => apps}/kiss_modem/KissModem.cpp | 0 {examples => apps}/kiss_modem/KissModem.h | 0 {examples => apps}/kiss_modem/main.cpp | 0 {examples => apps}/simple_repeater/MyMesh.cpp | 0 {examples => apps}/simple_repeater/MyMesh.h | 0 .../simple_repeater/RateLimiter.h | 0 {examples => apps}/simple_repeater/UITask.cpp | 0 {examples => apps}/simple_repeater/UITask.h | 0 {examples => apps}/simple_repeater/main.cpp | 0 .../simple_room_server/MyMesh.cpp | 0 .../simple_room_server/MyMesh.h | 0 .../simple_room_server/UITask.cpp | 0 .../simple_room_server/UITask.h | 0 .../simple_room_server/main.cpp | 0 .../simple_secure_chat/main.cpp | 0 .../simple_sensor/SensorMesh.cpp | 0 {examples => apps}/simple_sensor/SensorMesh.h | 0 .../simple_sensor/TimeSeriesData.cpp | 0 .../simple_sensor/TimeSeriesData.h | 0 {examples => apps}/simple_sensor/UITask.cpp | 0 {examples => apps}/simple_sensor/UITask.h | 0 {examples => apps}/simple_sensor/main.cpp | 0 build_as_lib.py | 6 +- docs/companion_protocol.md | 2 +- variants/ebyte_eora_s3/platformio.ini | 20 +++---- variants/gat562_30s_mesh_kit/platformio.ini | 18 +++--- variants/gat562_mesh_evb_pro/platformio.ini | 6 +- .../gat562_mesh_tracker_pro/platformio.ini | 18 +++--- variants/gat562_mesh_watch13/platformio.ini | 12 ++-- variants/generic-e22/platformio.ini | 14 ++--- variants/generic_espnow/platformio.ini | 8 +-- variants/heltec_ct62/platformio.ini | 14 ++--- variants/heltec_e213/platformio.ini | 22 +++---- variants/heltec_e290/platformio.ini | 22 +++---- variants/heltec_mesh_solar/platformio.ini | 10 ++-- variants/heltec_t096/platformio.ini | 22 +++---- variants/heltec_t1/platformio.ini | 18 +++--- variants/heltec_t114/platformio.ini | 38 ++++++------ variants/heltec_t190/platformio.ini | 22 +++---- variants/heltec_tower_v2/platformio.ini | 18 +++--- variants/heltec_tracker/platformio.ini | 22 +++---- variants/heltec_tracker_v2/platformio.ini | 30 +++++----- variants/heltec_v2/platformio.ini | 30 +++++----- variants/heltec_v3/platformio.ini | 48 +++++++-------- variants/heltec_v4/platformio.ini | 60 +++++++++---------- variants/heltec_wireless_paper/platformio.ini | 22 +++---- variants/ikoka_handheld_nrf/platformio.ini | 12 ++-- variants/ikoka_nano_nrf/platformio.ini | 22 +++---- variants/ikoka_stick_nrf/platformio.ini | 22 +++---- variants/keepteen_lt1/platformio.ini | 18 +++--- variants/lilygo_t3s3/platformio.ini | 24 ++++---- variants/lilygo_t3s3_sx1276/platformio.ini | 24 ++++---- variants/lilygo_t_impulse_plus/platformio.ini | 10 ++-- variants/lilygo_tbeam_1w/platformio.ini | 26 ++++---- variants/lilygo_tbeam_SX1262/platformio.ini | 16 ++--- variants/lilygo_tbeam_SX1276/platformio.ini | 16 ++--- .../platformio.ini | 22 +++---- variants/lilygo_tdeck/platformio.ini | 16 ++--- variants/lilygo_techo/platformio.ini | 18 +++--- variants/lilygo_techo_card/platformio.ini | 16 ++--- variants/lilygo_techo_lite/platformio.ini | 20 +++---- variants/lilygo_teth_elite/platformio.ini | 8 +-- variants/lilygo_tlora_c6/platformio.ini | 8 +-- variants/lilygo_tlora_v2_1/platformio.ini | 30 +++++----- variants/m5stack_unit_c6l/platformio.ini | 10 ++-- variants/mesh_pocket/platformio.ini | 19 +++--- variants/meshadventurer/platformio.ini | 48 +++++++-------- variants/meshtiny/platformio.ini | 14 ++--- variants/minewsemi_me25ls01/platformio.ini | 20 +++---- variants/muziworks_r1_neo/platformio.ini | 22 +++---- variants/nano_g2_ultra/platformio.ini | 18 +++--- variants/nibble_screen_connect/platformio.ini | 28 ++++----- variants/nibble_zero_connect/platformio.ini | 26 ++++---- variants/promicro/platformio.ini | 24 ++++---- variants/rak11310/platformio.ini | 16 ++--- variants/rak3112/platformio.ini | 32 +++++----- variants/rak3401/platformio.ini | 22 +++---- variants/rak3x72/platformio.ini | 8 +-- variants/rak4631/platformio.ini | 36 +++++------ variants/rak_wismesh_tag/platformio.ini | 20 +++---- variants/rpi_picow/platformio.ini | 14 ++--- .../sensecap_indicator-espnow/platformio.ini | 6 +- variants/sensecap_solar/platformio.ini | 8 +-- variants/station_g2/platformio.ini | 34 +++++------ variants/station_g3_esp32/platformio.ini | 26 ++++---- variants/t1000-e/platformio.ini | 22 +++---- variants/tenstar_c3/platformio.ini | 16 ++--- variants/thinknode_m1/platformio.ini | 18 +++--- variants/thinknode_m2/platformio.ini | 36 +++++------ variants/thinknode_m3/platformio.ini | 22 +++---- variants/thinknode_m5/platformio.ini | 36 +++++------ variants/thinknode_m6/platformio.ini | 14 ++--- variants/thinknode_m7/platformio.ini | 24 ++++---- variants/thinknode_m9/platformio.ini | 24 ++++---- variants/tiny_relay/platformio.ini | 8 +-- variants/waveshare_rp2040_lora/platformio.ini | 16 ++--- variants/wio-e5-dev/platformio.ini | 8 +-- variants/wio-e5-mini/platformio.ini | 12 ++-- variants/wio-tracker-l1-eink/platformio.ini | 8 +-- variants/wio-tracker-l1/platformio.ini | 18 +++--- variants/wio_wm1110/platformio.ini | 16 ++--- variants/xiao_c3/platformio.ini | 12 ++-- variants/xiao_c6/platformio.ini | 14 ++--- variants/xiao_nrf52/platformio.ini | 18 +++--- variants/xiao_rp2040/platformio.ini | 14 ++--- variants/xiao_s3/platformio.ini | 22 +++---- variants/xiao_s3_wio/platformio.ini | 36 +++++------ 128 files changed, 857 insertions(+), 856 deletions(-) rename {examples => apps}/companion_radio/AbstractUITask.h (100%) rename {examples => apps}/companion_radio/DataStore.cpp (100%) rename {examples => apps}/companion_radio/DataStore.h (100%) rename {examples => apps}/companion_radio/MyMesh.cpp (100%) rename {examples => apps}/companion_radio/MyMesh.h (100%) rename {examples => apps}/companion_radio/NodePrefs.h (100%) rename {examples => apps}/companion_radio/main.cpp (100%) rename {examples => apps}/companion_radio/ui-new/UITask.cpp (100%) rename {examples => apps}/companion_radio/ui-new/UITask.h (100%) rename {examples => apps}/companion_radio/ui-new/icons.h (100%) rename {examples => apps}/companion_radio/ui-orig/Button.cpp (100%) rename {examples => apps}/companion_radio/ui-orig/Button.h (100%) rename {examples => apps}/companion_radio/ui-orig/UITask.cpp (100%) rename {examples => apps}/companion_radio/ui-orig/UITask.h (100%) rename {examples => apps}/companion_radio/ui-tiny/ScrollingStatusBar.h (100%) rename {examples => apps}/companion_radio/ui-tiny/UITask.cpp (100%) rename {examples => apps}/companion_radio/ui-tiny/UITask.h (100%) rename {examples => apps}/companion_radio/ui-tiny/u8g2_icons.h (100%) rename {examples => apps}/kiss_modem/KissModem.cpp (100%) rename {examples => apps}/kiss_modem/KissModem.h (100%) rename {examples => apps}/kiss_modem/main.cpp (100%) rename {examples => apps}/simple_repeater/MyMesh.cpp (100%) rename {examples => apps}/simple_repeater/MyMesh.h (100%) rename {examples => apps}/simple_repeater/RateLimiter.h (100%) rename {examples => apps}/simple_repeater/UITask.cpp (100%) rename {examples => apps}/simple_repeater/UITask.h (100%) rename {examples => apps}/simple_repeater/main.cpp (100%) rename {examples => apps}/simple_room_server/MyMesh.cpp (100%) rename {examples => apps}/simple_room_server/MyMesh.h (100%) rename {examples => apps}/simple_room_server/UITask.cpp (100%) rename {examples => apps}/simple_room_server/UITask.h (100%) rename {examples => apps}/simple_room_server/main.cpp (100%) rename {examples => apps}/simple_secure_chat/main.cpp (100%) rename {examples => apps}/simple_sensor/SensorMesh.cpp (100%) rename {examples => apps}/simple_sensor/SensorMesh.h (100%) rename {examples => apps}/simple_sensor/TimeSeriesData.cpp (100%) rename {examples => apps}/simple_sensor/TimeSeriesData.h (100%) rename {examples => apps}/simple_sensor/UITask.cpp (100%) rename {examples => apps}/simple_sensor/UITask.h (100%) rename {examples => apps}/simple_sensor/main.cpp (100%) diff --git a/.github/workflows/pr-build-check.yml b/.github/workflows/pr-build-check.yml index cebf0cfe5c..c3cf8c9b72 100644 --- a/.github/workflows/pr-build-check.yml +++ b/.github/workflows/pr-build-check.yml @@ -5,7 +5,7 @@ on: branches: [main, dev] paths: - 'src/**' - - 'examples/**' + - 'apps/**' - 'variants/**' - 'platformio.ini' - '.github/workflows/pr-build-check.yml' @@ -13,7 +13,7 @@ on: branches: [main, dev] paths: - 'src/**' - - 'examples/**' + - 'apps/**' - 'variants/**' - 'platformio.ini' - '.github/workflows/pr-build-check.yml' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b998610ece..2de804c828 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,7 +38,7 @@ Thanks for considering contributing to this project! - Bad: `update` - Reference any related issue (`Fixes #123`, `Closes #89`, etc.) - If you change public API, update README.md and library.properties -- New features should include an example sketch in `examples/` +- New features should include an example sketch in `apps/` ## Coding Style diff --git a/README.md b/README.md index af56aaf33b..5349d0be28 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,12 @@ For developers: - Install [PlatformIO](https://docs.platformio.org) in [Visual Studio Code](https://code.visualstudio.com). - Clone and open the MeshCore repository in Visual Studio Code. - See the example applications you can modify and run: - - [Companion Radio](./examples/companion_radio) - For use with an external chat app, over BLE, USB or Wi-Fi. - - [KISS Modem](./examples/kiss_modem) - Serial KISS protocol bridge for host applications. ([protocol docs](./docs/kiss_modem_protocol.md)) - - [Simple Repeater](./examples/simple_repeater) - Extends network coverage by relaying messages. - - [Simple Room Server](./examples/simple_room_server) - A simple BBS server for shared Posts. - - [Simple Secure Chat](./examples/simple_secure_chat) - Secure terminal based text communication between devices. - - [Simple Sensor](./examples/simple_sensor) - Remote sensor node with telemetry and alerting. + - [Companion Radio](./apps/companion_radio) - For use with an external chat app, over BLE, USB or Wi-Fi. + - [KISS Modem](./apps/kiss_modem) - Serial KISS protocol bridge for host applications. ([protocol docs](./docs/kiss_modem_protocol.md)) + - [Simple Repeater](./apps/simple_repeater) - Extends network coverage by relaying messages. + - [Simple Room Server](./apps/simple_room_server) - A simple BBS server for shared Posts. + - [Simple Secure Chat](./apps/simple_secure_chat) - Secure terminal based text communication between devices. + - [Simple Sensor](./apps/simple_sensor) - Remote sensor node with telemetry and alerting. The Simple Secure Chat example can be interacted with through the Serial Monitor in Visual Studio Code, or with a Serial USB Terminal on Android. diff --git a/examples/companion_radio/AbstractUITask.h b/apps/companion_radio/AbstractUITask.h similarity index 100% rename from examples/companion_radio/AbstractUITask.h rename to apps/companion_radio/AbstractUITask.h diff --git a/examples/companion_radio/DataStore.cpp b/apps/companion_radio/DataStore.cpp similarity index 100% rename from examples/companion_radio/DataStore.cpp rename to apps/companion_radio/DataStore.cpp diff --git a/examples/companion_radio/DataStore.h b/apps/companion_radio/DataStore.h similarity index 100% rename from examples/companion_radio/DataStore.h rename to apps/companion_radio/DataStore.h diff --git a/examples/companion_radio/MyMesh.cpp b/apps/companion_radio/MyMesh.cpp similarity index 100% rename from examples/companion_radio/MyMesh.cpp rename to apps/companion_radio/MyMesh.cpp diff --git a/examples/companion_radio/MyMesh.h b/apps/companion_radio/MyMesh.h similarity index 100% rename from examples/companion_radio/MyMesh.h rename to apps/companion_radio/MyMesh.h diff --git a/examples/companion_radio/NodePrefs.h b/apps/companion_radio/NodePrefs.h similarity index 100% rename from examples/companion_radio/NodePrefs.h rename to apps/companion_radio/NodePrefs.h diff --git a/examples/companion_radio/main.cpp b/apps/companion_radio/main.cpp similarity index 100% rename from examples/companion_radio/main.cpp rename to apps/companion_radio/main.cpp diff --git a/examples/companion_radio/ui-new/UITask.cpp b/apps/companion_radio/ui-new/UITask.cpp similarity index 100% rename from examples/companion_radio/ui-new/UITask.cpp rename to apps/companion_radio/ui-new/UITask.cpp diff --git a/examples/companion_radio/ui-new/UITask.h b/apps/companion_radio/ui-new/UITask.h similarity index 100% rename from examples/companion_radio/ui-new/UITask.h rename to apps/companion_radio/ui-new/UITask.h diff --git a/examples/companion_radio/ui-new/icons.h b/apps/companion_radio/ui-new/icons.h similarity index 100% rename from examples/companion_radio/ui-new/icons.h rename to apps/companion_radio/ui-new/icons.h diff --git a/examples/companion_radio/ui-orig/Button.cpp b/apps/companion_radio/ui-orig/Button.cpp similarity index 100% rename from examples/companion_radio/ui-orig/Button.cpp rename to apps/companion_radio/ui-orig/Button.cpp diff --git a/examples/companion_radio/ui-orig/Button.h b/apps/companion_radio/ui-orig/Button.h similarity index 100% rename from examples/companion_radio/ui-orig/Button.h rename to apps/companion_radio/ui-orig/Button.h diff --git a/examples/companion_radio/ui-orig/UITask.cpp b/apps/companion_radio/ui-orig/UITask.cpp similarity index 100% rename from examples/companion_radio/ui-orig/UITask.cpp rename to apps/companion_radio/ui-orig/UITask.cpp diff --git a/examples/companion_radio/ui-orig/UITask.h b/apps/companion_radio/ui-orig/UITask.h similarity index 100% rename from examples/companion_radio/ui-orig/UITask.h rename to apps/companion_radio/ui-orig/UITask.h diff --git a/examples/companion_radio/ui-tiny/ScrollingStatusBar.h b/apps/companion_radio/ui-tiny/ScrollingStatusBar.h similarity index 100% rename from examples/companion_radio/ui-tiny/ScrollingStatusBar.h rename to apps/companion_radio/ui-tiny/ScrollingStatusBar.h diff --git a/examples/companion_radio/ui-tiny/UITask.cpp b/apps/companion_radio/ui-tiny/UITask.cpp similarity index 100% rename from examples/companion_radio/ui-tiny/UITask.cpp rename to apps/companion_radio/ui-tiny/UITask.cpp diff --git a/examples/companion_radio/ui-tiny/UITask.h b/apps/companion_radio/ui-tiny/UITask.h similarity index 100% rename from examples/companion_radio/ui-tiny/UITask.h rename to apps/companion_radio/ui-tiny/UITask.h diff --git a/examples/companion_radio/ui-tiny/u8g2_icons.h b/apps/companion_radio/ui-tiny/u8g2_icons.h similarity index 100% rename from examples/companion_radio/ui-tiny/u8g2_icons.h rename to apps/companion_radio/ui-tiny/u8g2_icons.h diff --git a/examples/kiss_modem/KissModem.cpp b/apps/kiss_modem/KissModem.cpp similarity index 100% rename from examples/kiss_modem/KissModem.cpp rename to apps/kiss_modem/KissModem.cpp diff --git a/examples/kiss_modem/KissModem.h b/apps/kiss_modem/KissModem.h similarity index 100% rename from examples/kiss_modem/KissModem.h rename to apps/kiss_modem/KissModem.h diff --git a/examples/kiss_modem/main.cpp b/apps/kiss_modem/main.cpp similarity index 100% rename from examples/kiss_modem/main.cpp rename to apps/kiss_modem/main.cpp diff --git a/examples/simple_repeater/MyMesh.cpp b/apps/simple_repeater/MyMesh.cpp similarity index 100% rename from examples/simple_repeater/MyMesh.cpp rename to apps/simple_repeater/MyMesh.cpp diff --git a/examples/simple_repeater/MyMesh.h b/apps/simple_repeater/MyMesh.h similarity index 100% rename from examples/simple_repeater/MyMesh.h rename to apps/simple_repeater/MyMesh.h diff --git a/examples/simple_repeater/RateLimiter.h b/apps/simple_repeater/RateLimiter.h similarity index 100% rename from examples/simple_repeater/RateLimiter.h rename to apps/simple_repeater/RateLimiter.h diff --git a/examples/simple_repeater/UITask.cpp b/apps/simple_repeater/UITask.cpp similarity index 100% rename from examples/simple_repeater/UITask.cpp rename to apps/simple_repeater/UITask.cpp diff --git a/examples/simple_repeater/UITask.h b/apps/simple_repeater/UITask.h similarity index 100% rename from examples/simple_repeater/UITask.h rename to apps/simple_repeater/UITask.h diff --git a/examples/simple_repeater/main.cpp b/apps/simple_repeater/main.cpp similarity index 100% rename from examples/simple_repeater/main.cpp rename to apps/simple_repeater/main.cpp diff --git a/examples/simple_room_server/MyMesh.cpp b/apps/simple_room_server/MyMesh.cpp similarity index 100% rename from examples/simple_room_server/MyMesh.cpp rename to apps/simple_room_server/MyMesh.cpp diff --git a/examples/simple_room_server/MyMesh.h b/apps/simple_room_server/MyMesh.h similarity index 100% rename from examples/simple_room_server/MyMesh.h rename to apps/simple_room_server/MyMesh.h diff --git a/examples/simple_room_server/UITask.cpp b/apps/simple_room_server/UITask.cpp similarity index 100% rename from examples/simple_room_server/UITask.cpp rename to apps/simple_room_server/UITask.cpp diff --git a/examples/simple_room_server/UITask.h b/apps/simple_room_server/UITask.h similarity index 100% rename from examples/simple_room_server/UITask.h rename to apps/simple_room_server/UITask.h diff --git a/examples/simple_room_server/main.cpp b/apps/simple_room_server/main.cpp similarity index 100% rename from examples/simple_room_server/main.cpp rename to apps/simple_room_server/main.cpp diff --git a/examples/simple_secure_chat/main.cpp b/apps/simple_secure_chat/main.cpp similarity index 100% rename from examples/simple_secure_chat/main.cpp rename to apps/simple_secure_chat/main.cpp diff --git a/examples/simple_sensor/SensorMesh.cpp b/apps/simple_sensor/SensorMesh.cpp similarity index 100% rename from examples/simple_sensor/SensorMesh.cpp rename to apps/simple_sensor/SensorMesh.cpp diff --git a/examples/simple_sensor/SensorMesh.h b/apps/simple_sensor/SensorMesh.h similarity index 100% rename from examples/simple_sensor/SensorMesh.h rename to apps/simple_sensor/SensorMesh.h diff --git a/examples/simple_sensor/TimeSeriesData.cpp b/apps/simple_sensor/TimeSeriesData.cpp similarity index 100% rename from examples/simple_sensor/TimeSeriesData.cpp rename to apps/simple_sensor/TimeSeriesData.cpp diff --git a/examples/simple_sensor/TimeSeriesData.h b/apps/simple_sensor/TimeSeriesData.h similarity index 100% rename from examples/simple_sensor/TimeSeriesData.h rename to apps/simple_sensor/TimeSeriesData.h diff --git a/examples/simple_sensor/UITask.cpp b/apps/simple_sensor/UITask.cpp similarity index 100% rename from examples/simple_sensor/UITask.cpp rename to apps/simple_sensor/UITask.cpp diff --git a/examples/simple_sensor/UITask.h b/apps/simple_sensor/UITask.h similarity index 100% rename from examples/simple_sensor/UITask.h rename to apps/simple_sensor/UITask.h diff --git a/examples/simple_sensor/main.cpp b/apps/simple_sensor/main.cpp similarity index 100% rename from examples/simple_sensor/main.cpp rename to apps/simple_sensor/main.cpp diff --git a/build_as_lib.py b/build_as_lib.py index d8e95378eb..091a593019 100644 --- a/build_as_lib.py +++ b/build_as_lib.py @@ -41,7 +41,7 @@ # INCLUDE EXAMPLE CODE IN BUILD (to provide your own support files without touching the tree) elif isinstance(item, tuple) and item[0] == "BUILD_EXAMPLE": example_name = item[1] - src_filter.append(f"+<../examples/{example_name}/*.cpp>") + src_filter.append(f"+<../apps/{example_name}/*.cpp>") # EXCLUDE A SOURCE FILE FROM AN EXAMPLE (must be placed after example name or boom) elif isinstance(item, tuple) and item[0] == "EXCLUDE_FROM_EXAMPLE": @@ -49,7 +49,7 @@ if example_name is None: print("***** PLEASE DEFINE EXAMPLE FIRST *****") break - src_filter.append(f"-<../examples/{example_name}/{exclude_name}>") + src_filter.append(f"-<../apps/{example_name}/{exclude_name}>") # DEAL WITH UI VARIANT FOR AN EXAMPLE elif isinstance(item, tuple) and item[0] == "MC_UI_FLAVOR": @@ -57,7 +57,7 @@ if example_name is None: print("***** PLEASE DEFINE EXAMPLE FIRST *****") break - src_filter.append(f"+<../examples/{example_name}/{ui_flavor}/*.cpp>") + src_filter.append(f"+<../apps/{example_name}/{ui_flavor}/*.cpp>") menv.Replace(SRC_FILTER=src_filter) diff --git a/docs/companion_protocol.md b/docs/companion_protocol.md index 7cca7bc9a2..731d599fbd 100644 --- a/docs/companion_protocol.md +++ b/docs/companion_protocol.md @@ -807,7 +807,7 @@ Bytes 1-6: ACK Code (6 bytes, hex) ### Error Codes -`PACKET_ERROR` (0x01) carries a single-byte error code in byte 1. Values match the `ERR_CODE_*` constants defined in `examples/companion_radio/MyMesh.cpp`: +`PACKET_ERROR` (0x01) carries a single-byte error code in byte 1. Values match the `ERR_CODE_*` constants defined in `apps/companion_radio/MyMesh.cpp`: | Code | Constant (firmware) | Description | |------|----------------------------|------------------------------------------------------------------------------| diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini index 15fe761ba5..021d5b774e 100644 --- a/variants/ebyte_eora_s3/platformio.ini +++ b/variants/ebyte_eora_s3/platformio.ini @@ -56,7 +56,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Ebyte_EoRa-S3.lib_deps} ${esp32_ota.lib_deps} @@ -70,7 +70,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Ebyte_EoRa-S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -89,7 +89,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Ebyte_EoRa-S3.lib_deps} ${esp32_ota.lib_deps} @@ -98,7 +98,7 @@ lib_deps = extends = Ebyte_EoRa-S3 build_flags = ${Ebyte_EoRa-S3.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -107,8 +107,8 @@ build_flags = build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Ebyte_EoRa-S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -117,7 +117,7 @@ lib_deps = extends = Ebyte_EoRa-S3 build_flags = ${Ebyte_EoRa-S3.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -130,8 +130,8 @@ build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Ebyte_EoRa-S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -139,4 +139,4 @@ lib_deps = [env:Ebyte_EoRa-S3_kiss_modem] extends = Ebyte_EoRa-S3 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/gat562_30s_mesh_kit/platformio.ini b/variants/gat562_30s_mesh_kit/platformio.ini index 2baac2561b..104b86589e 100644 --- a/variants/gat562_30s_mesh_kit/platformio.ini +++ b/variants/gat562_30s_mesh_kit/platformio.ini @@ -45,7 +45,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:GAT562_30S_Mesh_Kit_room_server] @@ -62,7 +62,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:GAT562_30S_Mesh_Kit_companion_radio_usb] @@ -71,15 +71,15 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_30S_Mesh_Kit.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + lib_deps = ${GAT562_30S_Mesh_Kit.lib_deps} @@ -93,7 +93,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_30S_Mesh_Kit.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -105,8 +105,8 @@ build_flags = build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${GAT562_30S_Mesh_Kit.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -115,4 +115,4 @@ lib_deps = [env:GAT562_30S_Mesh_Kit_kiss_modem] extends = GAT562_30S_Mesh_Kit build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/gat562_mesh_evb_pro/platformio.ini b/variants/gat562_mesh_evb_pro/platformio.ini index b3e894174a..426d22e93f 100644 --- a/variants/gat562_mesh_evb_pro/platformio.ini +++ b/variants/gat562_mesh_evb_pro/platformio.ini @@ -34,7 +34,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:GAT562_Mesh_EVB_Pro_room_server] @@ -49,9 +49,9 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:GAT562_Mesh_EVB_Pro_kiss_modem] extends = GAT562_Mesh_EVB_Pro build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/gat562_mesh_tracker_pro/platformio.ini b/variants/gat562_mesh_tracker_pro/platformio.ini index af153b8fc2..4d2f7bd6d2 100644 --- a/variants/gat562_mesh_tracker_pro/platformio.ini +++ b/variants/gat562_mesh_tracker_pro/platformio.ini @@ -41,7 +41,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:GAT562_Mesh_Tracker_Pro_room_server] @@ -58,7 +58,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:GAT562_Mesh_Tracker_Pro_companion_radio_usb] @@ -67,15 +67,15 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_Mesh_Tracker_Pro.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${GAT562_Mesh_Tracker_Pro.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -88,7 +88,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_Mesh_Tracker_Pro.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -100,8 +100,8 @@ build_flags = build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${GAT562_Mesh_Tracker_Pro.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,4 +109,4 @@ lib_deps = [env:GAT562_Mesh_Tracker_Pro_kiss_modem] extends = GAT562_Mesh_Tracker_Pro build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/gat562_mesh_watch13/platformio.ini b/variants/gat562_mesh_watch13/platformio.ini index f3510b74aa..0938fe0c92 100644 --- a/variants/gat562_mesh_watch13/platformio.ini +++ b/variants/gat562_mesh_watch13/platformio.ini @@ -43,7 +43,7 @@ lib_deps = ;; -D MESH_DEBUG=1 ;build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ;[env:GAT562_Mesh_Watch13_room_server] ;extends = GAT562_Mesh_Watch13 @@ -59,7 +59,7 @@ lib_deps = ;; -D MESH_DEBUG=1 ;build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} ; + -; +<../examples/simple_room_server> +; +<../apps/simple_room_server> [env:GAT562_Mesh_Watch13_companion_radio_ble] extends = GAT562_Mesh_Watch13 @@ -67,7 +67,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_Mesh_Watch13.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -81,8 +81,8 @@ build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${GAT562_Mesh_Watch13.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -90,4 +90,4 @@ lib_deps = [env:GAT562_Mesh_Watch13_kiss_modem] extends = GAT562_Mesh_Watch13 build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini index dfa2ff641f..15fd966077 100644 --- a/variants/generic-e22/platformio.ini +++ b/variants/generic-e22/platformio.ini @@ -30,7 +30,7 @@ lib_deps = [env:Generic_E22_sx1262_repeater] extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Generic_E22.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -51,7 +51,7 @@ lib_deps = ; extends = Generic_E22 ; build_src_filter = ${Generic_E22.build_src_filter} ; + -; +<../examples/simple_repeater/*.cpp> +; +<../apps/simple_repeater/*.cpp> ; build_flags = ; ${Generic_E22.build_flags} ; -D RADIO_CLASS=CustomSX1262 @@ -76,7 +76,7 @@ lib_deps = extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Generic_E22.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -98,12 +98,12 @@ lib_deps = [env:Generic_E22_kiss_modem] extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> [env:Generic_E22_sx1268_repeater] extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Generic_E22.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -124,7 +124,7 @@ lib_deps = ; extends = Generic_E22 ; build_src_filter = ${Generic_E22.build_src_filter} ; + -; +<../examples/simple_repeater/*.cpp> +; +<../apps/simple_repeater/*.cpp> ; build_flags = ; ${Generic_E22.build_flags} ; -D RADIO_CLASS=CustomSX1268 @@ -149,7 +149,7 @@ lib_deps = extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Generic_E22.build_flags} -D RADIO_CLASS=CustomSX1268 diff --git a/variants/generic_espnow/platformio.ini b/variants/generic_espnow/platformio.ini index 928d5315d1..3364cbb05d 100644 --- a/variants/generic_espnow/platformio.ini +++ b/variants/generic_espnow/platformio.ini @@ -29,7 +29,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=1 build_src_filter = ${Generic_ESPNOW.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Generic_ESPNOW.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -44,7 +44,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${Generic_ESPNOW.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> lib_deps = ${Generic_ESPNOW.lib_deps} ${esp32_ota.lib_deps} @@ -60,7 +60,7 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D ESPNOW_DEBUG_LOGGING=1 build_src_filter = ${Generic_ESPNOW.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Generic_ESPNOW.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -75,7 +75,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' build_src_filter = ${Generic_ESPNOW.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> lib_deps = ${Generic_ESPNOW.lib_deps} ${esp32_ota.lib_deps} diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini index 0179d9658c..cf529d05b8 100644 --- a/variants/heltec_ct62/platformio.ini +++ b/variants/heltec_ct62/platformio.ini @@ -45,7 +45,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_ct62.lib_deps} ${esp32_ota.lib_deps} @@ -67,7 +67,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Heltec_ct62.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${Heltec_ct62.lib_deps} ; ${esp32_ota.lib_deps} @@ -87,7 +87,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_ct62.lib_deps} ${esp32_ota.lib_deps} @@ -104,7 +104,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Heltec_ct62.lib_deps} ${esp32_ota.lib_deps} @@ -123,7 +123,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> + lib_deps = ${Heltec_ct62.lib_deps} @@ -146,7 +146,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> lib_deps = ${Heltec_ct62.lib_deps} ${esp32_ota.lib_deps} @@ -154,4 +154,4 @@ lib_deps = [env:Heltec_ct62_kiss_modem] extends = Heltec_ct62 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini index 123edd91c4..c148287f0b 100644 --- a/variants/heltec_e213/platformio.ini +++ b/variants/heltec_e213/platformio.ini @@ -45,7 +45,7 @@ lib_deps = extends = Heltec_E213_base build_flags = ${Heltec_E213_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -56,8 +56,8 @@ build_flags = build_src_filter = ${Heltec_E213_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_E213_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -67,7 +67,7 @@ lib_deps = extends = Heltec_E213_base build_flags = ${Heltec_E213_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -76,8 +76,8 @@ build_flags = build_src_filter = ${Heltec_E213_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_E213_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -95,7 +95,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_E213_base.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_E213_base.lib_deps} ${esp32_ota.lib_deps} @@ -120,7 +120,7 @@ lib_deps = ; build_src_filter = ${Heltec_E213_base.build_src_filter} ; + ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${Heltec_E213_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -143,7 +143,7 @@ build_flags = build_src_filter = ${Heltec_E213_base.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_E213_base.lib_deps} ${esp32_ota.lib_deps} @@ -161,7 +161,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${Heltec_E213_base.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Heltec_E213_base.lib_deps} ${esp32_ota.lib_deps} @@ -170,4 +170,4 @@ lib_deps = [env:Heltec_E213_kiss_modem] extends = Heltec_E213_base build_src_filter = ${Heltec_E213_base.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini index c7cd5f21ea..7f04abc36f 100644 --- a/variants/heltec_e290/platformio.ini +++ b/variants/heltec_e290/platformio.ini @@ -39,7 +39,7 @@ lib_deps = extends = Heltec_E290_base build_flags = ${Heltec_E290_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E290Display @@ -50,8 +50,8 @@ build_flags = build_src_filter = ${Heltec_E290_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_E290_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -61,7 +61,7 @@ lib_deps = extends = Heltec_E290_base build_flags = ${Heltec_E290_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E290Display @@ -71,8 +71,8 @@ build_flags = build_src_filter = ${Heltec_E290_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_E290_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -90,7 +90,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_E290_base.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_E290_base.lib_deps} ${esp32_ota.lib_deps} @@ -115,7 +115,7 @@ lib_deps = ; build_src_filter = ${Heltec_E290_base.build_src_filter} ; + ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${Heltec_E290_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -138,7 +138,7 @@ build_flags = build_src_filter = ${Heltec_E290_base.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_E290_base.lib_deps} ${esp32_ota.lib_deps} @@ -156,7 +156,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${Heltec_E290_base.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Heltec_E290_base.lib_deps} ${esp32_ota.lib_deps} @@ -165,4 +165,4 @@ lib_deps = [env:Heltec_E290_kiss_modem] extends = Heltec_E290_base build_src_filter = ${Heltec_E290_base.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_mesh_solar/platformio.ini b/variants/heltec_mesh_solar/platformio.ini index fb5cd5152f..db94b86fab 100644 --- a/variants/heltec_mesh_solar/platformio.ini +++ b/variants/heltec_mesh_solar/platformio.ini @@ -33,7 +33,7 @@ upload_protocol = nrfutil [env:Heltec_mesh_solar_repeater] extends = Heltec_mesh_solar build_src_filter = ${Heltec_mesh_solar.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Heltec_mesh_solar.build_flags} @@ -48,7 +48,7 @@ build_flags = [env:Heltec_mesh_solar_room_server] extends = Heltec_mesh_solar build_src_filter = ${Heltec_mesh_solar.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Heltec_mesh_solar.build_flags} -D ADVERT_NAME='"Heltec_Mesh_Solar Room"' @@ -74,7 +74,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_mesh_solar.build_src_filter} + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Heltec_mesh_solar.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -93,7 +93,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_mesh_solar.build_src_filter} + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Heltec_mesh_solar.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -101,4 +101,4 @@ lib_deps = [env:Heltec_mesh_solar_kiss_modem] extends = Heltec_mesh_solar build_src_filter = ${Heltec_mesh_solar.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_t096/platformio.ini b/variants/heltec_t096/platformio.ini index 0a062f00b1..aeb808efb0 100644 --- a/variants/heltec_t096/platformio.ini +++ b/variants/heltec_t096/platformio.ini @@ -58,7 +58,7 @@ upload_protocol = nrfutil [env:Heltec_t096_repeater] extends = Heltec_t096 build_src_filter = ${Heltec_t096.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Heltec_t096.build_flags} @@ -87,12 +87,12 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t096.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:Heltec_t096_room_server] extends = Heltec_t096 build_src_filter = ${Heltec_t096.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Heltec_t096.build_flags} -D ADVERT_NAME='"Heltec_t096 Room"' @@ -116,7 +116,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t096.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> lib_deps = ${Heltec_t096.lib_deps} @@ -126,7 +126,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t096.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -137,8 +137,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t096.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t096.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -149,7 +149,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t096.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D BLE_PIN_CODE=123456 @@ -158,8 +158,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t096.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t096.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -167,4 +167,4 @@ lib_deps = [env:Heltec_t096_kiss_modem] extends = Heltec_t096 build_src_filter = ${Heltec_t096.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_t1/platformio.ini b/variants/heltec_t1/platformio.ini index d5c3caf189..7866d5a4e0 100644 --- a/variants/heltec_t1/platformio.ini +++ b/variants/heltec_t1/platformio.ini @@ -30,7 +30,7 @@ upload_protocol = nrfutil [env:Heltec_t1_repeater] extends = Heltec_t1 build_src_filter = ${Heltec_t1.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Heltec_t1.build_flags} @@ -45,7 +45,7 @@ build_flags = [env:Heltec_t1_room_server] extends = Heltec_t1 build_src_filter = ${Heltec_t1.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Heltec_t1.build_flags} -D ADVERT_NAME='"Heltec_t1 Room"' @@ -62,7 +62,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t1.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -74,8 +74,8 @@ build_flags = build_src_filter = ${Heltec_t1.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -87,7 +87,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t1.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -95,8 +95,8 @@ build_flags = build_src_filter = ${Heltec_t1.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -105,4 +105,4 @@ lib_deps = [env:Heltec_t1_kiss_modem] extends = Heltec_t1 build_src_filter = ${Heltec_t1.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini index 135babb1a2..e7c4a75d88 100644 --- a/variants/heltec_t114/platformio.ini +++ b/variants/heltec_t114/platformio.ini @@ -49,7 +49,7 @@ upload_protocol = nrfutil [env:Heltec_t114_without_display_repeater] extends = Heltec_t114 build_src_filter = ${Heltec_t114.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Heltec_t114.build_flags} -D ADVERT_NAME='"Heltec_T114 Repeater"' @@ -77,12 +77,12 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:Heltec_t114_without_display_room_server] extends = Heltec_t114 build_src_filter = ${Heltec_t114.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Heltec_t114.build_flags} -D ADVERT_NAME='"Heltec_T114 Room"' @@ -99,7 +99,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -110,8 +110,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t114.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -122,14 +122,14 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 build_src_filter = ${Heltec_t114.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t114.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -159,7 +159,7 @@ upload_protocol = nrfutil [env:Heltec_t114_repeater] extends = Heltec_t114_with_display build_src_filter = ${Heltec_t114_with_display.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Heltec_t114_with_display.build_flags} @@ -188,12 +188,12 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114_with_display.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:Heltec_t114_room_server] extends = Heltec_t114_with_display build_src_filter = ${Heltec_t114_with_display.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Heltec_t114_with_display.build_flags} -D ADVERT_NAME='"Heltec_T114 Room"' @@ -210,7 +210,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114_with_display.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -221,8 +221,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114_with_display.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t114_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -233,7 +233,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114_with_display.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D BLE_PIN_CODE=123456 @@ -242,8 +242,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114_with_display.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t114_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -251,4 +251,4 @@ lib_deps = [env:Heltec_t114_kiss_modem] extends = Heltec_t114 build_src_filter = ${Heltec_t114.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini index 411fee8518..cd8cf55753 100644 --- a/variants/heltec_t190/platformio.ini +++ b/variants/heltec_t190/platformio.ini @@ -52,7 +52,7 @@ lib_deps = extends = Heltec_T190_base build_flags = ${Heltec_T190_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 ; dynamic, random PIN @@ -60,8 +60,8 @@ build_flags = -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${Heltec_T190_base.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_T190_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -70,14 +70,14 @@ lib_deps = extends = Heltec_T190_base build_flags = ${Heltec_T190_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${Heltec_T190_base.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_T190_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -92,7 +92,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_T190_base.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_T190_base.lib_deps} ${esp32_ota.lib_deps} @@ -114,7 +114,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Heltec_T190_base.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${Heltec_T190_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -134,7 +134,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_T190_base.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_T190_base.lib_deps} ${esp32_ota.lib_deps} @@ -149,7 +149,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' build_src_filter = ${Heltec_T190_base.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Heltec_T190_base.lib_deps} ${esp32_ota.lib_deps} @@ -157,4 +157,4 @@ lib_deps = [env:Heltec_T190_kiss_modem] extends = Heltec_T190_base build_src_filter = ${Heltec_T190_base.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_tower_v2/platformio.ini b/variants/heltec_tower_v2/platformio.ini index f029b7d41f..d6caad9beb 100644 --- a/variants/heltec_tower_v2/platformio.ini +++ b/variants/heltec_tower_v2/platformio.ini @@ -28,7 +28,7 @@ upload_protocol = nrfutil [env:Heltec_tower_v2_repeater] extends = Heltec_tower_v2 build_src_filter = ${Heltec_tower_v2.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Heltec_tower_v2.build_flags} -D ADVERT_NAME='"Heltec_Tower_V2 Repeater"' @@ -42,7 +42,7 @@ build_flags = [env:Heltec_tower_v2_room_server] extends = Heltec_tower_v2 build_src_filter = ${Heltec_tower_v2.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Heltec_tower_v2.build_flags} -D ADVERT_NAME='"Heltec_Tower_V2 Room"' @@ -59,7 +59,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_tower_v2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -70,8 +70,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tower_v2.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tower_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -82,7 +82,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_tower_v2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -92,8 +92,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tower_v2.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tower_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -101,4 +101,4 @@ lib_deps = [env:Heltec_tower_v2_kiss_modem] extends = Heltec_tower_v2 build_src_filter = ${Heltec_tower_v2.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini index 07d2e987a4..c075ab86ea 100644 --- a/variants/heltec_tracker/platformio.ini +++ b/variants/heltec_tracker/platformio.ini @@ -54,7 +54,7 @@ extends = Heltec_tracker_base build_flags = ${Heltec_tracker_base.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_ROTATION=1 -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=350 @@ -67,8 +67,8 @@ build_flags = build_src_filter = ${Heltec_tracker_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + lib_deps = ${Heltec_tracker_base.lib_deps} @@ -79,7 +79,7 @@ extends = Heltec_tracker_base build_flags = ${Heltec_tracker_base.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_ROTATION=1 -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=350 @@ -92,8 +92,8 @@ build_flags = build_src_filter = ${Heltec_tracker_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + lib_deps = ${Heltec_tracker_base.lib_deps} @@ -114,7 +114,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_base.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_tracker_base.lib_deps} ${esp32_ota.lib_deps} @@ -139,7 +139,7 @@ lib_deps = ; build_src_filter = ${Heltec_tracker_base.build_src_filter} ; + ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${Heltec_tracker_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -162,7 +162,7 @@ build_flags = build_src_filter = ${Heltec_tracker_base.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_tracker_base.lib_deps} ${esp32_ota.lib_deps} @@ -182,7 +182,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_base.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Heltec_tracker_base.lib_deps} ${esp32_ota.lib_deps} @@ -190,4 +190,4 @@ lib_deps = [env:Heltec_Wireless_Tracker_kiss_modem] extends = Heltec_tracker_base build_src_filter = ${Heltec_tracker_base.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini index f1fe9dd058..97793be832 100644 --- a/variants/heltec_tracker_v2/platformio.ini +++ b/variants/heltec_tracker_v2/platformio.ini @@ -71,7 +71,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_tracker_v2.lib_deps} ${esp32_ota.lib_deps} @@ -94,7 +94,7 @@ build_flags = build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_tracker_v2.lib_deps} ${esp32_ota.lib_deps} @@ -113,7 +113,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Heltec_tracker_v2.lib_deps} ${esp32_ota.lib_deps} @@ -127,7 +127,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -136,7 +136,7 @@ lib_deps = extends = Heltec_tracker_v2 build_flags = ${Heltec_tracker_v2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display @@ -145,8 +145,8 @@ build_flags = build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -155,7 +155,7 @@ lib_deps = extends = Heltec_tracker_v2 build_flags = ${Heltec_tracker_v2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display @@ -170,8 +170,8 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -180,7 +180,7 @@ lib_deps = extends = Heltec_tracker_v2 build_flags = ${Heltec_tracker_v2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display @@ -194,8 +194,8 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -213,7 +213,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} + - +<../examples/simple_sensor> + +<../apps/simple_sensor> lib_deps = ${Heltec_tracker_v2.lib_deps} ${esp32_ota.lib_deps} @@ -221,4 +221,4 @@ lib_deps = [env:heltec_tracker_v2_kiss_modem] extends = Heltec_tracker_v2 build_src_filter = ${Heltec_tracker_v2.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini index ba4f869422..91820962c5 100644 --- a/variants/heltec_v2/platformio.ini +++ b/variants/heltec_v2/platformio.ini @@ -40,7 +40,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> + + lib_deps = @@ -67,7 +67,7 @@ lib_deps = ; + ; + ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${Heltec_lora32_v2.lib_deps} ; ${esp32_ota.lib_deps} @@ -90,7 +90,7 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_lora32_v2.lib_deps} ${esp32_ota.lib_deps} @@ -110,7 +110,7 @@ build_flags = build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Heltec_lora32_v2.lib_deps} ${esp32_ota.lib_deps} @@ -124,7 +124,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -133,7 +133,7 @@ lib_deps = extends = Heltec_lora32_v2 build_flags = ${Heltec_lora32_v2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 @@ -143,8 +143,8 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -153,7 +153,7 @@ lib_deps = extends = Heltec_lora32_v2 build_flags = ${Heltec_lora32_v2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 @@ -166,8 +166,8 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -176,7 +176,7 @@ lib_deps = extends = Heltec_lora32_v2 build_flags = ${Heltec_lora32_v2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 @@ -190,8 +190,8 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -199,4 +199,4 @@ lib_deps = [env:Heltec_v2_kiss_modem] extends = Heltec_lora32_v2 build_src_filter = ${Heltec_lora32_v2.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index a70a93a508..4c53f55882 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -51,7 +51,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -76,7 +76,7 @@ build_flags = build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -98,7 +98,7 @@ build_flags = build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -117,7 +117,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -131,7 +131,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -140,7 +140,7 @@ lib_deps = extends = Heltec_lora32_v3 build_flags = ${Heltec_lora32_v3.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -149,8 +149,8 @@ build_flags = build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -159,7 +159,7 @@ lib_deps = extends = Heltec_lora32_v3 build_flags = ${Heltec_lora32_v3.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -173,8 +173,8 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -183,7 +183,7 @@ lib_deps = extends = Heltec_lora32_v3 build_flags = ${Heltec_lora32_v3.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -197,8 +197,8 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -218,7 +218,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../examples/simple_sensor> + +<../apps/simple_sensor> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -235,7 +235,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -258,7 +258,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -279,7 +279,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -288,7 +288,7 @@ lib_deps = [env:Heltec_WSL3_room_server] extends = Heltec_lora32_v3 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Heltec_lora32_v3.build_flags} -D ADVERT_NAME='"Heltec Room"' @@ -315,7 +315,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -329,7 +329,7 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -348,7 +348,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -364,7 +364,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -372,4 +372,4 @@ lib_deps = [env:Heltec_v3_kiss_modem] extends = Heltec_lora32_v3 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini index fabf38272d..0268b9c8b9 100644 --- a/variants/heltec_v4/platformio.ini +++ b/variants/heltec_v4/platformio.ini @@ -96,7 +96,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -118,7 +118,7 @@ build_flags = -D ENV_PIN_SCL=3 build_src_filter = ${heltec_v4_oled.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -141,7 +141,7 @@ build_flags = build_src_filter = ${heltec_v4_oled.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -160,7 +160,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -174,7 +174,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -183,7 +183,7 @@ lib_deps = extends = heltec_v4_oled build_flags = ${heltec_v4_oled.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -192,8 +192,8 @@ build_flags = build_src_filter = ${heltec_v4_oled.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -202,7 +202,7 @@ lib_deps = extends = heltec_v4_oled build_flags = ${heltec_v4_oled.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -216,8 +216,8 @@ build_src_filter = ${heltec_v4_oled.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -226,7 +226,7 @@ lib_deps = extends = heltec_v4_oled build_flags = ${heltec_v4_oled.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -240,8 +240,8 @@ build_src_filter = ${heltec_v4_oled.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -261,7 +261,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} + - +<../examples/simple_sensor> + +<../apps/simple_sensor> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -281,7 +281,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${heltec_v4_tft.lib_deps} ${esp32_ota.lib_deps} @@ -305,7 +305,7 @@ build_flags = build_src_filter = ${heltec_v4_tft.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${heltec_v4_tft.lib_deps} ${esp32_ota.lib_deps} @@ -324,7 +324,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${heltec_v4_tft.lib_deps} ${esp32_ota.lib_deps} @@ -338,7 +338,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -347,7 +347,7 @@ lib_deps = extends = heltec_v4_tft build_flags = ${heltec_v4_tft.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7789LCDDisplay @@ -356,8 +356,8 @@ build_flags = build_src_filter = ${heltec_v4_tft.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -366,7 +366,7 @@ lib_deps = extends = heltec_v4_tft build_flags = ${heltec_v4_tft.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=ST7789LCDDisplay -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -380,8 +380,8 @@ build_src_filter = ${heltec_v4_tft.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -390,7 +390,7 @@ lib_deps = extends = heltec_v4_tft build_flags = ${heltec_v4_tft.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -404,8 +404,8 @@ build_src_filter = ${heltec_v4_tft.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -425,7 +425,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} + - +<../examples/simple_sensor> + +<../apps/simple_sensor> lib_deps = ${heltec_v4_tft.lib_deps} ${esp32_ota.lib_deps} @@ -433,4 +433,4 @@ lib_deps = [env:heltec_v4_kiss_modem] extends = Heltec_lora32_v4 build_src_filter = ${Heltec_lora32_v4.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini index 48723d169a..e857f3f58c 100644 --- a/variants/heltec_wireless_paper/platformio.ini +++ b/variants/heltec_wireless_paper/platformio.ini @@ -47,7 +47,7 @@ lib_deps = extends = Heltec_Wireless_Paper_base build_flags = ${Heltec_Wireless_Paper_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -57,8 +57,8 @@ build_flags = build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -68,7 +68,7 @@ lib_deps = extends = Heltec_Wireless_Paper_base build_flags = ${Heltec_Wireless_Paper_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -76,8 +76,8 @@ build_flags = build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -95,7 +95,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} ${esp32_ota.lib_deps} @@ -120,7 +120,7 @@ lib_deps = ; build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} ; + ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${Heltec_Wireless_Paper_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -142,7 +142,7 @@ build_flags = build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} ${esp32_ota.lib_deps} @@ -160,7 +160,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} ${esp32_ota.lib_deps} @@ -169,4 +169,4 @@ lib_deps = [env:Heltec_Wireless_Paper_kiss_modem] extends = Heltec_Wireless_Paper_base build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/ikoka_handheld_nrf/platformio.ini b/variants/ikoka_handheld_nrf/platformio.ini index 51b602e403..cd036e4fb3 100644 --- a/variants/ikoka_handheld_nrf/platformio.ini +++ b/variants/ikoka_handheld_nrf/platformio.ini @@ -44,11 +44,11 @@ build_flags = ${ikoka_handheld_nrf.build_flags} -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 -D QSPIFLASH=1 - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new build_src_filter = ${ikoka_handheld_nrf.build_src_filter} + - +<../examples/companion_radio/ui-new/UITask.cpp> - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/UITask.cpp> + +<../apps/companion_radio/*.cpp> [env:ikoka_handheld_nrf_e22_30dbm_096_companion_radio_ble] extends = ikoka_handheld_nrf @@ -94,7 +94,7 @@ build_flags = ${ikoka_handheld_nrf.build_flags} -D MAX_NEIGHBOURS=50 -D LORA_TX_POWER=20 build_src_filter = ${ikoka_handheld_nrf.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [env:ikoka_handheld_nrf_e22_30dbm_room_server] extends = ikoka_handheld_nrf @@ -105,11 +105,11 @@ build_flags = ${ikoka_handheld_nrf.build_flags} -D ADMIN_PASSWORD='"password"' -D LORA_TX_POWER=20 build_src_filter = ${ikoka_handheld_nrf.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> [env:ikoka_handheld_nrf_kiss_modem] extends = ikoka_handheld_nrf build_flags = ${ikoka_handheld_nrf.build_flags} -D LORA_TX_POWER=20 build_src_filter = ${ikoka_handheld_nrf.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/ikoka_nano_nrf/platformio.ini b/variants/ikoka_nano_nrf/platformio.ini index e72f83ce0d..c9d96dc7ba 100644 --- a/variants/ikoka_nano_nrf/platformio.ini +++ b/variants/ikoka_nano_nrf/platformio.ini @@ -83,15 +83,15 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D QSPIFLASH=1 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_nano_nrf.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ikoka_nano_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -104,14 +104,14 @@ build_flags = ${ikoka_nano_nrf.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D QSPIFLASH=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_nano_nrf.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ikoka_nano_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -128,7 +128,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_nano_nrf.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [ikoka_nano_nrf_room_server] extends = ikoka_nano_nrf @@ -141,7 +141,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_nano_nrf.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> ;;; 22dBm EBYTE E22-900M22 variants [env:ikoka_nano_nrf_22dbm_companion_radio_usb] @@ -283,14 +283,14 @@ build_src_filter = [env:ikoka_nano_nrf_22dbm_kiss_modem] extends = ikoka_nano_nrf_e22_22dbm build_src_filter = ${ikoka_nano_nrf_e22_22dbm.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> [env:ikoka_nano_nrf_30dbm_kiss_modem] extends = ikoka_nano_nrf_e22_30dbm build_src_filter = ${ikoka_nano_nrf_e22_30dbm.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> [env:ikoka_nano_nrf_33dbm_kiss_modem] extends = ikoka_nano_nrf_e22_33dbm build_src_filter = ${ikoka_nano_nrf_e22_33dbm.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/ikoka_stick_nrf/platformio.ini b/variants/ikoka_stick_nrf/platformio.ini index 06e39e84c3..b8004b2f2b 100644 --- a/variants/ikoka_stick_nrf/platformio.ini +++ b/variants/ikoka_stick_nrf/platformio.ini @@ -88,15 +88,15 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D QSPIFLASH=1 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_stick_nrf.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ikoka_stick_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,14 +109,14 @@ build_flags = ${ikoka_stick_nrf.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D QSPIFLASH=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_stick_nrf.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ikoka_stick_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -134,7 +134,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_stick_nrf.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [ikoka_stick_nrf_room_server] extends = ikoka_stick_nrf @@ -147,7 +147,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_stick_nrf.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> ;;; hardware + firmware variants @@ -294,14 +294,14 @@ build_src_filter = [env:ikoka_stick_nrf_22dbm_kiss_modem] extends = ikoka_stick_nrf_e22_22dbm build_src_filter = ${ikoka_stick_nrf_e22_22dbm.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> [env:ikoka_stick_nrf_30dbm_kiss_modem] extends = ikoka_stick_nrf_e22_30dbm build_src_filter = ${ikoka_stick_nrf_e22_30dbm.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> [env:ikoka_stick_nrf_33dbm_kiss_modem] extends = ikoka_stick_nrf_e22_33dbm build_src_filter = ${ikoka_stick_nrf_e22_33dbm.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/keepteen_lt1/platformio.ini b/variants/keepteen_lt1/platformio.ini index 27cf809e08..1a1916c2e5 100644 --- a/variants/keepteen_lt1/platformio.ini +++ b/variants/keepteen_lt1/platformio.ini @@ -23,7 +23,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:KeepteenLT1_repeater] extends = KeepteenLT1 build_src_filter = ${KeepteenLT1.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> + + build_flags = @@ -42,7 +42,7 @@ lib_deps = ${KeepteenLT1.lib_deps} [env:KeepteenLT1_room_server] extends = KeepteenLT1 build_src_filter = ${KeepteenLT1.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> + + build_flags = ${KeepteenLT1.build_flags} @@ -62,7 +62,7 @@ extends = KeepteenLT1 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${KeepteenLT1.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -71,8 +71,8 @@ build_flags = ${KeepteenLT1.build_flags} build_src_filter = ${KeepteenLT1.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${KeepteenLT1.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -82,7 +82,7 @@ extends = KeepteenLT1 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${KeepteenLT1.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -95,8 +95,8 @@ build_src_filter = ${KeepteenLT1.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${KeepteenLT1.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -104,4 +104,4 @@ lib_deps = ${KeepteenLT1.lib_deps} [env:KeepteenLT1_kiss_modem] extends = KeepteenLT1 build_src_filter = ${KeepteenLT1.build_src_filter} - +<../examples/kiss_modem/> \ No newline at end of file + +<../apps/kiss_modem/> \ No newline at end of file diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini index 54990117cc..08de975bfd 100644 --- a/variants/lilygo_t3s3/platformio.ini +++ b/variants/lilygo_t3s3/platformio.ini @@ -48,7 +48,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -72,7 +72,7 @@ lib_deps = ; build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} ; + ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${LilyGo_T3S3_sx1262.lib_deps} ; ${esp32_ota.lib_deps} @@ -94,7 +94,7 @@ build_flags = build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -108,7 +108,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -127,7 +127,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -136,7 +136,7 @@ lib_deps = extends = LilyGo_T3S3_sx1262 build_flags = ${LilyGo_T3S3_sx1262.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -145,8 +145,8 @@ build_flags = build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -155,7 +155,7 @@ lib_deps = extends = LilyGo_T3S3_sx1262 build_flags = ${LilyGo_T3S3_sx1262.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -168,8 +168,8 @@ build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -177,4 +177,4 @@ lib_deps = [env:LilyGo_T3S3_sx1262_kiss_modem] extends = LilyGo_T3S3_sx1262 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini index e579e91ca3..290e9621b0 100644 --- a/variants/lilygo_t3s3_sx1276/platformio.ini +++ b/variants/lilygo_t3s3_sx1276/platformio.ini @@ -45,7 +45,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} ${esp32_ota.lib_deps} @@ -69,7 +69,7 @@ lib_deps = ; build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} ; + ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${LilyGo_T3S3_sx1276.lib_deps} ; ${esp32_ota.lib_deps} @@ -91,7 +91,7 @@ build_flags = build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} ${esp32_ota.lib_deps} @@ -105,7 +105,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -124,7 +124,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} ${esp32_ota.lib_deps} @@ -134,15 +134,15 @@ extends = LilyGo_T3S3_sx1276 upload_speed = 115200 build_flags = ${LilyGo_T3S3_sx1276.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -151,7 +151,7 @@ lib_deps = extends = LilyGo_T3S3_sx1276 build_flags = ${LilyGo_T3S3_sx1276.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -164,8 +164,8 @@ build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -173,4 +173,4 @@ lib_deps = [env:LilyGo_T3S3_sx1276_kiss_modem] extends = LilyGo_T3S3_sx1276 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_t_impulse_plus/platformio.ini b/variants/lilygo_t_impulse_plus/platformio.ini index 0ed5b9a42f..163bfb85be 100644 --- a/variants/lilygo_t_impulse_plus/platformio.ini +++ b/variants/lilygo_t_impulse_plus/platformio.ini @@ -31,7 +31,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:LilyGo_T_Impulse_Plus_repeater] extends = LilyGo_T_Impulse_Plus build_src_filter = ${LilyGo_T_Impulse_Plus.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${LilyGo_T_Impulse_Plus.build_flags} -D ADVERT_NAME='"T-Impulse-Plus Repeater"' @@ -49,7 +49,7 @@ extends = LilyGo_T_Impulse_Plus build_flags = ${LilyGo_T_Impulse_Plus.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -61,8 +61,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T_Impulse_Plus.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T_Impulse_Plus.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -70,4 +70,4 @@ lib_deps = [env:LilyGo_T_Impulse_Plus_kiss_modem] extends = LilyGo_T_Impulse_Plus build_src_filter = ${LilyGo_T_Impulse_Plus.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_tbeam_1w/platformio.ini b/variants/lilygo_tbeam_1w/platformio.ini index c7a595520e..ffd086055c 100644 --- a/variants/lilygo_tbeam_1w/platformio.ini +++ b/variants/lilygo_tbeam_1w/platformio.ini @@ -79,7 +79,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_TBeam_1W.lib_deps} ${esp32_ota.lib_deps} @@ -99,7 +99,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${LilyGo_TBeam_1W.lib_deps} ${esp32_ota.lib_deps} @@ -109,7 +109,7 @@ lib_deps = extends = LilyGo_TBeam_1W build_flags = ${LilyGo_TBeam_1W.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D PERSISTANT_GPS=1 @@ -117,8 +117,8 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_1W.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -128,7 +128,7 @@ lib_deps = extends = LilyGo_TBeam_1W build_flags = ${LilyGo_TBeam_1W.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -140,8 +140,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_1W.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -151,7 +151,7 @@ lib_deps = extends = LilyGo_TBeam_1W build_flags = ${LilyGo_TBeam_1W.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -164,8 +164,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_1W.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -188,7 +188,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_TBeam_1W.lib_deps} ${esp32_ota.lib_deps} @@ -196,4 +196,4 @@ lib_deps = [env:LilyGo_TBeam_1W_kiss_modem] extends = LilyGo_TBeam_1W build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini index 62ac09f875..824bd4a9b8 100644 --- a/variants/lilygo_tbeam_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_SX1262/platformio.ini @@ -45,7 +45,7 @@ extends = LilyGo_TBeam_SX1262 board_build.upload.maximum_ram_size=2000000 build_flags = ${LilyGo_TBeam_SX1262.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 @@ -59,8 +59,8 @@ build_flags = build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_SX1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -77,7 +77,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_TBeam_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -99,7 +99,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${LilyGo_TBeam_SX1262.lib_deps} ; ${esp32_ota.lib_deps} @@ -119,7 +119,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_TBeam_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -136,7 +136,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${LilyGo_TBeam_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -144,4 +144,4 @@ lib_deps = [env:Tbeam_SX1262_kiss_modem] extends = LilyGo_TBeam_SX1262 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_tbeam_SX1276/platformio.ini b/variants/lilygo_tbeam_SX1276/platformio.ini index cb25903ce9..03bf6d19ee 100644 --- a/variants/lilygo_tbeam_SX1276/platformio.ini +++ b/variants/lilygo_tbeam_SX1276/platformio.ini @@ -43,7 +43,7 @@ extends = LilyGo_TBeam_SX1276 board_build.upload.maximum_ram_size=2000000 build_flags = ${LilyGo_TBeam_SX1276.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 @@ -55,8 +55,8 @@ build_flags = build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_SX1276.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -74,7 +74,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_TBeam_SX1276.lib_deps} ${esp32_ota.lib_deps} @@ -97,7 +97,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${LilyGo_TBeam_SX1276.lib_deps} ; ${esp32_ota.lib_deps} @@ -118,7 +118,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_TBeam_SX1276.lib_deps} ${esp32_ota.lib_deps} @@ -134,7 +134,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${LilyGo_TBeam_SX1276.lib_deps} ${esp32_ota.lib_deps} @@ -142,4 +142,4 @@ lib_deps = [env:Tbeam_SX1276_kiss_modem] extends = LilyGo_TBeam_SX1276 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini index 0294615651..a4dfb814b9 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini @@ -57,7 +57,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -79,7 +79,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${T_Beam_S3_Supreme_SX1262.lib_deps} ; ${esp32_ota.lib_deps} @@ -99,7 +99,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -116,7 +116,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -125,7 +125,7 @@ lib_deps = extends = T_Beam_S3_Supreme_SX1262 build_flags = ${T_Beam_S3_Supreme_SX1262.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -136,8 +136,8 @@ build_flags = build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -146,7 +146,7 @@ lib_deps = extends = T_Beam_S3_Supreme_SX1262 build_flags = ${T_Beam_S3_Supreme_SX1262.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -160,8 +160,8 @@ build_flags = build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -169,4 +169,4 @@ lib_deps = [env:T_Beam_S3_Supreme_SX1262_kiss_modem] extends = T_Beam_S3_Supreme_SX1262 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_tdeck/platformio.ini b/variants/lilygo_tdeck/platformio.ini index 745d8ff53d..2ee2283a5b 100644 --- a/variants/lilygo_tdeck/platformio.ini +++ b/variants/lilygo_tdeck/platformio.ini @@ -67,15 +67,15 @@ lib_deps = extends = LilyGo_TDeck build_flags = ${LilyGo_TDeck.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${LilyGo_TDeck.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TDeck.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -84,7 +84,7 @@ lib_deps = extends = LilyGo_TDeck build_flags = ${LilyGo_TDeck.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -92,8 +92,8 @@ build_flags = build_src_filter = ${LilyGo_TDeck.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TDeck.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -108,7 +108,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${LilyGo_TDeck.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> + lib_deps = ${LilyGo_TDeck.lib_deps} @@ -117,4 +117,4 @@ lib_deps = [env:LilyGo_TDeck_kiss_modem] extends = LilyGo_TDeck build_src_filter = ${LilyGo_TDeck.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_techo/platformio.ini b/variants/lilygo_techo/platformio.ini index 5df77f95cb..2b9e37ee13 100644 --- a/variants/lilygo_techo/platformio.ini +++ b/variants/lilygo_techo/platformio.ini @@ -53,7 +53,7 @@ upload_protocol = nrfutil [env:LilyGo_T-Echo_repeater] extends = LilyGo_T-Echo build_src_filter = ${LilyGo_T-Echo.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${LilyGo_T-Echo.build_flags} -D ADVERT_NAME='"T-Echo Repeater"' @@ -67,7 +67,7 @@ build_flags = [env:LilyGo_T-Echo_room_server] extends = LilyGo_T-Echo build_src_filter = ${LilyGo_T-Echo.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${LilyGo_T-Echo.build_flags} -D ADVERT_NAME='"T-Echo Room"' @@ -84,7 +84,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D QSPIFLASH=1 @@ -99,8 +99,8 @@ build_flags = -D AUTO_SHUTDOWN_MILLIVOLTS=3300 build_src_filter = ${LilyGo_T-Echo.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T-Echo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -112,7 +112,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -121,8 +121,8 @@ build_flags = -D AUTO_SHUTDOWN_MILLIVOLTS=3300 -D QSPIFLASH=1 build_src_filter = ${LilyGo_T-Echo.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T-Echo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -130,4 +130,4 @@ lib_deps = [env:LilyGo_T-Echo_kiss_modem] extends = LilyGo_T-Echo build_src_filter = ${LilyGo_T-Echo.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_techo_card/platformio.ini b/variants/lilygo_techo_card/platformio.ini index 07bcebfe41..f92d950c02 100644 --- a/variants/lilygo_techo_card/platformio.ini +++ b/variants/lilygo_techo_card/platformio.ini @@ -38,7 +38,7 @@ upload_protocol = nrfutil [env:LilyGo_T-Echo_Card_repeater] extends = LilyGo_T-Echo_Card build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${LilyGo_T-Echo_Card.build_flags} -D ADVERT_NAME='"T-Echo Card Repeater"' @@ -52,7 +52,7 @@ build_flags = [env:LilyGo_T-Echo_Card_room_server] extends = LilyGo_T-Echo_Card build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${LilyGo_T-Echo_Card.build_flags} -D ADVERT_NAME='"T-Echo Card Room"' @@ -69,7 +69,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo_Card.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-tiny + -I apps/companion_radio/ui-tiny -D PIN_BUZZER=38 -D QSPIFLASH=1 -D MAX_CONTACTS=350 @@ -84,8 +84,8 @@ build_flags = -D AUTO_SHUTDOWN_MILLIVOLTS=3300 build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-tiny/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-tiny/*.cpp> + lib_deps = ${LilyGo_T-Echo_Card.lib_deps} @@ -99,7 +99,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo_Card.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-tiny + -I apps/companion_radio/ui-tiny -D PIN_BUZZER=38 -D QSPIFLASH=1 -D MAX_CONTACTS=350 @@ -111,8 +111,8 @@ build_flags = ; -D MESH_DEBUG=1 -D AUTO_SHUTDOWN_MILLIVOLTS=3300 build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-tiny/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-tiny/*.cpp> + lib_deps = ${LilyGo_T-Echo_Card.lib_deps} diff --git a/variants/lilygo_techo_lite/platformio.ini b/variants/lilygo_techo_lite/platformio.ini index a9b3d124d0..288c2388a2 100644 --- a/variants/lilygo_techo_lite/platformio.ini +++ b/variants/lilygo_techo_lite/platformio.ini @@ -48,7 +48,7 @@ upload_protocol = nrfutil [env:LilyGo_T-Echo-Lite_repeater] extends = LilyGo_T-Echo-Lite build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${LilyGo_T-Echo-Lite.build_flags} -D ADVERT_NAME='"T-Echo-Lite Repeater"' @@ -62,7 +62,7 @@ build_flags = [env:LilyGo_T-Echo-Lite_room_server] extends = LilyGo_T-Echo-Lite build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${LilyGo_T-Echo-Lite.build_flags} -D ADVERT_NAME='"T-Echo-Lite Room"' @@ -79,7 +79,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo-Lite.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D QSPIFLASH=1 @@ -93,8 +93,8 @@ build_flags = -D AUTO_SHUTDOWN_MILLIVOLTS=3300 build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T-Echo-Lite.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -111,7 +111,7 @@ build_flags = -I lib/nrf52/s140_nrf52_6.1.1_API/include -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52 -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D LILYGO_TECHO -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper @@ -139,7 +139,7 @@ build_src_filter = ${nrf52_base.build_src_filter} + +<../variants/lilygo_techo_lite> + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${LilyGo_T-Echo-Lite.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -156,7 +156,7 @@ build_flags = -I lib/nrf52/s140_nrf52_6.1.1_API/include -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52 -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D LILYGO_TECHO -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper @@ -182,7 +182,7 @@ build_src_filter = ${nrf52_base.build_src_filter} + + +<../variants/lilygo_techo_lite> - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${LilyGo_T-Echo-Lite.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -190,4 +190,4 @@ lib_deps = [env:LilyGo_T-Echo-Lite_kiss_modem] extends = LilyGo_T-Echo-Lite build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_teth_elite/platformio.ini b/variants/lilygo_teth_elite/platformio.ini index 97728f8b4c..577c655b6b 100644 --- a/variants/lilygo_teth_elite/platformio.ini +++ b/variants/lilygo_teth_elite/platformio.ini @@ -43,7 +43,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${LilyGo_TETH_Elite_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -60,7 +60,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${LilyGo_TETH_Elite_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -75,7 +75,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${LilyGo_TETH_Elite_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -93,7 +93,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter} + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${LilyGo_TETH_Elite_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini index 3acfa7615d..22d9b50ce8 100644 --- a/variants/lilygo_tlora_c6/platformio.ini +++ b/variants/lilygo_tlora_c6/platformio.ini @@ -34,7 +34,7 @@ build_src_filter = ${esp32c6_base.build_src_filter} [env:LilyGo_Tlora_C6_repeater_] extends = tlora_c6 build_src_filter = ${tlora_c6.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${tlora_c6.build_flags} -D ADVERT_NAME='"Tlora C6 Repeater"' @@ -51,7 +51,7 @@ lib_deps = [env:LilyGo_Tlora_C6_room_server_] extends = tlora_c6 build_src_filter = ${tlora_c6.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${tlora_c6.build_flags} -D ADVERT_NAME='"Tlora C6 Room"' @@ -80,7 +80,7 @@ build_flags = ${tlora_c6.build_flags} build_src_filter = ${tlora_c6.build_src_filter} + - - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${tlora_c6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -88,4 +88,4 @@ lib_deps = [env:LilyGo_Tlora_C6_kiss_modem] extends = tlora_c6 build_src_filter = ${tlora_c6.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini index 3673166861..6b25e2e34d 100644 --- a/variants/lilygo_tlora_v2_1/platformio.ini +++ b/variants/lilygo_tlora_v2_1/platformio.ini @@ -41,7 +41,7 @@ lib_deps = [env:LilyGo_TLora_V2_1_1_6_repeater] extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D ADVERT_NAME='"TLora-V2.1-1.6 Repeater"' @@ -65,7 +65,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -74,15 +74,15 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -91,7 +91,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 @@ -102,8 +102,8 @@ build_flags = build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -112,7 +112,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D ADVERT_NAME='"TLora-V2.1-1.6 Room"' @@ -130,7 +130,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D WIFI_SSID='"ssid"' @@ -140,8 +140,8 @@ build_flags = build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -153,7 +153,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D ADVERT_NAME='"RS232 Bridge"' @@ -176,7 +176,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -196,4 +196,4 @@ lib_deps = [env:LilyGo_TLora_V2_1_1_6_kiss_modem] extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/m5stack_unit_c6l/platformio.ini b/variants/m5stack_unit_c6l/platformio.ini index 94083eb486..1220920829 100644 --- a/variants/m5stack_unit_c6l/platformio.ini +++ b/variants/m5stack_unit_c6l/platformio.ini @@ -39,7 +39,7 @@ lib_deps = [env:M5Stack_Unit_C6L_repeater] extends = M5Stack_Unit_C6L build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${M5Stack_Unit_C6L.build_flags} -D ADVERT_NAME='"Unit C6L Repeater"' @@ -56,7 +56,7 @@ lib_deps = [env:M5Stack_Unit_C6L_room_server] extends = M5Stack_Unit_C6L build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${M5Stack_Unit_C6L.build_flags} -D ADVERT_NAME='"Unit C6L Room"' @@ -83,7 +83,7 @@ build_flags = ${M5Stack_Unit_C6L.build_flags} build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} + - - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${M5Stack_Unit_C6L.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -100,7 +100,7 @@ build_flags = ${M5Stack_Unit_C6L.build_flags} build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} + - - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${M5Stack_Unit_C6L.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,4 +109,4 @@ lib_deps = [env:M5Stack_Unit_C6L_kiss_modem] extends = M5Stack_Unit_C6L build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/mesh_pocket/platformio.ini b/variants/mesh_pocket/platformio.ini index 0d2a74adf5..b9b1cf27dc 100644 --- a/variants/mesh_pocket/platformio.ini +++ b/variants/mesh_pocket/platformio.ini @@ -37,7 +37,8 @@ upload_protocol = nrfutil [env:Mesh_pocket_repeater] extends = Mesh_pocket build_src_filter = ${Mesh_pocket.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> + build_flags = ${Mesh_pocket.build_flags} -D ADVERT_NAME='"Heltec_Mesh_Pocket Repeater"' @@ -51,7 +52,7 @@ build_flags = [env:Mesh_pocket_room_server] extends = Mesh_pocket build_src_filter = ${Mesh_pocket.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Mesh_pocket.build_flags} -D ADVERT_NAME='"Heltec_Mesh_Pocket Room"' @@ -68,7 +69,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Mesh_pocket.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -80,8 +81,8 @@ build_flags = build_src_filter = ${Mesh_pocket.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Mesh_pocket.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -92,7 +93,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Mesh_pocket.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D AUTO_OFF_MILLIS=0 @@ -102,8 +103,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Mesh_pocket.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Mesh_pocket.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -111,4 +112,4 @@ lib_deps = [env:Mesh_pocket_kiss_modem] extends = Mesh_pocket build_src_filter = ${Mesh_pocket.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini index f85be23885..85464f5301 100644 --- a/variants/meshadventurer/platformio.ini +++ b/variants/meshadventurer/platformio.ini @@ -38,7 +38,7 @@ lib_deps = [env:Meshadventurer_sx1262_repeater] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -59,7 +59,7 @@ lib_deps = ; extends = Meshadventurer ; build_src_filter = ${Meshadventurer.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; build_flags = ; ${Meshadventurer.build_flags} ; -D RADIO_CLASS=CustomSX1262 @@ -84,7 +84,7 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -106,7 +106,7 @@ lib_deps = [env:Meshadventurer_sx1268_repeater] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -127,7 +127,7 @@ lib_deps = ; extends = Meshadventurer ; build_src_filter = ${Meshadventurer.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; + ; build_flags = ; ${Meshadventurer.build_flags} @@ -153,7 +153,7 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -175,11 +175,11 @@ lib_deps = [env:Meshadventurer_sx1262_companion_radio_usb] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> build_flags = ${Meshadventurer.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 @@ -196,11 +196,11 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> build_flags = ${Meshadventurer.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 @@ -227,7 +227,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Meshadventurer.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -247,7 +247,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Meshadventurer.lib_deps} ${esp32_ota.lib_deps} @@ -255,11 +255,11 @@ lib_deps = [env:Meshadventurer_sx1268_companion_radio_usb] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> build_flags = ${Meshadventurer.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -276,11 +276,11 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> build_flags = ${Meshadventurer.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -307,7 +307,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Meshadventurer.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -327,7 +327,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${Meshadventurer.lib_deps} ${esp32_ota.lib_deps} @@ -335,7 +335,7 @@ lib_deps = [env:Meshadventurer_sx1262_kiss_modem] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper @@ -344,7 +344,7 @@ build_flags = ${Meshadventurer.build_flags} [env:Meshadventurer_sx1268_kiss_modem] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper diff --git a/variants/meshtiny/platformio.ini b/variants/meshtiny/platformio.ini index c5439c88f4..adb44c179b 100644 --- a/variants/meshtiny/platformio.ini +++ b/variants/meshtiny/platformio.ini @@ -29,7 +29,7 @@ lib_deps = extends = Meshtiny build_flags = ${Meshtiny.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MESHTINY -D PIN_BUZZER=30 -D DISPLAY_CLASS=SSD1306Display @@ -39,8 +39,8 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshtiny.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Meshtiny.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -49,7 +49,7 @@ lib_deps = extends = Meshtiny build_flags = ${Meshtiny.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MESHTINY -D PIN_BUZZER=30 -D DISPLAY_CLASS=SSD1306Display @@ -62,8 +62,8 @@ build_flags = ; -D BLE_DEBUG_LOGGING=1 build_src_filter = ${Meshtiny.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Meshtiny.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -71,4 +71,4 @@ lib_deps = [env:Meshtiny_kiss_modem] extends = Meshtiny build_src_filter = ${Meshtiny.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/minewsemi_me25ls01/platformio.ini b/variants/minewsemi_me25ls01/platformio.ini index 39d4252deb..2cbf25f41c 100644 --- a/variants/minewsemi_me25ls01/platformio.ini +++ b/variants/minewsemi_me25ls01/platformio.ini @@ -41,7 +41,7 @@ extends = me25ls01 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${me25ls01.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -56,8 +56,8 @@ build_flags = ${me25ls01.build_flags} ;-D PIN_BUZZER_EN=37 build_src_filter = ${me25ls01.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> [env:Minewsemi_me25ls01_repeater] extends = me25ls01 @@ -78,7 +78,7 @@ build_flags = ${me25ls01.build_flags} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:Minewsemi_me25ls01_room_server] extends = me25ls01 @@ -100,7 +100,7 @@ build_flags = ${me25ls01.build_flags} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:Minewsemi_me25ls01_terminal_chat] extends = me25ls01 @@ -122,14 +122,14 @@ build_flags = ${me25ls01.build_flags} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> [env:Minewsemi_me25ls01_companion_radio_usb] extends = me25ls01 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${me25ls01.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ;-D BLE_PIN_CODE=123456 @@ -142,10 +142,10 @@ build_flags = ${me25ls01.build_flags} -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> [env:Minewsemi_me25ls01_kiss_modem] extends = me25ls01 build_src_filter = ${me25ls01.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/muziworks_r1_neo/platformio.ini b/variants/muziworks_r1_neo/platformio.ini index 3dbecf1e84..3c81082b0f 100644 --- a/variants/muziworks_r1_neo/platformio.ini +++ b/variants/muziworks_r1_neo/platformio.ini @@ -41,7 +41,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:R1Neo_room_server] extends = R1Neo @@ -55,7 +55,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:R1Neo_companion_radio_usb] extends = R1Neo @@ -63,15 +63,15 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${R1Neo.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${R1Neo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -83,7 +83,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${R1Neo.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D ENV_INCLUDE_GPS=1 -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -95,8 +95,8 @@ build_flags = build_src_filter = ${R1Neo.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${R1Neo.lib_deps} ${rak4631.lib_deps} @@ -112,7 +112,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${R1Neo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -129,9 +129,9 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> [env:R1Neo_kiss_modem] extends = R1Neo build_src_filter = ${R1Neo.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini index 3cdc29ffb1..5ae1b33dee 100644 --- a/variants/nano_g2_ultra/platformio.ini +++ b/variants/nano_g2_ultra/platformio.ini @@ -38,7 +38,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Nano_G2_Ultra.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:Nano_G2_Ultra_room_server] extends = Nano_G2_Ultra @@ -54,7 +54,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Nano_G2_Ultra.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:Nano_G2_Ultra_companion_radio_ble] extends = Nano_G2_Ultra @@ -63,7 +63,7 @@ board_upload.maximum_size = 712704 build_flags = ${Nano_G2_Ultra.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -79,8 +79,8 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Nano_G2_Ultra.lib_deps} densaugeo/base64 @ ~1.4.0 end2endzone/NonBlockingRTTTL@^1.3.0 @@ -92,7 +92,7 @@ board_upload.maximum_size = 712704 build_flags = ${Nano_G2_Ultra.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D QSPIFLASH=1 @@ -105,8 +105,8 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Nano_G2_Ultra.lib_deps} densaugeo/base64 @ ~1.4.0 end2endzone/NonBlockingRTTTL@^1.3.0 @@ -114,4 +114,4 @@ lib_deps = ${Nano_G2_Ultra.lib_deps} [env:Nano_G2_Ultra_kiss_modem] extends = Nano_G2_Ultra build_src_filter = ${Nano_G2_Ultra.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/nibble_screen_connect/platformio.ini b/variants/nibble_screen_connect/platformio.ini index 6a2f3dec2a..f1da4c63f8 100644 --- a/variants/nibble_screen_connect/platformio.ini +++ b/variants/nibble_screen_connect/platformio.ini @@ -46,7 +46,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${nibble_screen_connect_base.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${nibble_screen_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -65,7 +65,7 @@ build_flags = build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${nibble_screen_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -77,7 +77,7 @@ build_flags = -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=1 build_src_filter = ${nibble_screen_connect_base.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -94,7 +94,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${nibble_screen_connect_base.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${nibble_screen_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -103,15 +103,15 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -120,7 +120,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -131,8 +131,8 @@ build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -141,7 +141,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -153,8 +153,8 @@ build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -163,4 +163,4 @@ lib_deps = [env:nibble_screen_connect_kiss_modem_] extends = nibble_screen_connect_base build_src_filter = ${nibble_screen_connect_base.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/nibble_zero_connect/platformio.ini b/variants/nibble_zero_connect/platformio.ini index 83495cd839..1ac9a9789a 100644 --- a/variants/nibble_zero_connect/platformio.ini +++ b/variants/nibble_zero_connect/platformio.ini @@ -43,7 +43,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${nibble_zero_connect_base.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${nibble_zero_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -62,7 +62,7 @@ build_flags = build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${nibble_zero_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -74,7 +74,7 @@ build_flags = -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=1 build_src_filter = ${nibble_zero_connect_base.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -91,7 +91,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${nibble_zero_connect_base.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${nibble_zero_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -100,15 +100,15 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -117,7 +117,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -128,8 +128,8 @@ build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -138,7 +138,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -149,8 +149,8 @@ build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index 5415e15861..4b9f2104c5 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -38,7 +38,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:ProMicro_repeater] extends = Promicro build_src_filter = ${Promicro.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> + + build_flags = @@ -57,7 +57,7 @@ lib_deps = ${Promicro.lib_deps} [env:ProMicro_repeater_bridge_rs232_serial1] extends = Promicro build_src_filter = ${Promicro.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> + + + @@ -82,7 +82,7 @@ lib_deps = ${Promicro.lib_deps} [env:ProMicro_room_server] extends = Promicro build_src_filter = ${Promicro.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> + + build_flags = ${Promicro.build_flags} @@ -105,7 +105,7 @@ build_flags = ${Promicro.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Promicro.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Promicro.lib_deps} densaugeo/base64 @ ~1.4.0 adafruit/RTClib @ ^2.1.3 @@ -115,7 +115,7 @@ extends = Promicro board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Promicro.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -124,8 +124,8 @@ build_flags = ${Promicro.build_flags} build_src_filter = ${Promicro.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Promicro.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -135,7 +135,7 @@ extends = Promicro board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Promicro.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -148,8 +148,8 @@ build_src_filter = ${Promicro.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Promicro.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -168,11 +168,11 @@ build_flags = build_src_filter = ${Promicro.build_src_filter} + + - +<../examples/simple_sensor> + +<../apps/simple_sensor> lib_deps = ${Promicro.lib_deps} [env:ProMicro_kiss_modem] extends = Promicro build_src_filter = ${Promicro.build_src_filter} - +<../examples/kiss_modem/> \ No newline at end of file + +<../apps/kiss_modem/> \ No newline at end of file diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini index ab820cf6a2..3926a21fa7 100644 --- a/variants/rak11310/platformio.ini +++ b/variants/rak11310/platformio.ini @@ -47,7 +47,7 @@ build_flags = ${rak11310.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:RAK_11310_repeater_bridge_rs232] extends = rak11310 @@ -65,7 +65,7 @@ build_flags = ${rak11310.build_flags} ; -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:RAK_11310_room_server] extends = rak11310 @@ -78,7 +78,7 @@ build_flags = ${rak11310.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:RAK_11310_companion_radio_usb] extends = rak11310 @@ -88,7 +88,7 @@ build_flags = ${rak11310.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${rak11310.lib_deps} densaugeo/base64 @ ~1.4.0 lib_ignore = BLE @@ -103,7 +103,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rak11310.build_src_filter} -; +<../examples/companion_radio/*.cpp> +; +<../apps/companion_radio/*.cpp> ; lib_deps = ${rak11310.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -118,7 +118,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rak11310.build_src_filter} -; +<../examples/companion_radio/*.cpp> +; +<../apps/companion_radio/*.cpp> ; lib_deps = ${rak11310.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -130,11 +130,11 @@ build_flags = ${rak11310.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${rak11310.lib_deps} densaugeo/base64 @ ~1.4.0 [env:RAK_11310_kiss_modem] extends = rak11310 build_src_filter = ${rak11310.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/rak3112/platformio.ini b/variants/rak3112/platformio.ini index 9cd32c4b4d..6f27dc8115 100644 --- a/variants/rak3112/platformio.ini +++ b/variants/rak3112/platformio.ini @@ -50,7 +50,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -73,7 +73,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -93,7 +93,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -110,7 +110,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -124,7 +124,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -133,14 +133,14 @@ lib_deps = extends = rak3112 build_flags = ${rak3112.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -149,7 +149,7 @@ lib_deps = extends = rak3112 build_flags = ${rak3112.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 ; dynamic, random PIN @@ -160,8 +160,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -170,7 +170,7 @@ lib_deps = extends = rak3112 build_flags = ${rak3112.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 @@ -181,8 +181,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -200,7 +200,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -208,4 +208,4 @@ lib_deps = [env:RAK_3112_kiss_modem] extends = rak3112 build_src_filter = ${rak3112.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/rak3401/platformio.ini b/variants/rak3401/platformio.ini index 20a8a548b9..e310b523be 100644 --- a/variants/rak3401/platformio.ini +++ b/variants/rak3401/platformio.ini @@ -38,7 +38,7 @@ build_flags = ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:RAK_3401_room_server] extends = rak3401 @@ -54,7 +54,7 @@ build_flags = ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:RAK_3401_companion_radio_usb] extends = rak3401 @@ -62,7 +62,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak3401.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 @@ -70,8 +70,8 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${rak3401.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -82,7 +82,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak3401.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 @@ -94,8 +94,8 @@ build_flags = ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${rak3401.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,7 +109,7 @@ build_flags = ;-D MESH_PACKET_LOGGING=1 ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${rak3401.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -127,9 +127,9 @@ build_flags = ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} + - +<../examples/simple_sensor> + +<../apps/simple_sensor> [env:RAK_3401_kiss_modem] extends = rak3401 build_src_filter = ${rak3401.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/rak3x72/platformio.ini b/variants/rak3x72/platformio.ini index f966786087..cd9900d13e 100644 --- a/variants/rak3x72/platformio.ini +++ b/variants/rak3x72/platformio.ini @@ -21,7 +21,7 @@ build_flags = ${rak3x72.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${rak3x72.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [env:RAK_3x72_sensor] extends = rak3x72 @@ -29,7 +29,7 @@ build_flags = ${rak3x72.build_flags} -D ADVERT_NAME='"RAK3x72 Sensor"' -D ADMIN_PASSWORD='"password"' build_src_filter = ${rak3x72.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> [env:RAK_3x72_companion_radio_usb] extends = rak3x72 @@ -38,11 +38,11 @@ build_flags = ${rak3x72.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 build_src_filter = ${rak3x72.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${rak3x72.lib_deps} densaugeo/base64 @ ~1.4.0 [env:RAK_3x72_kiss_modem] extends = rak3x72 build_src_filter = ${rak3x72.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini index 31b507b4c2..f22a3a0452 100644 --- a/variants/rak4631/platformio.ini +++ b/variants/rak4631/platformio.ini @@ -51,7 +51,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:RAK_4631_repeater_ethernet] extends = rak4631 @@ -67,7 +67,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${rak4631.lib_deps} https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip @@ -93,7 +93,7 @@ build_flags = build_src_filter = ${rak4631.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:RAK_4631_repeater_bridge_rs232_serial2] extends = rak4631 @@ -116,7 +116,7 @@ build_flags = build_src_filter = ${rak4631.build_src_filter} + + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:RAK_4631_room_server] extends = rak4631 @@ -132,7 +132,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:RAK_4631_room_server_ethernet] extends = rak4631 @@ -148,7 +148,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${rak4631.lib_deps} https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip @@ -159,7 +159,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak4631.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D PIN_USER_BTN=9 -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display @@ -168,8 +168,8 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${rak4631.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -183,7 +183,7 @@ build_unflags = -D EXTRAFS=1 build_flags = ${rak4631.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D PIN_USER_BTN=9 -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display @@ -194,8 +194,8 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; -D ETHERNET_DEBUG_LOGGING=1 build_src_filter = ${rak4631.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + lib_deps = ${rak4631.lib_deps} @@ -209,7 +209,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak4631.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D PIN_USER_BTN=9 -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display @@ -222,8 +222,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${rak4631.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -239,7 +239,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${rak4631.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -257,13 +257,13 @@ build_flags = -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../examples/simple_sensor> + +<../apps/simple_sensor> [env:RAK_4631_kiss_modem] extends = rak4631 build_flags = ${rak4631.build_flags} build_src_filter = ${rak4631.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> lib_deps = ${rak4631.lib_deps} diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini index e9cddb74dd..45f09adf33 100644 --- a/variants/rak_wismesh_tag/platformio.ini +++ b/variants/rak_wismesh_tag/platformio.ini @@ -46,7 +46,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak_wismesh_tag.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:RAK_WisMesh_Tag_room_server] extends = rak_wismesh_tag @@ -60,7 +60,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak_wismesh_tag.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:RAK_WisMesh_Tag_companion_radio_usb] extends = rak_wismesh_tag @@ -68,15 +68,15 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak_wismesh_tag.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak_wismesh_tag.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${rak_wismesh_tag.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -88,7 +88,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak_wismesh_tag.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -100,8 +100,8 @@ build_flags = build_src_filter = ${rak_wismesh_tag.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${rak_wismesh_tag.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -118,9 +118,9 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak_wismesh_tag.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> [env:RAK_WisMesh_Tag_kiss_modem] extends = rak_wismesh_tag build_src_filter = ${rak_wismesh_tag.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini index 66c7b9f890..9327bc1f1a 100644 --- a/variants/rpi_picow/platformio.ini +++ b/variants/rpi_picow/platformio.ini @@ -38,7 +38,7 @@ build_flags = ${rpi_picow.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:PicoW_room_server] extends = rpi_picow @@ -51,7 +51,7 @@ build_flags = ${rpi_picow.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:PicoW_companion_radio_usb] extends = rpi_picow @@ -61,7 +61,7 @@ build_flags = ${rpi_picow.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${rpi_picow.lib_deps} densaugeo/base64 @ ~1.4.0 lib_ignore = BLE @@ -76,7 +76,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rpi_picow.build_src_filter} -; +<../examples/companion_radio/*.cpp> +; +<../apps/companion_radio/*.cpp> ; lib_deps = ${rpi_picow.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -91,7 +91,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rpi_picow.build_src_filter} -; +<../examples/companion_radio/*.cpp> +; +<../apps/companion_radio/*.cpp> ; lib_deps = ${rpi_picow.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -103,11 +103,11 @@ build_flags = ${rpi_picow.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${rpi_picow.lib_deps} densaugeo/base64 @ ~1.4.0 [env:PicoW_kiss_modem] extends = rpi_picow build_src_filter = ${rpi_picow.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/sensecap_indicator-espnow/platformio.ini b/variants/sensecap_indicator-espnow/platformio.ini index e643d03398..650f084fa1 100644 --- a/variants/sensecap_indicator-espnow/platformio.ini +++ b/variants/sensecap_indicator-espnow/platformio.ini @@ -36,15 +36,15 @@ lib_deps=${esp32_base.lib_deps} extends =SenseCapIndicator-ESPNow build_flags = ${SenseCapIndicator-ESPNow.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D ESPNOW_DEBUG_LOGGING=1 build_src_filter = ${SenseCapIndicator-ESPNow.build_src_filter} - +<../examples/companion_radio/ui-new/*.cpp> - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${SenseCapIndicator-ESPNow.lib_deps} densaugeo/base64 @ ~1.4.0 \ No newline at end of file diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini index effef38ccd..d217418cb0 100644 --- a/variants/sensecap_solar/platformio.ini +++ b/variants/sensecap_solar/platformio.ini @@ -49,7 +49,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${SenseCap_Solar.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [env:SenseCap_Solar_room_server] extends = SenseCap_Solar @@ -62,7 +62,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${SenseCap_Solar.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> [env:SenseCap_Solar_companion_radio_ble] extends = SenseCap_Solar @@ -79,7 +79,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${SenseCap_Solar.build_src_filter} + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${SenseCap_Solar.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -96,7 +96,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${SenseCap_Solar.build_src_filter} + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${SenseCap_Solar.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini index 6432b52386..410b76542e 100644 --- a/variants/station_g2/platformio.ini +++ b/variants/station_g2/platformio.ini @@ -54,7 +54,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -76,7 +76,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Station_G2.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${Station_G2.lib_deps} ; ${esp32_ota.lib_deps} @@ -96,7 +96,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -115,7 +115,7 @@ build_flags = ; https://wiki.uniteng.com/en/meshtastic/station-g2#impact-of-lora-node-dense-areashigh-noise-environments-on-rf-performance ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -138,7 +138,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Station_G2.build_src_filter} ; + -; +<../examples/simple_repeater> +; +<../apps/simple_repeater> ; lib_deps = ; ${Station_G2.lib_deps} ; ${esp32_ota.lib_deps} @@ -159,7 +159,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -167,7 +167,7 @@ lib_deps = [env:Station_G2_room_server] extends = Station_G2 build_src_filter = ${Station_G2.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Station_G2.build_flags} -D ADVERT_NAME='"Station G2 Room"' @@ -185,15 +185,15 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -202,7 +202,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -212,8 +212,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -222,7 +222,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 @@ -233,8 +233,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -242,4 +242,4 @@ lib_deps = [env:Station_G2_kiss_modem] extends = Station_G2 build_src_filter = ${Station_G2.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/station_g3_esp32/platformio.ini b/variants/station_g3_esp32/platformio.ini index b29388ef7e..547af7b302 100644 --- a/variants/station_g3_esp32/platformio.ini +++ b/variants/station_g3_esp32/platformio.ini @@ -57,7 +57,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Station_G3_ESP32.lib_deps} ${esp32_ota.lib_deps} @@ -74,7 +74,7 @@ build_flags = -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${Station_G3_ESP32.lib_deps} ${esp32_ota.lib_deps} @@ -82,7 +82,7 @@ lib_deps = [env:Station_G3_ESP32_room_server] extends = Station_G3_ESP32 build_src_filter = ${Station_G3_ESP32.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Station_G3_ESP32.build_flags} -D ADVERT_NAME='"Station G3 ESP32 Room"' @@ -100,15 +100,15 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G3_ESP32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -117,7 +117,7 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -127,8 +127,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G3_ESP32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -137,7 +137,7 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 @@ -148,8 +148,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G3_ESP32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -157,4 +157,4 @@ lib_deps = [env:Station_G3_ESP32_kiss_modem] extends = Station_G3_ESP32 build_src_filter = ${Station_G3_ESP32.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/t1000-e/platformio.ini b/variants/t1000-e/platformio.ini index 43a3d93f61..08a1811ed0 100644 --- a/variants/t1000-e/platformio.ini +++ b/variants/t1000-e/platformio.ini @@ -38,7 +38,7 @@ upload_protocol = nrfutil [env:t1000e_repeater] extends = t1000-e build_flags = ${t1000-e.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D ADVERT_NAME='"t1000-e Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -47,14 +47,14 @@ build_flags = ${t1000-e.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${t1000-e.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${t1000-e.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 [env:t1000e_room_server] extends = t1000-e build_flags = ${t1000-e.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D ADVERT_NAME='"t1000-e Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -64,7 +64,7 @@ build_flags = ${t1000-e.build_flags} ; -D MESH_DEBUG=1 -D RF_SWITCH_TABLE build_src_filter = ${t1000-e.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${t1000-e.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 @@ -73,7 +73,7 @@ extends = t1000-e board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${t1000-e.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -84,8 +84,8 @@ build_flags = ${t1000-e.build_flags} -D PIN_BUZZER_EN=37 ; P1/5 - required for T1000-E build_src_filter = ${t1000-e.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${t1000-e.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -96,7 +96,7 @@ extends = t1000-e board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${t1000-e.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -112,8 +112,8 @@ build_flags = ${t1000-e.build_flags} build_src_filter = ${t1000-e.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${t1000-e.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -122,6 +122,6 @@ lib_deps = ${t1000-e.lib_deps} [env:t1000e_kiss_modem] extends = t1000-e build_src_filter = ${t1000-e.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> lib_deps = ${t1000-e.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 diff --git a/variants/tenstar_c3/platformio.ini b/variants/tenstar_c3/platformio.ini index e798882366..cba0ae0395 100644 --- a/variants/tenstar_c3/platformio.ini +++ b/variants/tenstar_c3/platformio.ini @@ -26,7 +26,7 @@ build_src_filter = ${esp32_base.build_src_filter} [env:Tenstar_C3_sx1262_repeater] extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -48,7 +48,7 @@ lib_deps = ; extends = Tenstar_esp32_C3 ; build_src_filter = ${Tenstar_esp32_C3.build_src_filter} ; + -; +<../examples/simple_repeater/*.cpp> +; +<../apps/simple_repeater/*.cpp> ; build_flags = ; ${Tenstar_esp32_C3.build_flags} ; -D RADIO_CLASS=CustomSX1262 @@ -74,7 +74,7 @@ lib_deps = extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -97,7 +97,7 @@ lib_deps = [env:Tenstar_C3_sx1268_repeater] extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -118,7 +118,7 @@ lib_deps = ; extends = Tenstar_esp32_C3 ; build_src_filter = ${Tenstar_esp32_C3.build_src_filter} ; + -; +<../examples/simple_repeater/*.cpp> +; +<../apps/simple_repeater/*.cpp> ; build_flags = ; ${Tenstar_esp32_C3.build_flags} ; -D RADIO_CLASS=CustomSX1268 @@ -143,7 +143,7 @@ lib_deps = extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -165,7 +165,7 @@ lib_deps = [env:Tenstar_C3_sx1262_kiss_modem] extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -175,7 +175,7 @@ build_flags = [env:Tenstar_C3_sx1268_kiss_modem] extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1268 diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini index 617f92405c..6dd0749a06 100644 --- a/variants/thinknode_m1/platformio.ini +++ b/variants/thinknode_m1/platformio.ini @@ -46,7 +46,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> lib_deps = ${ThinkNode_M1.lib_deps} @@ -62,7 +62,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> lib_deps = ${ThinkNode_M1.lib_deps} @@ -73,7 +73,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M1.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -92,8 +92,8 @@ build_src_filter = ${ThinkNode_M1.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -108,7 +108,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M1.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_ROTATION=4 @@ -121,8 +121,8 @@ build_src_filter = ${ThinkNode_M1.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -133,4 +133,4 @@ lib_deps = [env:ThinkNode_M1_kiss_modem] extends = ThinkNode_M1 build_src_filter = ${ThinkNode_M1.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini index aae83324e3..30decbf9a1 100644 --- a/variants/thinknode_m2/platformio.ini +++ b/variants/thinknode_m2/platformio.ini @@ -42,7 +42,7 @@ lib_deps = ${esp32_base.lib_deps} [env:ThinkNode_M2_Repeater] extends = ThinkNode_M2 build_src_filter = ${ThinkNode_M2.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${ThinkNode_M2.build_flags} -D ADVERT_NAME='"Thinknode M2 Repeater"' @@ -60,7 +60,7 @@ lib_deps = ; extends = ThinkNode_M2 ; build_src_filter = ${ThinkNode_M2.build_src_filter} ; + -; +<../examples/simple_repeater/*.cpp> +; +<../apps/simple_repeater/*.cpp> ; build_flags = ; ${ThinkNode_M2.build_flags} ; -D ADVERT_NAME='"RS232 Bridge"' @@ -81,7 +81,7 @@ lib_deps = extends = ThinkNode_M2 build_src_filter = ${ThinkNode_M2.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${ThinkNode_M2.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -100,7 +100,7 @@ lib_deps = [env:ThinkNode_M2_room_server] extends = ThinkNode_M2 build_src_filter = ${ThinkNode_M2.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${ThinkNode_M2.build_flags} -D ADVERT_NAME='"Thinknode M2 Room Server"' @@ -123,7 +123,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M2.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -132,7 +132,7 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -144,8 +144,8 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -155,7 +155,7 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -163,8 +163,8 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -174,7 +174,7 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -185,8 +185,8 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -196,7 +196,7 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D SERIAL_TX=43 @@ -207,8 +207,8 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -219,4 +219,4 @@ extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} -UPIN_BUZZER build_src_filter = ${ThinkNode_M2.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/thinknode_m3/platformio.ini b/variants/thinknode_m3/platformio.ini index 0a3d4eda92..b55f793f67 100644 --- a/variants/thinknode_m3/platformio.ini +++ b/variants/thinknode_m3/platformio.ini @@ -40,7 +40,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:ThinkNode_M3_repeater] extends = ThinkNode_M3 build_flags = ${ThinkNode_M3.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D ADVERT_NAME='"ThinkNode_M3 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -49,14 +49,14 @@ build_flags = ${ThinkNode_M3.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M3.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> lib_deps = ${ThinkNode_M3.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 [env:ThinkNode_M3_room_server] extends = ThinkNode_M3 build_flags = ${ThinkNode_M3.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D ADVERT_NAME='"ThinkNode_M3 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -66,7 +66,7 @@ build_flags = ${ThinkNode_M3.build_flags} ; -D MESH_DEBUG=1 -D RF_SWITCH_TABLE build_src_filter = ${ThinkNode_M3.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> lib_deps = ${ThinkNode_M3.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 @@ -75,7 +75,7 @@ extends = ThinkNode_M3 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${ThinkNode_M3.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -86,8 +86,8 @@ build_flags = ${ThinkNode_M3.build_flags} -D PIN_BUZZER_EN=36 build_src_filter = ${ThinkNode_M3.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M3.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -98,7 +98,7 @@ extends = ThinkNode_M3 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${ThinkNode_M3.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -113,8 +113,8 @@ build_flags = ${ThinkNode_M3.build_flags} build_src_filter = ${ThinkNode_M3.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M3.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -123,6 +123,6 @@ lib_deps = ${ThinkNode_M3.lib_deps} [env:ThinkNode_M3_kiss_modem] extends = ThinkNode_M3 build_src_filter = ${ThinkNode_M3.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> lib_deps = ${ThinkNode_M3.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini index 8572d1ebe0..6c180980fc 100644 --- a/variants/thinknode_m5/platformio.ini +++ b/variants/thinknode_m5/platformio.ini @@ -55,7 +55,7 @@ lib_deps = ${esp32_base.lib_deps} [env:ThinkNode_M5_Repeater] extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${ThinkNode_M5.build_flags} -D ADVERT_NAME='"Thinknode M5 Repeater"' @@ -73,7 +73,7 @@ lib_deps = ; extends = ThinkNode_M5 ; build_src_filter = ${ThinkNode_M5.build_src_filter} ; + -; +<../examples/simple_repeater/*.cpp> +; +<../apps/simple_repeater/*.cpp> ; build_flags = ; ${ThinkNode_M5.build_flags} ; -D ADVERT_NAME='"RS232 Bridge"' @@ -94,7 +94,7 @@ lib_deps = extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${ThinkNode_M5.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -113,7 +113,7 @@ lib_deps = [env:ThinkNode_M5_room_server] extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${ThinkNode_M5.build_flags} -D ADVERT_NAME='"Thinknode M5 Room Server"' @@ -136,7 +136,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M5.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${ThinkNode_M5.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -145,7 +145,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -157,8 +157,8 @@ build_flags = build_src_filter = ${ThinkNode_M5.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -169,15 +169,15 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${ThinkNode_M5.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -188,7 +188,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -198,8 +198,8 @@ build_flags = build_src_filter = ${ThinkNode_M5.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -210,7 +210,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D SERIAL_TX=D6 @@ -220,8 +220,8 @@ build_flags = build_src_filter = ${ThinkNode_M5.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -231,4 +231,4 @@ lib_deps = [env:ThinkNode_M5_kiss_modem] extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini index 187a8819f6..b72c2a55e4 100644 --- a/variants/thinknode_m6/platformio.ini +++ b/variants/thinknode_m6/platformio.ini @@ -51,7 +51,7 @@ build_flags = ; -D MESH_DEBUG=1 ; -D GPS_NMEA_DEBUG=1 build_src_filter = ${ThinkNode_M6.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> lib_deps = ${ThinkNode_M6.lib_deps} @@ -67,7 +67,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M6.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> lib_deps = ${ThinkNode_M6.lib_deps} @@ -78,7 +78,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M6.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -91,7 +91,7 @@ build_flags = build_src_filter = ${ThinkNode_M6.build_src_filter} + + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${ThinkNode_M6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -104,7 +104,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M6.build_flags} -I src/helpers/ui - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D QSPIFLASH=1 @@ -113,7 +113,7 @@ build_flags = build_src_filter = ${ThinkNode_M6.build_src_filter} + + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${ThinkNode_M6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -122,4 +122,4 @@ lib_deps = [env:ThinkNode_M6_kiss_modem] extends = ThinkNode_M6 build_src_filter = ${ThinkNode_M6.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/thinknode_m7/platformio.ini b/variants/thinknode_m7/platformio.ini index af5d8ea01c..723e7c719d 100644 --- a/variants/thinknode_m7/platformio.ini +++ b/variants/thinknode_m7/platformio.ini @@ -37,7 +37,7 @@ lib_deps = ${esp32_base.lib_deps} [env:ThinkNode_M7_repeater] extends = ThinkNode_M7 build_src_filter = ${ThinkNode_M7.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${ThinkNode_M7.build_flags} -D ADVERT_NAME='"ThinkNode M7 Repeater"' @@ -54,7 +54,7 @@ lib_deps = [env:ThinkNode_M7_room_server] extends = ThinkNode_M7 build_src_filter = ${ThinkNode_M7.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${ThinkNode_M7.build_flags} -D ADVERT_NAME='"ThinkNode M7 Room Server"' @@ -72,7 +72,7 @@ lib_deps = extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -83,8 +83,8 @@ build_flags = build_src_filter = ${ThinkNode_M7.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M7.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -93,15 +93,15 @@ lib_deps = extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${ThinkNode_M7.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M7.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -110,7 +110,7 @@ lib_deps = extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=NullDisplayDriver @@ -122,8 +122,8 @@ build_flags = build_src_filter = ${ThinkNode_M7.build_src_filter} + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M7.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -131,4 +131,4 @@ lib_deps = [env:ThinkNode_M7_kiss_modem] extends = ThinkNode_M7 build_src_filter = ${ThinkNode_M7.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/thinknode_m9/platformio.ini b/variants/thinknode_m9/platformio.ini index a7171726a8..cf51e02a3c 100755 --- a/variants/thinknode_m9/platformio.ini +++ b/variants/thinknode_m9/platformio.ini @@ -68,7 +68,7 @@ build_flags = ;-D MESH_PACKET_LOGGING=1 ;-D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M9.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> lib_deps = ${ThinkNode_M9.lib_deps} ${esp32_ota.lib_deps} @@ -76,7 +76,7 @@ lib_deps = [env:ThinkNode_M9_room_server_] extends = ThinkNode_M9 build_src_filter = ${ThinkNode_M9.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${ThinkNode_M9.build_flags} -D ADVERT_NAME='"ThinkNode M9 Room Server"' @@ -94,7 +94,7 @@ lib_deps = extends = ThinkNode_M9 build_flags = ${ThinkNode_M9.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -105,8 +105,8 @@ build_src_filter = ${ThinkNode_M9.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M9.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -116,7 +116,7 @@ lib_deps = extends = ThinkNode_M9 build_flags = ${ThinkNode_M9.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -124,8 +124,8 @@ build_src_filter = ${ThinkNode_M9.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M9.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -135,7 +135,7 @@ lib_deps = extends = ThinkNode_M9 build_flags = ${ThinkNode_M9.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 @@ -147,8 +147,8 @@ build_src_filter = ${ThinkNode_M9.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M9.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -157,4 +157,4 @@ lib_deps = [env:ThinkNode_M9_kiss_modem] extends = ThinkNode_M9 build_src_filter = ${ThinkNode_M9.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/tiny_relay/platformio.ini b/variants/tiny_relay/platformio.ini index 82cb251fdb..3d03d21191 100644 --- a/variants/tiny_relay/platformio.ini +++ b/variants/tiny_relay/platformio.ini @@ -24,7 +24,7 @@ build_flags = ${Tiny_Relay.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${Tiny_Relay.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:Tiny_Relay_sensor] extends = Tiny_Relay @@ -35,7 +35,7 @@ build_flags = ${Tiny_Relay.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${Tiny_Relay.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> [env:Tiny_Relay_companion_radio_usb] extends = Tiny_Relay @@ -45,11 +45,11 @@ build_flags = ${Tiny_Relay.build_flags} -D MAX_GROUP_CHANNELS=8 -D MAX_LORA_TX_POWER=22 build_src_filter = ${Tiny_Relay.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Tiny_Relay.lib_deps} densaugeo/base64 @ ~1.4.0 [env:Tiny_Relay_kiss_modem] extends = Tiny_Relay build_src_filter = ${Tiny_Relay.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/waveshare_rp2040_lora/platformio.ini b/variants/waveshare_rp2040_lora/platformio.ini index 7dfe14012d..431222fa95 100644 --- a/variants/waveshare_rp2040_lora/platformio.ini +++ b/variants/waveshare_rp2040_lora/platformio.ini @@ -46,7 +46,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:waveshare_rp2040_lora_repeater_bridge_rs232] extends = waveshare_rp2040_lora @@ -64,7 +64,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} + - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:waveshare_rp2040_lora_room_server] extends = waveshare_rp2040_lora @@ -77,7 +77,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:waveshare_rp2040_lora_companion_radio_usb] extends = waveshare_rp2040_lora @@ -87,7 +87,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${waveshare_rp2040_lora.lib_deps} densaugeo/base64 @ ~1.4.0 lib_ignore = BLE @@ -102,7 +102,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} -; +<../examples/companion_radio/*.cpp> +; +<../apps/companion_radio/*.cpp> ; lib_deps = ${waveshare_rp2040_lora.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -117,7 +117,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} -; +<../examples/companion_radio/*.cpp> +; +<../apps/companion_radio/*.cpp> ; lib_deps = ${waveshare_rp2040_lora.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -129,11 +129,11 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${waveshare_rp2040_lora.lib_deps} densaugeo/base64 @ ~1.4.0 [env:waveshare_rp2040_lora_kiss_modem] extends = waveshare_rp2040_lora build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/wio-e5-dev/platformio.ini b/variants/wio-e5-dev/platformio.ini index 22bdc3c837..9d79011abb 100644 --- a/variants/wio-e5-dev/platformio.ini +++ b/variants/wio-e5-dev/platformio.ini @@ -23,7 +23,7 @@ build_flags = ${lora_e5.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${lora_e5.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [env:wio-e5-repeater_bridge_rs232] extends = lora_e5 @@ -38,7 +38,7 @@ build_flags = ${lora_e5.build_flags} -D WITH_RS232_BRIDGE_TX=PA2 build_src_filter = ${lora_e5.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [env:wio-e5_companion_radio_usb] extends = lora_e5 @@ -47,11 +47,11 @@ build_flags = ${lora_e5.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 build_src_filter = ${lora_e5.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${lora_e5.lib_deps} densaugeo/base64 @ ~1.4.0 [env:wio-e5_kiss_modem] extends = lora_e5 build_src_filter = ${lora_e5.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/wio-e5-mini/platformio.ini b/variants/wio-e5-mini/platformio.ini index 82f01331bb..34c01ae344 100644 --- a/variants/wio-e5-mini/platformio.ini +++ b/variants/wio-e5-mini/platformio.ini @@ -25,7 +25,7 @@ build_flags = ${lora_e5_mini.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${lora_e5_mini.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [env:wio-e5-mini_sensor] extends = lora_e5_mini @@ -34,23 +34,23 @@ build_flags = ${lora_e5_mini.build_flags} -D ADVERT_NAME='"wio-e5-mini Sensor"' -D ADMIN_PASSWORD='"password"' build_src_filter = ${lora_e5_mini.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> [env:wio-e5-mini_companion_radio_usb] extends = lora_e5_mini build_flags = ${lora_e5_mini.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D LORA_TX_POWER=22 -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${lora_e5_mini.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${lora_e5_mini.lib_deps} densaugeo/base64 @ ~1.4.0 [env:wio-e5-mini_kiss_modem] extends = lora_e5_mini build_src_filter = ${lora_e5_mini.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini index 2c74baded3..f7101027af 100644 --- a/variants/wio-tracker-l1-eink/platformio.ini +++ b/variants/wio-tracker-l1-eink/platformio.ini @@ -43,7 +43,7 @@ extends = WioTrackerL1Eink board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1Eink.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -61,8 +61,8 @@ build_src_filter = ${WioTrackerL1Eink.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${WioTrackerL1Eink.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -72,4 +72,4 @@ debug_tool=stlink [env:WioTrackerL1Eink_kiss_modem] extends = WioTrackerL1Eink build_src_filter = ${WioTrackerL1Eink.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini index 7bb175bb9a..ed20261769 100644 --- a/variants/wio-tracker-l1/platformio.ini +++ b/variants/wio-tracker-l1/platformio.ini @@ -29,7 +29,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:WioTrackerL1_repeater] extends = WioTrackerL1 build_src_filter = ${WioTrackerL1.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> build_flags = ${WioTrackerL1.build_flags} -D ADVERT_NAME='"WioTrackerL1 Repeater"' @@ -44,7 +44,7 @@ lib_deps = ${WioTrackerL1.lib_deps} [env:WioTrackerL1_room_server] extends = WioTrackerL1 build_src_filter = ${WioTrackerL1.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${WioTrackerL1.build_flags} -D ADVERT_NAME='"WioTrackerL1 Room"' -D ADMIN_PASSWORD='"password"' @@ -60,7 +60,7 @@ extends = WioTrackerL1 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SH1106Display @@ -72,8 +72,8 @@ build_flags = ${WioTrackerL1.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${WioTrackerL1.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> + + lib_deps = ${WioTrackerL1.lib_deps} @@ -86,7 +86,7 @@ extends = WioTrackerL1 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -105,8 +105,8 @@ build_src_filter = ${WioTrackerL1.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${WioTrackerL1.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -115,4 +115,4 @@ lib_deps = ${WioTrackerL1.lib_deps} [env:WioTrackerL1_kiss_modem] extends = WioTrackerL1 build_src_filter = ${WioTrackerL1.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/wio_wm1110/platformio.ini b/variants/wio_wm1110/platformio.ini index a7eac916b0..c8202d3d3c 100644 --- a/variants/wio_wm1110/platformio.ini +++ b/variants/wio_wm1110/platformio.ini @@ -48,7 +48,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${wio_wm1110.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [env:wio_wm1110_room_server] extends = wio_wm1110 @@ -62,7 +62,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${wio_wm1110.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> [env:wio_wm1110_companion_radio_ble] extends = wio_wm1110 @@ -80,12 +80,12 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${wio_wm1110.build_src_filter} + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${wio_wm1110.lib_deps} densaugeo/base64 @ ~1.4.0 - -[env:wio_wm1110_kiss_modem] -extends = wio_wm1110 -build_src_filter = ${wio_wm1110.build_src_filter} - +<../examples/kiss_modem/> + +[env:wio_wm1110_kiss_modem] +extends = wio_wm1110 +build_src_filter = ${wio_wm1110.build_src_filter} + +<../apps/kiss_modem/> diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini index c0e8458d0e..5a5cdfb505 100644 --- a/variants/xiao_c3/platformio.ini +++ b/variants/xiao_c3/platformio.ini @@ -30,7 +30,7 @@ lib_deps = [env:Xiao_C3_repeater] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Xiao_esp32_C3.build_flags} ${sensor_base.build_flags} @@ -52,7 +52,7 @@ lib_deps = [env:Xiao_C3_room_server] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> build_flags = ${Xiao_esp32_C3.build_flags} ${sensor_base.build_flags} @@ -74,7 +74,7 @@ lib_deps = [env:Xiao_C3_companion_radio_ble] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> + build_flags = ${Xiao_esp32_C3.build_flags} @@ -93,7 +93,7 @@ lib_deps = [env:Xiao_C3_companion_radio_usb] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> + build_flags = ${Xiao_esp32_C3.build_flags} @@ -111,7 +111,7 @@ lib_deps = [env:Xiao_C3_companion_radio_wifi] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> + build_flags = ${Xiao_esp32_C3.build_flags} @@ -132,4 +132,4 @@ lib_deps = [env:Xiao_C3_kiss_modem] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini index 0d8c2a79d3..1154b7689e 100644 --- a/variants/xiao_c6/platformio.ini +++ b/variants/xiao_c6/platformio.ini @@ -35,7 +35,7 @@ build_src_filter = ${esp32c6_base.build_src_filter} [env:Xiao_C6_repeater_] extends = Xiao_C6 build_src_filter = ${Xiao_C6.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Xiao_C6.build_flags} -D ADVERT_NAME='"Xiao C6 Repeater"' @@ -64,7 +64,7 @@ build_flags = ${Xiao_C6.build_flags} build_src_filter = ${Xiao_C6.build_src_filter} + - - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Xiao_C6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -95,7 +95,7 @@ build_flags = [env:Meshimi_repeater_] extends = Meshimi build_src_filter = ${Meshimi.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Meshimi.build_flags} -D ADVERT_NAME='"Meshimi Repeater"' @@ -119,7 +119,7 @@ build_flags = ${Meshimi.build_flags} build_src_filter = ${Meshimi.build_src_filter} + - - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Meshimi.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -152,7 +152,7 @@ build_flags = [env:WHY2025_badge_repeater_] extends = WHY2025_badge build_src_filter = ${WHY2025_badge.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${WHY2025_badge.build_flags} -D ADVERT_NAME='"WHY2025 Badge Repeater"' @@ -181,7 +181,7 @@ build_flags = ${WHY2025_badge.build_flags} build_src_filter = ${WHY2025_badge.build_src_filter} + - - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${WHY2025_badge.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -189,4 +189,4 @@ lib_deps = [env:Xiao_C6_kiss_modem] extends = Xiao_C6 build_src_filter = ${Xiao_C6.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini index a085433688..da3628026f 100644 --- a/variants/xiao_nrf52/platformio.ini +++ b/variants/xiao_nrf52/platformio.ini @@ -46,7 +46,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${Xiao_nrf52.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -57,8 +57,8 @@ build_flags = -D QSPIFLASH=1 build_src_filter = ${Xiao_nrf52.build_src_filter} + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${Xiao_nrf52.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -69,7 +69,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${Xiao_nrf52.build_flags} - -I examples/companion_radio/ui-orig + -I apps/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -77,8 +77,8 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-orig/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-orig/*.cpp> lib_deps = ${Xiao_nrf52.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -95,7 +95,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> [env:Xiao_nrf52_room_server] extends = Xiao_nrf52 @@ -108,13 +108,13 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} - +<../examples/simple_room_server/*.cpp> + +<../apps/simple_room_server/*.cpp> [env:Xiao_nrf52_kiss_modem] extends = Xiao_nrf52 build_flags = ${Xiao_nrf52.build_flags} build_src_filter = ${Xiao_nrf52.build_src_filter} - +<../examples/kiss_modem/*.cpp> + +<../apps/kiss_modem/*.cpp> lib_deps = ${Xiao_nrf52.lib_deps} diff --git a/variants/xiao_rp2040/platformio.ini b/variants/xiao_rp2040/platformio.ini index ca00e38b57..4a1c435254 100644 --- a/variants/xiao_rp2040/platformio.ini +++ b/variants/xiao_rp2040/platformio.ini @@ -41,7 +41,7 @@ build_flags = ${Xiao_rp2040.build_flags} -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../examples/simple_repeater> + +<../apps/simple_repeater> [env:Xiao_rp2040_room_server] extends = Xiao_rp2040 @@ -54,7 +54,7 @@ build_flags = ${Xiao_rp2040.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> [env:Xiao_rp2040_companion_radio_usb] extends = Xiao_rp2040 @@ -64,7 +64,7 @@ build_flags = ${Xiao_rp2040.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> lib_deps = ${Xiao_rp2040.lib_deps} densaugeo/base64 @ ~1.4.0 lib_ignore = BLE @@ -79,7 +79,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Xiao_rp2040.build_src_filter} -; +<../examples/companion_radio/*.cpp> +; +<../apps/companion_radio/*.cpp> ; lib_deps = ${Xiao_rp2040.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -94,7 +94,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Xiao_rp2040.build_src_filter} -; +<../examples/companion_radio/*.cpp> +; +<../apps/companion_radio/*.cpp> ; lib_deps = ${Xiao_rp2040.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -106,11 +106,11 @@ build_flags = ${Xiao_rp2040.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Xiao_rp2040.lib_deps} densaugeo/base64 @ ~1.4.0 [env:Xiao_rp2040_kiss_modem] extends = Xiao_rp2040 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/xiao_s3/platformio.ini b/variants/xiao_s3/platformio.ini index 22464e7d80..10455159a9 100644 --- a/variants/xiao_s3/platformio.ini +++ b/variants/xiao_s3/platformio.ini @@ -39,7 +39,7 @@ lib_deps = [env:Xiao_S3_repeater] extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Xiao_S3.build_flags} -D ADVERT_NAME='"Xiao S3 Repeater"' @@ -57,7 +57,7 @@ lib_deps = extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Xiao_S3.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -76,7 +76,7 @@ lib_deps = [env:Xiao_S3_room_server] extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Xiao_S3.build_flags} -D ADVERT_NAME='"Xiao S3 Room"' @@ -94,7 +94,7 @@ lib_deps = extends = Xiao_S3 build_flags = ${Xiao_S3.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -107,8 +107,8 @@ build_src_filter = ${Xiao_S3.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -118,7 +118,7 @@ lib_deps = extends = Xiao_S3 build_flags = ${Xiao_S3.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -130,8 +130,8 @@ build_src_filter = ${Xiao_S3.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -140,7 +140,7 @@ lib_deps = [env:Xiao_S3_sensor] extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> build_flags = ${Xiao_S3.build_flags} -D ADVERT_NAME='"Xiao S3 Sensor"' @@ -156,4 +156,4 @@ lib_deps = [env:Xiao_S3_kiss_modem] extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini index db8c5a9486..389a811c26 100644 --- a/variants/xiao_s3_wio/platformio.ini +++ b/variants/xiao_s3_wio/platformio.ini @@ -39,7 +39,7 @@ lib_deps = [env:Xiao_S3_WIO_repeater] extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Xiao_S3_WIO.build_flags} -D ADVERT_NAME='"XiaoS3 Repeater"' @@ -57,7 +57,7 @@ lib_deps = ; extends = Xiao_S3_WIO ; build_src_filter = ${Xiao_S3_WIO.build_src_filter} ; + -; +<../examples/simple_repeater/*.cpp> +; +<../apps/simple_repeater/*.cpp> ; build_flags = ; ${Xiao_S3_WIO.build_flags} ; -D ADVERT_NAME='"RS232 Bridge"' @@ -80,7 +80,7 @@ lib_deps = extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} + - +<../examples/simple_repeater/*.cpp> + +<../apps/simple_repeater/*.cpp> build_flags = ${Xiao_S3_WIO.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -99,7 +99,7 @@ lib_deps = [env:Xiao_S3_WIO_room_server] extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../examples/simple_room_server> + +<../apps/simple_room_server> build_flags = ${Xiao_S3_WIO.build_flags} -D ADVERT_NAME='"XiaoS3 Room"' @@ -122,7 +122,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> + +<../apps/simple_secure_chat/main.cpp> lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -131,7 +131,7 @@ lib_deps = extends = Xiao_S3_WIO build_flags = ${Xiao_S3_WIO.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -142,8 +142,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -153,7 +153,7 @@ lib_deps = extends = Xiao_S3_WIO build_flags = ${Xiao_S3_WIO.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -166,8 +166,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -177,7 +177,7 @@ lib_deps = extends = Xiao_S3_WIO build_flags = ${Xiao_S3_WIO.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -189,8 +189,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> - +<../examples/companion_radio/ui-new/*.cpp> + +<../apps/companion_radio/*.cpp> + +<../apps/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -202,10 +202,10 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + + - +<../examples/companion_radio/*.cpp> + +<../apps/companion_radio/*.cpp> build_flags = ${Xiao_S3_WIO.build_flags} - -I examples/companion_radio/ui-new + -I apps/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -222,7 +222,7 @@ lib_deps = [env:Xiao_S3_WIO_sensor] extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../examples/simple_sensor> + +<../apps/simple_sensor> build_flags = ${Xiao_S3_WIO.build_flags} -D ADVERT_NAME='"XiaoS3 sensor"' @@ -238,4 +238,4 @@ lib_deps = [env:Xiao_S3_WIO_kiss_modem] extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../examples/kiss_modem/> + +<../apps/kiss_modem/> From 7406b663d6c40c74449d552c81c9a81c94fcd4eb Mon Sep 17 00:00:00 2001 From: Dan Theisen Date: Wed, 15 Jul 2026 23:54:01 -0700 Subject: [PATCH 2/2] rename `apps/` directory to `firmware/` --- .github/workflows/pr-build-check.yml | 4 +- CONTRIBUTING.md | 2 +- README.md | 12 ++-- build_as_lib.py | 6 +- docs/companion_protocol.md | 2 +- .../companion_radio/AbstractUITask.h | 0 .../companion_radio/DataStore.cpp | 0 .../companion_radio/DataStore.h | 0 {apps => firmware}/companion_radio/MyMesh.cpp | 0 {apps => firmware}/companion_radio/MyMesh.h | 0 .../companion_radio/NodePrefs.h | 0 {apps => firmware}/companion_radio/main.cpp | 0 .../companion_radio/ui-new/UITask.cpp | 0 .../companion_radio/ui-new/UITask.h | 0 .../companion_radio/ui-new/icons.h | 0 .../companion_radio/ui-orig/Button.cpp | 0 .../companion_radio/ui-orig/Button.h | 0 .../companion_radio/ui-orig/UITask.cpp | 0 .../companion_radio/ui-orig/UITask.h | 0 .../ui-tiny/ScrollingStatusBar.h | 0 .../companion_radio/ui-tiny/UITask.cpp | 0 .../companion_radio/ui-tiny/UITask.h | 0 .../companion_radio/ui-tiny/u8g2_icons.h | 0 {apps => firmware}/kiss_modem/KissModem.cpp | 0 {apps => firmware}/kiss_modem/KissModem.h | 0 {apps => firmware}/kiss_modem/main.cpp | 0 {apps => firmware}/simple_repeater/MyMesh.cpp | 0 {apps => firmware}/simple_repeater/MyMesh.h | 0 .../simple_repeater/RateLimiter.h | 0 {apps => firmware}/simple_repeater/UITask.cpp | 0 {apps => firmware}/simple_repeater/UITask.h | 0 {apps => firmware}/simple_repeater/main.cpp | 0 .../simple_room_server/MyMesh.cpp | 0 .../simple_room_server/MyMesh.h | 0 .../simple_room_server/UITask.cpp | 0 .../simple_room_server/UITask.h | 0 .../simple_room_server/main.cpp | 0 .../simple_secure_chat/main.cpp | 0 .../simple_sensor/SensorMesh.cpp | 0 {apps => firmware}/simple_sensor/SensorMesh.h | 0 .../simple_sensor/TimeSeriesData.cpp | 0 .../simple_sensor/TimeSeriesData.h | 0 {apps => firmware}/simple_sensor/UITask.cpp | 0 {apps => firmware}/simple_sensor/UITask.h | 0 {apps => firmware}/simple_sensor/main.cpp | 0 variants/ebyte_eora_s3/platformio.ini | 20 +++---- variants/gat562_30s_mesh_kit/platformio.ini | 18 +++--- variants/gat562_mesh_evb_pro/platformio.ini | 6 +- .../gat562_mesh_tracker_pro/platformio.ini | 18 +++--- variants/gat562_mesh_watch13/platformio.ini | 12 ++-- variants/generic-e22/platformio.ini | 14 ++--- variants/generic_espnow/platformio.ini | 8 +-- variants/heltec_ct62/platformio.ini | 14 ++--- variants/heltec_e213/platformio.ini | 22 +++---- variants/heltec_e290/platformio.ini | 22 +++---- variants/heltec_mesh_solar/platformio.ini | 10 ++-- variants/heltec_t096/platformio.ini | 22 +++---- variants/heltec_t1/platformio.ini | 18 +++--- variants/heltec_t114/platformio.ini | 38 ++++++------ variants/heltec_t190/platformio.ini | 22 +++---- variants/heltec_tower_v2/platformio.ini | 18 +++--- variants/heltec_tracker/platformio.ini | 22 +++---- variants/heltec_tracker_v2/platformio.ini | 30 +++++----- variants/heltec_v2/platformio.ini | 30 +++++----- variants/heltec_v3/platformio.ini | 48 +++++++-------- variants/heltec_v4/platformio.ini | 60 +++++++++---------- variants/heltec_wireless_paper/platformio.ini | 22 +++---- variants/ikoka_handheld_nrf/platformio.ini | 12 ++-- variants/ikoka_nano_nrf/platformio.ini | 22 +++---- variants/ikoka_stick_nrf/platformio.ini | 22 +++---- variants/keepteen_lt1/platformio.ini | 18 +++--- variants/lilygo_t3s3/platformio.ini | 24 ++++---- variants/lilygo_t3s3_sx1276/platformio.ini | 24 ++++---- variants/lilygo_t_impulse_plus/platformio.ini | 10 ++-- variants/lilygo_tbeam_1w/platformio.ini | 26 ++++---- variants/lilygo_tbeam_SX1262/platformio.ini | 16 ++--- variants/lilygo_tbeam_SX1276/platformio.ini | 16 ++--- .../platformio.ini | 22 +++---- variants/lilygo_tdeck/platformio.ini | 16 ++--- variants/lilygo_techo/platformio.ini | 18 +++--- variants/lilygo_techo_card/platformio.ini | 16 ++--- variants/lilygo_techo_lite/platformio.ini | 20 +++---- variants/lilygo_teth_elite/platformio.ini | 8 +-- variants/lilygo_tlora_c6/platformio.ini | 8 +-- variants/lilygo_tlora_v2_1/platformio.ini | 30 +++++----- variants/m5stack_unit_c6l/platformio.ini | 10 ++-- variants/mesh_pocket/platformio.ini | 18 +++--- variants/meshadventurer/platformio.ini | 48 +++++++-------- variants/meshtiny/platformio.ini | 14 ++--- variants/minewsemi_me25ls01/platformio.ini | 20 +++---- variants/muziworks_r1_neo/platformio.ini | 22 +++---- variants/nano_g2_ultra/platformio.ini | 18 +++--- variants/nibble_screen_connect/platformio.ini | 28 ++++----- variants/nibble_zero_connect/platformio.ini | 26 ++++---- variants/promicro/platformio.ini | 24 ++++---- variants/rak11310/platformio.ini | 16 ++--- variants/rak3112/platformio.ini | 32 +++++----- variants/rak3401/platformio.ini | 22 +++---- variants/rak3x72/platformio.ini | 8 +-- variants/rak4631/platformio.ini | 36 +++++------ variants/rak_wismesh_tag/platformio.ini | 20 +++---- variants/rpi_picow/platformio.ini | 14 ++--- .../sensecap_indicator-espnow/platformio.ini | 6 +- variants/sensecap_solar/platformio.ini | 8 +-- variants/station_g2/platformio.ini | 34 +++++------ variants/station_g3_esp32/platformio.ini | 26 ++++---- variants/t1000-e/platformio.ini | 22 +++---- variants/tenstar_c3/platformio.ini | 16 ++--- variants/thinknode_m1/platformio.ini | 18 +++--- variants/thinknode_m2/platformio.ini | 36 +++++------ variants/thinknode_m3/platformio.ini | 22 +++---- variants/thinknode_m5/platformio.ini | 36 +++++------ variants/thinknode_m6/platformio.ini | 14 ++--- variants/thinknode_m7/platformio.ini | 24 ++++---- variants/thinknode_m9/platformio.ini | 24 ++++---- variants/tiny_relay/platformio.ini | 8 +-- variants/waveshare_rp2040_lora/platformio.ini | 16 ++--- variants/wio-e5-dev/platformio.ini | 8 +-- variants/wio-e5-mini/platformio.ini | 12 ++-- variants/wio-tracker-l1-eink/platformio.ini | 8 +-- variants/wio-tracker-l1/platformio.ini | 18 +++--- variants/wio_wm1110/platformio.ini | 8 +-- variants/xiao_c3/platformio.ini | 12 ++-- variants/xiao_c6/platformio.ini | 14 ++--- variants/xiao_nrf52/platformio.ini | 18 +++--- variants/xiao_rp2040/platformio.ini | 14 ++--- variants/xiao_s3/platformio.ini | 22 +++---- variants/xiao_s3_wio/platformio.ini | 36 +++++------ 128 files changed, 852 insertions(+), 852 deletions(-) rename {apps => firmware}/companion_radio/AbstractUITask.h (100%) rename {apps => firmware}/companion_radio/DataStore.cpp (100%) rename {apps => firmware}/companion_radio/DataStore.h (100%) rename {apps => firmware}/companion_radio/MyMesh.cpp (100%) rename {apps => firmware}/companion_radio/MyMesh.h (100%) rename {apps => firmware}/companion_radio/NodePrefs.h (100%) rename {apps => firmware}/companion_radio/main.cpp (100%) rename {apps => firmware}/companion_radio/ui-new/UITask.cpp (100%) rename {apps => firmware}/companion_radio/ui-new/UITask.h (100%) rename {apps => firmware}/companion_radio/ui-new/icons.h (100%) rename {apps => firmware}/companion_radio/ui-orig/Button.cpp (100%) rename {apps => firmware}/companion_radio/ui-orig/Button.h (100%) rename {apps => firmware}/companion_radio/ui-orig/UITask.cpp (100%) rename {apps => firmware}/companion_radio/ui-orig/UITask.h (100%) rename {apps => firmware}/companion_radio/ui-tiny/ScrollingStatusBar.h (100%) rename {apps => firmware}/companion_radio/ui-tiny/UITask.cpp (100%) rename {apps => firmware}/companion_radio/ui-tiny/UITask.h (100%) rename {apps => firmware}/companion_radio/ui-tiny/u8g2_icons.h (100%) rename {apps => firmware}/kiss_modem/KissModem.cpp (100%) rename {apps => firmware}/kiss_modem/KissModem.h (100%) rename {apps => firmware}/kiss_modem/main.cpp (100%) rename {apps => firmware}/simple_repeater/MyMesh.cpp (100%) rename {apps => firmware}/simple_repeater/MyMesh.h (100%) rename {apps => firmware}/simple_repeater/RateLimiter.h (100%) rename {apps => firmware}/simple_repeater/UITask.cpp (100%) rename {apps => firmware}/simple_repeater/UITask.h (100%) rename {apps => firmware}/simple_repeater/main.cpp (100%) rename {apps => firmware}/simple_room_server/MyMesh.cpp (100%) rename {apps => firmware}/simple_room_server/MyMesh.h (100%) rename {apps => firmware}/simple_room_server/UITask.cpp (100%) rename {apps => firmware}/simple_room_server/UITask.h (100%) rename {apps => firmware}/simple_room_server/main.cpp (100%) rename {apps => firmware}/simple_secure_chat/main.cpp (100%) rename {apps => firmware}/simple_sensor/SensorMesh.cpp (100%) rename {apps => firmware}/simple_sensor/SensorMesh.h (100%) rename {apps => firmware}/simple_sensor/TimeSeriesData.cpp (100%) rename {apps => firmware}/simple_sensor/TimeSeriesData.h (100%) rename {apps => firmware}/simple_sensor/UITask.cpp (100%) rename {apps => firmware}/simple_sensor/UITask.h (100%) rename {apps => firmware}/simple_sensor/main.cpp (100%) diff --git a/.github/workflows/pr-build-check.yml b/.github/workflows/pr-build-check.yml index c3cf8c9b72..1454fe1c92 100644 --- a/.github/workflows/pr-build-check.yml +++ b/.github/workflows/pr-build-check.yml @@ -5,7 +5,7 @@ on: branches: [main, dev] paths: - 'src/**' - - 'apps/**' + - 'firmware/**' - 'variants/**' - 'platformio.ini' - '.github/workflows/pr-build-check.yml' @@ -13,7 +13,7 @@ on: branches: [main, dev] paths: - 'src/**' - - 'apps/**' + - 'firmware/**' - 'variants/**' - 'platformio.ini' - '.github/workflows/pr-build-check.yml' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2de804c828..0c751d7620 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,7 +38,7 @@ Thanks for considering contributing to this project! - Bad: `update` - Reference any related issue (`Fixes #123`, `Closes #89`, etc.) - If you change public API, update README.md and library.properties -- New features should include an example sketch in `apps/` +- New features should include an example sketch in `firmware/` ## Coding Style diff --git a/README.md b/README.md index 5349d0be28..055c4794dd 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,12 @@ For developers: - Install [PlatformIO](https://docs.platformio.org) in [Visual Studio Code](https://code.visualstudio.com). - Clone and open the MeshCore repository in Visual Studio Code. - See the example applications you can modify and run: - - [Companion Radio](./apps/companion_radio) - For use with an external chat app, over BLE, USB or Wi-Fi. - - [KISS Modem](./apps/kiss_modem) - Serial KISS protocol bridge for host applications. ([protocol docs](./docs/kiss_modem_protocol.md)) - - [Simple Repeater](./apps/simple_repeater) - Extends network coverage by relaying messages. - - [Simple Room Server](./apps/simple_room_server) - A simple BBS server for shared Posts. - - [Simple Secure Chat](./apps/simple_secure_chat) - Secure terminal based text communication between devices. - - [Simple Sensor](./apps/simple_sensor) - Remote sensor node with telemetry and alerting. + - [Companion Radio](./firmware/companion_radio) - For use with an external chat app, over BLE, USB or Wi-Fi. + - [KISS Modem](./firmware/kiss_modem) - Serial KISS protocol bridge for host applications. ([protocol docs](./docs/kiss_modem_protocol.md)) + - [Simple Repeater](./firmware/simple_repeater) - Extends network coverage by relaying messages. + - [Simple Room Server](./firmware/simple_room_server) - A simple BBS server for shared Posts. + - [Simple Secure Chat](./firmware/simple_secure_chat) - Secure terminal based text communication between devices. + - [Simple Sensor](./firmware/simple_sensor) - Remote sensor node with telemetry and alerting. The Simple Secure Chat example can be interacted with through the Serial Monitor in Visual Studio Code, or with a Serial USB Terminal on Android. diff --git a/build_as_lib.py b/build_as_lib.py index 091a593019..ffac56a34f 100644 --- a/build_as_lib.py +++ b/build_as_lib.py @@ -41,7 +41,7 @@ # INCLUDE EXAMPLE CODE IN BUILD (to provide your own support files without touching the tree) elif isinstance(item, tuple) and item[0] == "BUILD_EXAMPLE": example_name = item[1] - src_filter.append(f"+<../apps/{example_name}/*.cpp>") + src_filter.append(f"+<../firmware/{example_name}/*.cpp>") # EXCLUDE A SOURCE FILE FROM AN EXAMPLE (must be placed after example name or boom) elif isinstance(item, tuple) and item[0] == "EXCLUDE_FROM_EXAMPLE": @@ -49,7 +49,7 @@ if example_name is None: print("***** PLEASE DEFINE EXAMPLE FIRST *****") break - src_filter.append(f"-<../apps/{example_name}/{exclude_name}>") + src_filter.append(f"-<../firmware/{example_name}/{exclude_name}>") # DEAL WITH UI VARIANT FOR AN EXAMPLE elif isinstance(item, tuple) and item[0] == "MC_UI_FLAVOR": @@ -57,7 +57,7 @@ if example_name is None: print("***** PLEASE DEFINE EXAMPLE FIRST *****") break - src_filter.append(f"+<../apps/{example_name}/{ui_flavor}/*.cpp>") + src_filter.append(f"+<../firmware/{example_name}/{ui_flavor}/*.cpp>") menv.Replace(SRC_FILTER=src_filter) diff --git a/docs/companion_protocol.md b/docs/companion_protocol.md index 731d599fbd..d688e887d4 100644 --- a/docs/companion_protocol.md +++ b/docs/companion_protocol.md @@ -807,7 +807,7 @@ Bytes 1-6: ACK Code (6 bytes, hex) ### Error Codes -`PACKET_ERROR` (0x01) carries a single-byte error code in byte 1. Values match the `ERR_CODE_*` constants defined in `apps/companion_radio/MyMesh.cpp`: +`PACKET_ERROR` (0x01) carries a single-byte error code in byte 1. Values match the `ERR_CODE_*` constants defined in `firmware/companion_radio/MyMesh.cpp`: | Code | Constant (firmware) | Description | |------|----------------------------|------------------------------------------------------------------------------| diff --git a/apps/companion_radio/AbstractUITask.h b/firmware/companion_radio/AbstractUITask.h similarity index 100% rename from apps/companion_radio/AbstractUITask.h rename to firmware/companion_radio/AbstractUITask.h diff --git a/apps/companion_radio/DataStore.cpp b/firmware/companion_radio/DataStore.cpp similarity index 100% rename from apps/companion_radio/DataStore.cpp rename to firmware/companion_radio/DataStore.cpp diff --git a/apps/companion_radio/DataStore.h b/firmware/companion_radio/DataStore.h similarity index 100% rename from apps/companion_radio/DataStore.h rename to firmware/companion_radio/DataStore.h diff --git a/apps/companion_radio/MyMesh.cpp b/firmware/companion_radio/MyMesh.cpp similarity index 100% rename from apps/companion_radio/MyMesh.cpp rename to firmware/companion_radio/MyMesh.cpp diff --git a/apps/companion_radio/MyMesh.h b/firmware/companion_radio/MyMesh.h similarity index 100% rename from apps/companion_radio/MyMesh.h rename to firmware/companion_radio/MyMesh.h diff --git a/apps/companion_radio/NodePrefs.h b/firmware/companion_radio/NodePrefs.h similarity index 100% rename from apps/companion_radio/NodePrefs.h rename to firmware/companion_radio/NodePrefs.h diff --git a/apps/companion_radio/main.cpp b/firmware/companion_radio/main.cpp similarity index 100% rename from apps/companion_radio/main.cpp rename to firmware/companion_radio/main.cpp diff --git a/apps/companion_radio/ui-new/UITask.cpp b/firmware/companion_radio/ui-new/UITask.cpp similarity index 100% rename from apps/companion_radio/ui-new/UITask.cpp rename to firmware/companion_radio/ui-new/UITask.cpp diff --git a/apps/companion_radio/ui-new/UITask.h b/firmware/companion_radio/ui-new/UITask.h similarity index 100% rename from apps/companion_radio/ui-new/UITask.h rename to firmware/companion_radio/ui-new/UITask.h diff --git a/apps/companion_radio/ui-new/icons.h b/firmware/companion_radio/ui-new/icons.h similarity index 100% rename from apps/companion_radio/ui-new/icons.h rename to firmware/companion_radio/ui-new/icons.h diff --git a/apps/companion_radio/ui-orig/Button.cpp b/firmware/companion_radio/ui-orig/Button.cpp similarity index 100% rename from apps/companion_radio/ui-orig/Button.cpp rename to firmware/companion_radio/ui-orig/Button.cpp diff --git a/apps/companion_radio/ui-orig/Button.h b/firmware/companion_radio/ui-orig/Button.h similarity index 100% rename from apps/companion_radio/ui-orig/Button.h rename to firmware/companion_radio/ui-orig/Button.h diff --git a/apps/companion_radio/ui-orig/UITask.cpp b/firmware/companion_radio/ui-orig/UITask.cpp similarity index 100% rename from apps/companion_radio/ui-orig/UITask.cpp rename to firmware/companion_radio/ui-orig/UITask.cpp diff --git a/apps/companion_radio/ui-orig/UITask.h b/firmware/companion_radio/ui-orig/UITask.h similarity index 100% rename from apps/companion_radio/ui-orig/UITask.h rename to firmware/companion_radio/ui-orig/UITask.h diff --git a/apps/companion_radio/ui-tiny/ScrollingStatusBar.h b/firmware/companion_radio/ui-tiny/ScrollingStatusBar.h similarity index 100% rename from apps/companion_radio/ui-tiny/ScrollingStatusBar.h rename to firmware/companion_radio/ui-tiny/ScrollingStatusBar.h diff --git a/apps/companion_radio/ui-tiny/UITask.cpp b/firmware/companion_radio/ui-tiny/UITask.cpp similarity index 100% rename from apps/companion_radio/ui-tiny/UITask.cpp rename to firmware/companion_radio/ui-tiny/UITask.cpp diff --git a/apps/companion_radio/ui-tiny/UITask.h b/firmware/companion_radio/ui-tiny/UITask.h similarity index 100% rename from apps/companion_radio/ui-tiny/UITask.h rename to firmware/companion_radio/ui-tiny/UITask.h diff --git a/apps/companion_radio/ui-tiny/u8g2_icons.h b/firmware/companion_radio/ui-tiny/u8g2_icons.h similarity index 100% rename from apps/companion_radio/ui-tiny/u8g2_icons.h rename to firmware/companion_radio/ui-tiny/u8g2_icons.h diff --git a/apps/kiss_modem/KissModem.cpp b/firmware/kiss_modem/KissModem.cpp similarity index 100% rename from apps/kiss_modem/KissModem.cpp rename to firmware/kiss_modem/KissModem.cpp diff --git a/apps/kiss_modem/KissModem.h b/firmware/kiss_modem/KissModem.h similarity index 100% rename from apps/kiss_modem/KissModem.h rename to firmware/kiss_modem/KissModem.h diff --git a/apps/kiss_modem/main.cpp b/firmware/kiss_modem/main.cpp similarity index 100% rename from apps/kiss_modem/main.cpp rename to firmware/kiss_modem/main.cpp diff --git a/apps/simple_repeater/MyMesh.cpp b/firmware/simple_repeater/MyMesh.cpp similarity index 100% rename from apps/simple_repeater/MyMesh.cpp rename to firmware/simple_repeater/MyMesh.cpp diff --git a/apps/simple_repeater/MyMesh.h b/firmware/simple_repeater/MyMesh.h similarity index 100% rename from apps/simple_repeater/MyMesh.h rename to firmware/simple_repeater/MyMesh.h diff --git a/apps/simple_repeater/RateLimiter.h b/firmware/simple_repeater/RateLimiter.h similarity index 100% rename from apps/simple_repeater/RateLimiter.h rename to firmware/simple_repeater/RateLimiter.h diff --git a/apps/simple_repeater/UITask.cpp b/firmware/simple_repeater/UITask.cpp similarity index 100% rename from apps/simple_repeater/UITask.cpp rename to firmware/simple_repeater/UITask.cpp diff --git a/apps/simple_repeater/UITask.h b/firmware/simple_repeater/UITask.h similarity index 100% rename from apps/simple_repeater/UITask.h rename to firmware/simple_repeater/UITask.h diff --git a/apps/simple_repeater/main.cpp b/firmware/simple_repeater/main.cpp similarity index 100% rename from apps/simple_repeater/main.cpp rename to firmware/simple_repeater/main.cpp diff --git a/apps/simple_room_server/MyMesh.cpp b/firmware/simple_room_server/MyMesh.cpp similarity index 100% rename from apps/simple_room_server/MyMesh.cpp rename to firmware/simple_room_server/MyMesh.cpp diff --git a/apps/simple_room_server/MyMesh.h b/firmware/simple_room_server/MyMesh.h similarity index 100% rename from apps/simple_room_server/MyMesh.h rename to firmware/simple_room_server/MyMesh.h diff --git a/apps/simple_room_server/UITask.cpp b/firmware/simple_room_server/UITask.cpp similarity index 100% rename from apps/simple_room_server/UITask.cpp rename to firmware/simple_room_server/UITask.cpp diff --git a/apps/simple_room_server/UITask.h b/firmware/simple_room_server/UITask.h similarity index 100% rename from apps/simple_room_server/UITask.h rename to firmware/simple_room_server/UITask.h diff --git a/apps/simple_room_server/main.cpp b/firmware/simple_room_server/main.cpp similarity index 100% rename from apps/simple_room_server/main.cpp rename to firmware/simple_room_server/main.cpp diff --git a/apps/simple_secure_chat/main.cpp b/firmware/simple_secure_chat/main.cpp similarity index 100% rename from apps/simple_secure_chat/main.cpp rename to firmware/simple_secure_chat/main.cpp diff --git a/apps/simple_sensor/SensorMesh.cpp b/firmware/simple_sensor/SensorMesh.cpp similarity index 100% rename from apps/simple_sensor/SensorMesh.cpp rename to firmware/simple_sensor/SensorMesh.cpp diff --git a/apps/simple_sensor/SensorMesh.h b/firmware/simple_sensor/SensorMesh.h similarity index 100% rename from apps/simple_sensor/SensorMesh.h rename to firmware/simple_sensor/SensorMesh.h diff --git a/apps/simple_sensor/TimeSeriesData.cpp b/firmware/simple_sensor/TimeSeriesData.cpp similarity index 100% rename from apps/simple_sensor/TimeSeriesData.cpp rename to firmware/simple_sensor/TimeSeriesData.cpp diff --git a/apps/simple_sensor/TimeSeriesData.h b/firmware/simple_sensor/TimeSeriesData.h similarity index 100% rename from apps/simple_sensor/TimeSeriesData.h rename to firmware/simple_sensor/TimeSeriesData.h diff --git a/apps/simple_sensor/UITask.cpp b/firmware/simple_sensor/UITask.cpp similarity index 100% rename from apps/simple_sensor/UITask.cpp rename to firmware/simple_sensor/UITask.cpp diff --git a/apps/simple_sensor/UITask.h b/firmware/simple_sensor/UITask.h similarity index 100% rename from apps/simple_sensor/UITask.h rename to firmware/simple_sensor/UITask.h diff --git a/apps/simple_sensor/main.cpp b/firmware/simple_sensor/main.cpp similarity index 100% rename from apps/simple_sensor/main.cpp rename to firmware/simple_sensor/main.cpp diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini index 021d5b774e..1ed6b6d873 100644 --- a/variants/ebyte_eora_s3/platformio.ini +++ b/variants/ebyte_eora_s3/platformio.ini @@ -56,7 +56,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Ebyte_EoRa-S3.lib_deps} ${esp32_ota.lib_deps} @@ -70,7 +70,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Ebyte_EoRa-S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -89,7 +89,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Ebyte_EoRa-S3.lib_deps} ${esp32_ota.lib_deps} @@ -98,7 +98,7 @@ lib_deps = extends = Ebyte_EoRa-S3 build_flags = ${Ebyte_EoRa-S3.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -107,8 +107,8 @@ build_flags = build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Ebyte_EoRa-S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -117,7 +117,7 @@ lib_deps = extends = Ebyte_EoRa-S3 build_flags = ${Ebyte_EoRa-S3.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -130,8 +130,8 @@ build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Ebyte_EoRa-S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -139,4 +139,4 @@ lib_deps = [env:Ebyte_EoRa-S3_kiss_modem] extends = Ebyte_EoRa-S3 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/gat562_30s_mesh_kit/platformio.ini b/variants/gat562_30s_mesh_kit/platformio.ini index 104b86589e..19a44602ff 100644 --- a/variants/gat562_30s_mesh_kit/platformio.ini +++ b/variants/gat562_30s_mesh_kit/platformio.ini @@ -45,7 +45,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:GAT562_30S_Mesh_Kit_room_server] @@ -62,7 +62,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:GAT562_30S_Mesh_Kit_companion_radio_usb] @@ -71,15 +71,15 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_30S_Mesh_Kit.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + lib_deps = ${GAT562_30S_Mesh_Kit.lib_deps} @@ -93,7 +93,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_30S_Mesh_Kit.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -105,8 +105,8 @@ build_flags = build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${GAT562_30S_Mesh_Kit.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -115,4 +115,4 @@ lib_deps = [env:GAT562_30S_Mesh_Kit_kiss_modem] extends = GAT562_30S_Mesh_Kit build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/gat562_mesh_evb_pro/platformio.ini b/variants/gat562_mesh_evb_pro/platformio.ini index 426d22e93f..867ebc59c1 100644 --- a/variants/gat562_mesh_evb_pro/platformio.ini +++ b/variants/gat562_mesh_evb_pro/platformio.ini @@ -34,7 +34,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:GAT562_Mesh_EVB_Pro_room_server] @@ -49,9 +49,9 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:GAT562_Mesh_EVB_Pro_kiss_modem] extends = GAT562_Mesh_EVB_Pro build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/gat562_mesh_tracker_pro/platformio.ini b/variants/gat562_mesh_tracker_pro/platformio.ini index 4d2f7bd6d2..f9d28d564e 100644 --- a/variants/gat562_mesh_tracker_pro/platformio.ini +++ b/variants/gat562_mesh_tracker_pro/platformio.ini @@ -41,7 +41,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:GAT562_Mesh_Tracker_Pro_room_server] @@ -58,7 +58,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:GAT562_Mesh_Tracker_Pro_companion_radio_usb] @@ -67,15 +67,15 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_Mesh_Tracker_Pro.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${GAT562_Mesh_Tracker_Pro.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -88,7 +88,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_Mesh_Tracker_Pro.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -100,8 +100,8 @@ build_flags = build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${GAT562_Mesh_Tracker_Pro.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,4 +109,4 @@ lib_deps = [env:GAT562_Mesh_Tracker_Pro_kiss_modem] extends = GAT562_Mesh_Tracker_Pro build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/gat562_mesh_watch13/platformio.ini b/variants/gat562_mesh_watch13/platformio.ini index 0938fe0c92..d91dccb575 100644 --- a/variants/gat562_mesh_watch13/platformio.ini +++ b/variants/gat562_mesh_watch13/platformio.ini @@ -43,7 +43,7 @@ lib_deps = ;; -D MESH_DEBUG=1 ;build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ;[env:GAT562_Mesh_Watch13_room_server] ;extends = GAT562_Mesh_Watch13 @@ -59,7 +59,7 @@ lib_deps = ;; -D MESH_DEBUG=1 ;build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} ; + -; +<../apps/simple_room_server> +; +<../firmware/simple_room_server> [env:GAT562_Mesh_Watch13_companion_radio_ble] extends = GAT562_Mesh_Watch13 @@ -67,7 +67,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${GAT562_Mesh_Watch13.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -81,8 +81,8 @@ build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${GAT562_Mesh_Watch13.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -90,4 +90,4 @@ lib_deps = [env:GAT562_Mesh_Watch13_kiss_modem] extends = GAT562_Mesh_Watch13 build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini index 15fd966077..8da9c5e894 100644 --- a/variants/generic-e22/platformio.ini +++ b/variants/generic-e22/platformio.ini @@ -30,7 +30,7 @@ lib_deps = [env:Generic_E22_sx1262_repeater] extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Generic_E22.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -51,7 +51,7 @@ lib_deps = ; extends = Generic_E22 ; build_src_filter = ${Generic_E22.build_src_filter} ; + -; +<../apps/simple_repeater/*.cpp> +; +<../firmware/simple_repeater/*.cpp> ; build_flags = ; ${Generic_E22.build_flags} ; -D RADIO_CLASS=CustomSX1262 @@ -76,7 +76,7 @@ lib_deps = extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Generic_E22.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -98,12 +98,12 @@ lib_deps = [env:Generic_E22_kiss_modem] extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> [env:Generic_E22_sx1268_repeater] extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Generic_E22.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -124,7 +124,7 @@ lib_deps = ; extends = Generic_E22 ; build_src_filter = ${Generic_E22.build_src_filter} ; + -; +<../apps/simple_repeater/*.cpp> +; +<../firmware/simple_repeater/*.cpp> ; build_flags = ; ${Generic_E22.build_flags} ; -D RADIO_CLASS=CustomSX1268 @@ -149,7 +149,7 @@ lib_deps = extends = Generic_E22 build_src_filter = ${Generic_E22.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Generic_E22.build_flags} -D RADIO_CLASS=CustomSX1268 diff --git a/variants/generic_espnow/platformio.ini b/variants/generic_espnow/platformio.ini index 3364cbb05d..5a0a3f2e6f 100644 --- a/variants/generic_espnow/platformio.ini +++ b/variants/generic_espnow/platformio.ini @@ -29,7 +29,7 @@ build_flags = -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=1 build_src_filter = ${Generic_ESPNOW.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Generic_ESPNOW.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -44,7 +44,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${Generic_ESPNOW.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> lib_deps = ${Generic_ESPNOW.lib_deps} ${esp32_ota.lib_deps} @@ -60,7 +60,7 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D ESPNOW_DEBUG_LOGGING=1 build_src_filter = ${Generic_ESPNOW.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Generic_ESPNOW.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -75,7 +75,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' build_src_filter = ${Generic_ESPNOW.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> lib_deps = ${Generic_ESPNOW.lib_deps} ${esp32_ota.lib_deps} diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini index cf529d05b8..8c9e230a74 100644 --- a/variants/heltec_ct62/platformio.ini +++ b/variants/heltec_ct62/platformio.ini @@ -45,7 +45,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_ct62.lib_deps} ${esp32_ota.lib_deps} @@ -67,7 +67,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Heltec_ct62.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${Heltec_ct62.lib_deps} ; ${esp32_ota.lib_deps} @@ -87,7 +87,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_ct62.lib_deps} ${esp32_ota.lib_deps} @@ -104,7 +104,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Heltec_ct62.lib_deps} ${esp32_ota.lib_deps} @@ -123,7 +123,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> + lib_deps = ${Heltec_ct62.lib_deps} @@ -146,7 +146,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> lib_deps = ${Heltec_ct62.lib_deps} ${esp32_ota.lib_deps} @@ -154,4 +154,4 @@ lib_deps = [env:Heltec_ct62_kiss_modem] extends = Heltec_ct62 build_src_filter = ${Heltec_ct62.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini index c148287f0b..59c2085447 100644 --- a/variants/heltec_e213/platformio.ini +++ b/variants/heltec_e213/platformio.ini @@ -45,7 +45,7 @@ lib_deps = extends = Heltec_E213_base build_flags = ${Heltec_E213_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -56,8 +56,8 @@ build_flags = build_src_filter = ${Heltec_E213_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_E213_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -67,7 +67,7 @@ lib_deps = extends = Heltec_E213_base build_flags = ${Heltec_E213_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -76,8 +76,8 @@ build_flags = build_src_filter = ${Heltec_E213_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_E213_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -95,7 +95,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_E213_base.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_E213_base.lib_deps} ${esp32_ota.lib_deps} @@ -120,7 +120,7 @@ lib_deps = ; build_src_filter = ${Heltec_E213_base.build_src_filter} ; + ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${Heltec_E213_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -143,7 +143,7 @@ build_flags = build_src_filter = ${Heltec_E213_base.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_E213_base.lib_deps} ${esp32_ota.lib_deps} @@ -161,7 +161,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${Heltec_E213_base.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Heltec_E213_base.lib_deps} ${esp32_ota.lib_deps} @@ -170,4 +170,4 @@ lib_deps = [env:Heltec_E213_kiss_modem] extends = Heltec_E213_base build_src_filter = ${Heltec_E213_base.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini index 7f04abc36f..9918388f4c 100644 --- a/variants/heltec_e290/platformio.ini +++ b/variants/heltec_e290/platformio.ini @@ -39,7 +39,7 @@ lib_deps = extends = Heltec_E290_base build_flags = ${Heltec_E290_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E290Display @@ -50,8 +50,8 @@ build_flags = build_src_filter = ${Heltec_E290_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_E290_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -61,7 +61,7 @@ lib_deps = extends = Heltec_E290_base build_flags = ${Heltec_E290_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E290Display @@ -71,8 +71,8 @@ build_flags = build_src_filter = ${Heltec_E290_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_E290_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -90,7 +90,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_E290_base.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_E290_base.lib_deps} ${esp32_ota.lib_deps} @@ -115,7 +115,7 @@ lib_deps = ; build_src_filter = ${Heltec_E290_base.build_src_filter} ; + ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${Heltec_E290_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -138,7 +138,7 @@ build_flags = build_src_filter = ${Heltec_E290_base.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_E290_base.lib_deps} ${esp32_ota.lib_deps} @@ -156,7 +156,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${Heltec_E290_base.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Heltec_E290_base.lib_deps} ${esp32_ota.lib_deps} @@ -165,4 +165,4 @@ lib_deps = [env:Heltec_E290_kiss_modem] extends = Heltec_E290_base build_src_filter = ${Heltec_E290_base.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_mesh_solar/platformio.ini b/variants/heltec_mesh_solar/platformio.ini index db94b86fab..666c88e467 100644 --- a/variants/heltec_mesh_solar/platformio.ini +++ b/variants/heltec_mesh_solar/platformio.ini @@ -33,7 +33,7 @@ upload_protocol = nrfutil [env:Heltec_mesh_solar_repeater] extends = Heltec_mesh_solar build_src_filter = ${Heltec_mesh_solar.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Heltec_mesh_solar.build_flags} @@ -48,7 +48,7 @@ build_flags = [env:Heltec_mesh_solar_room_server] extends = Heltec_mesh_solar build_src_filter = ${Heltec_mesh_solar.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Heltec_mesh_solar.build_flags} -D ADVERT_NAME='"Heltec_Mesh_Solar Room"' @@ -74,7 +74,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_mesh_solar.build_src_filter} + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Heltec_mesh_solar.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -93,7 +93,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_mesh_solar.build_src_filter} + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Heltec_mesh_solar.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -101,4 +101,4 @@ lib_deps = [env:Heltec_mesh_solar_kiss_modem] extends = Heltec_mesh_solar build_src_filter = ${Heltec_mesh_solar.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_t096/platformio.ini b/variants/heltec_t096/platformio.ini index aeb808efb0..75b38db32b 100644 --- a/variants/heltec_t096/platformio.ini +++ b/variants/heltec_t096/platformio.ini @@ -58,7 +58,7 @@ upload_protocol = nrfutil [env:Heltec_t096_repeater] extends = Heltec_t096 build_src_filter = ${Heltec_t096.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Heltec_t096.build_flags} @@ -87,12 +87,12 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t096.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:Heltec_t096_room_server] extends = Heltec_t096 build_src_filter = ${Heltec_t096.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Heltec_t096.build_flags} -D ADVERT_NAME='"Heltec_t096 Room"' @@ -116,7 +116,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t096.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> lib_deps = ${Heltec_t096.lib_deps} @@ -126,7 +126,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t096.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -137,8 +137,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t096.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t096.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -149,7 +149,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t096.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D BLE_PIN_CODE=123456 @@ -158,8 +158,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t096.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t096.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -167,4 +167,4 @@ lib_deps = [env:Heltec_t096_kiss_modem] extends = Heltec_t096 build_src_filter = ${Heltec_t096.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_t1/platformio.ini b/variants/heltec_t1/platformio.ini index 7866d5a4e0..aef1f601fb 100644 --- a/variants/heltec_t1/platformio.ini +++ b/variants/heltec_t1/platformio.ini @@ -30,7 +30,7 @@ upload_protocol = nrfutil [env:Heltec_t1_repeater] extends = Heltec_t1 build_src_filter = ${Heltec_t1.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Heltec_t1.build_flags} @@ -45,7 +45,7 @@ build_flags = [env:Heltec_t1_room_server] extends = Heltec_t1 build_src_filter = ${Heltec_t1.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Heltec_t1.build_flags} -D ADVERT_NAME='"Heltec_t1 Room"' @@ -62,7 +62,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t1.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -74,8 +74,8 @@ build_flags = build_src_filter = ${Heltec_t1.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -87,7 +87,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t1.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -95,8 +95,8 @@ build_flags = build_src_filter = ${Heltec_t1.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -105,4 +105,4 @@ lib_deps = [env:Heltec_t1_kiss_modem] extends = Heltec_t1 build_src_filter = ${Heltec_t1.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini index e7c4a75d88..784f7d24d3 100644 --- a/variants/heltec_t114/platformio.ini +++ b/variants/heltec_t114/platformio.ini @@ -49,7 +49,7 @@ upload_protocol = nrfutil [env:Heltec_t114_without_display_repeater] extends = Heltec_t114 build_src_filter = ${Heltec_t114.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Heltec_t114.build_flags} -D ADVERT_NAME='"Heltec_T114 Repeater"' @@ -77,12 +77,12 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:Heltec_t114_without_display_room_server] extends = Heltec_t114 build_src_filter = ${Heltec_t114.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Heltec_t114.build_flags} -D ADVERT_NAME='"Heltec_T114 Room"' @@ -99,7 +99,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -110,8 +110,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t114.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -122,14 +122,14 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 build_src_filter = ${Heltec_t114.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t114.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -159,7 +159,7 @@ upload_protocol = nrfutil [env:Heltec_t114_repeater] extends = Heltec_t114_with_display build_src_filter = ${Heltec_t114_with_display.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Heltec_t114_with_display.build_flags} @@ -188,12 +188,12 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114_with_display.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:Heltec_t114_room_server] extends = Heltec_t114_with_display build_src_filter = ${Heltec_t114_with_display.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Heltec_t114_with_display.build_flags} -D ADVERT_NAME='"Heltec_T114 Room"' @@ -210,7 +210,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114_with_display.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -221,8 +221,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114_with_display.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t114_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -233,7 +233,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_t114_with_display.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D BLE_PIN_CODE=123456 @@ -242,8 +242,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_t114_with_display.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_t114_with_display.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -251,4 +251,4 @@ lib_deps = [env:Heltec_t114_kiss_modem] extends = Heltec_t114 build_src_filter = ${Heltec_t114.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini index cd8cf55753..7a8a4f8d8a 100644 --- a/variants/heltec_t190/platformio.ini +++ b/variants/heltec_t190/platformio.ini @@ -52,7 +52,7 @@ lib_deps = extends = Heltec_T190_base build_flags = ${Heltec_T190_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 ; dynamic, random PIN @@ -60,8 +60,8 @@ build_flags = -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${Heltec_T190_base.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_T190_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -70,14 +70,14 @@ lib_deps = extends = Heltec_T190_base build_flags = ${Heltec_T190_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${Heltec_T190_base.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_T190_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -92,7 +92,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_T190_base.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_T190_base.lib_deps} ${esp32_ota.lib_deps} @@ -114,7 +114,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Heltec_T190_base.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${Heltec_T190_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -134,7 +134,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_T190_base.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_T190_base.lib_deps} ${esp32_ota.lib_deps} @@ -149,7 +149,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' build_src_filter = ${Heltec_T190_base.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Heltec_T190_base.lib_deps} ${esp32_ota.lib_deps} @@ -157,4 +157,4 @@ lib_deps = [env:Heltec_T190_kiss_modem] extends = Heltec_T190_base build_src_filter = ${Heltec_T190_base.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_tower_v2/platformio.ini b/variants/heltec_tower_v2/platformio.ini index d6caad9beb..06ccbb35aa 100644 --- a/variants/heltec_tower_v2/platformio.ini +++ b/variants/heltec_tower_v2/platformio.ini @@ -28,7 +28,7 @@ upload_protocol = nrfutil [env:Heltec_tower_v2_repeater] extends = Heltec_tower_v2 build_src_filter = ${Heltec_tower_v2.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Heltec_tower_v2.build_flags} -D ADVERT_NAME='"Heltec_Tower_V2 Repeater"' @@ -42,7 +42,7 @@ build_flags = [env:Heltec_tower_v2_room_server] extends = Heltec_tower_v2 build_src_filter = ${Heltec_tower_v2.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Heltec_tower_v2.build_flags} -D ADVERT_NAME='"Heltec_Tower_V2 Room"' @@ -59,7 +59,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_tower_v2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -70,8 +70,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tower_v2.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tower_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -82,7 +82,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Heltec_tower_v2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -92,8 +92,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tower_v2.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tower_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -101,4 +101,4 @@ lib_deps = [env:Heltec_tower_v2_kiss_modem] extends = Heltec_tower_v2 build_src_filter = ${Heltec_tower_v2.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini index c075ab86ea..e8cb5939e7 100644 --- a/variants/heltec_tracker/platformio.ini +++ b/variants/heltec_tracker/platformio.ini @@ -54,7 +54,7 @@ extends = Heltec_tracker_base build_flags = ${Heltec_tracker_base.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_ROTATION=1 -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=350 @@ -67,8 +67,8 @@ build_flags = build_src_filter = ${Heltec_tracker_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + lib_deps = ${Heltec_tracker_base.lib_deps} @@ -79,7 +79,7 @@ extends = Heltec_tracker_base build_flags = ${Heltec_tracker_base.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_ROTATION=1 -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=350 @@ -92,8 +92,8 @@ build_flags = build_src_filter = ${Heltec_tracker_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + lib_deps = ${Heltec_tracker_base.lib_deps} @@ -114,7 +114,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_base.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_tracker_base.lib_deps} ${esp32_ota.lib_deps} @@ -139,7 +139,7 @@ lib_deps = ; build_src_filter = ${Heltec_tracker_base.build_src_filter} ; + ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${Heltec_tracker_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -162,7 +162,7 @@ build_flags = build_src_filter = ${Heltec_tracker_base.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_tracker_base.lib_deps} ${esp32_ota.lib_deps} @@ -182,7 +182,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_base.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Heltec_tracker_base.lib_deps} ${esp32_ota.lib_deps} @@ -190,4 +190,4 @@ lib_deps = [env:Heltec_Wireless_Tracker_kiss_modem] extends = Heltec_tracker_base build_src_filter = ${Heltec_tracker_base.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini index 97793be832..3f7a0f3daf 100644 --- a/variants/heltec_tracker_v2/platformio.ini +++ b/variants/heltec_tracker_v2/platformio.ini @@ -71,7 +71,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_tracker_v2.lib_deps} ${esp32_ota.lib_deps} @@ -94,7 +94,7 @@ build_flags = build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_tracker_v2.lib_deps} ${esp32_ota.lib_deps} @@ -113,7 +113,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Heltec_tracker_v2.lib_deps} ${esp32_ota.lib_deps} @@ -127,7 +127,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -136,7 +136,7 @@ lib_deps = extends = Heltec_tracker_v2 build_flags = ${Heltec_tracker_v2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display @@ -145,8 +145,8 @@ build_flags = build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -155,7 +155,7 @@ lib_deps = extends = Heltec_tracker_v2 build_flags = ${Heltec_tracker_v2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display @@ -170,8 +170,8 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -180,7 +180,7 @@ lib_deps = extends = Heltec_tracker_v2 build_flags = ${Heltec_tracker_v2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7735Display @@ -194,8 +194,8 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_tracker_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -213,7 +213,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_tracker_v2.build_src_filter} + - +<../apps/simple_sensor> + +<../firmware/simple_sensor> lib_deps = ${Heltec_tracker_v2.lib_deps} ${esp32_ota.lib_deps} @@ -221,4 +221,4 @@ lib_deps = [env:heltec_tracker_v2_kiss_modem] extends = Heltec_tracker_v2 build_src_filter = ${Heltec_tracker_v2.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini index 91820962c5..5703502d2b 100644 --- a/variants/heltec_v2/platformio.ini +++ b/variants/heltec_v2/platformio.ini @@ -40,7 +40,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> + + lib_deps = @@ -67,7 +67,7 @@ lib_deps = ; + ; + ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${Heltec_lora32_v2.lib_deps} ; ${esp32_ota.lib_deps} @@ -90,7 +90,7 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_lora32_v2.lib_deps} ${esp32_ota.lib_deps} @@ -110,7 +110,7 @@ build_flags = build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Heltec_lora32_v2.lib_deps} ${esp32_ota.lib_deps} @@ -124,7 +124,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v2.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -133,7 +133,7 @@ lib_deps = extends = Heltec_lora32_v2 build_flags = ${Heltec_lora32_v2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 @@ -143,8 +143,8 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -153,7 +153,7 @@ lib_deps = extends = Heltec_lora32_v2 build_flags = ${Heltec_lora32_v2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 @@ -166,8 +166,8 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -176,7 +176,7 @@ lib_deps = extends = Heltec_lora32_v2 build_flags = ${Heltec_lora32_v2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 @@ -190,8 +190,8 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -199,4 +199,4 @@ lib_deps = [env:Heltec_v2_kiss_modem] extends = Heltec_lora32_v2 build_src_filter = ${Heltec_lora32_v2.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index 4c53f55882..ab5f67230d 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -51,7 +51,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -76,7 +76,7 @@ build_flags = build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -98,7 +98,7 @@ build_flags = build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -117,7 +117,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -131,7 +131,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -140,7 +140,7 @@ lib_deps = extends = Heltec_lora32_v3 build_flags = ${Heltec_lora32_v3.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -149,8 +149,8 @@ build_flags = build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -159,7 +159,7 @@ lib_deps = extends = Heltec_lora32_v3 build_flags = ${Heltec_lora32_v3.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -173,8 +173,8 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -183,7 +183,7 @@ lib_deps = extends = Heltec_lora32_v3 build_flags = ${Heltec_lora32_v3.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -197,8 +197,8 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -218,7 +218,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../apps/simple_sensor> + +<../firmware/simple_sensor> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -235,7 +235,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -258,7 +258,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -279,7 +279,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -288,7 +288,7 @@ lib_deps = [env:Heltec_WSL3_room_server] extends = Heltec_lora32_v3 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Heltec_lora32_v3.build_flags} -D ADVERT_NAME='"Heltec Room"' @@ -315,7 +315,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -329,7 +329,7 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -348,7 +348,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -364,7 +364,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> lib_deps = ${Heltec_lora32_v3.lib_deps} ${esp32_ota.lib_deps} @@ -372,4 +372,4 @@ lib_deps = [env:Heltec_v3_kiss_modem] extends = Heltec_lora32_v3 build_src_filter = ${Heltec_lora32_v3.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini index 0268b9c8b9..461817073e 100644 --- a/variants/heltec_v4/platformio.ini +++ b/variants/heltec_v4/platformio.ini @@ -96,7 +96,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -118,7 +118,7 @@ build_flags = -D ENV_PIN_SCL=3 build_src_filter = ${heltec_v4_oled.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -141,7 +141,7 @@ build_flags = build_src_filter = ${heltec_v4_oled.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -160,7 +160,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -174,7 +174,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -183,7 +183,7 @@ lib_deps = extends = heltec_v4_oled build_flags = ${heltec_v4_oled.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -192,8 +192,8 @@ build_flags = build_src_filter = ${heltec_v4_oled.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -202,7 +202,7 @@ lib_deps = extends = heltec_v4_oled build_flags = ${heltec_v4_oled.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -216,8 +216,8 @@ build_src_filter = ${heltec_v4_oled.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -226,7 +226,7 @@ lib_deps = extends = heltec_v4_oled build_flags = ${heltec_v4_oled.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -240,8 +240,8 @@ build_src_filter = ${heltec_v4_oled.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_oled.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -261,7 +261,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_oled.build_src_filter} + - +<../apps/simple_sensor> + +<../firmware/simple_sensor> lib_deps = ${heltec_v4_oled.lib_deps} ${esp32_ota.lib_deps} @@ -281,7 +281,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${heltec_v4_tft.lib_deps} ${esp32_ota.lib_deps} @@ -305,7 +305,7 @@ build_flags = build_src_filter = ${heltec_v4_tft.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${heltec_v4_tft.lib_deps} ${esp32_ota.lib_deps} @@ -324,7 +324,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${heltec_v4_tft.lib_deps} ${esp32_ota.lib_deps} @@ -338,7 +338,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -347,7 +347,7 @@ lib_deps = extends = heltec_v4_tft build_flags = ${heltec_v4_tft.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=ST7789LCDDisplay @@ -356,8 +356,8 @@ build_flags = build_src_filter = ${heltec_v4_tft.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -366,7 +366,7 @@ lib_deps = extends = heltec_v4_tft build_flags = ${heltec_v4_tft.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=ST7789LCDDisplay -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -380,8 +380,8 @@ build_src_filter = ${heltec_v4_tft.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -390,7 +390,7 @@ lib_deps = extends = heltec_v4_tft build_flags = ${heltec_v4_tft.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -404,8 +404,8 @@ build_src_filter = ${heltec_v4_tft.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${heltec_v4_tft.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -425,7 +425,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${heltec_v4_tft.build_src_filter} + - +<../apps/simple_sensor> + +<../firmware/simple_sensor> lib_deps = ${heltec_v4_tft.lib_deps} ${esp32_ota.lib_deps} @@ -433,4 +433,4 @@ lib_deps = [env:heltec_v4_kiss_modem] extends = Heltec_lora32_v4 build_src_filter = ${Heltec_lora32_v4.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini index e857f3f58c..ecdf15d9f0 100644 --- a/variants/heltec_wireless_paper/platformio.ini +++ b/variants/heltec_wireless_paper/platformio.ini @@ -47,7 +47,7 @@ lib_deps = extends = Heltec_Wireless_Paper_base build_flags = ${Heltec_Wireless_Paper_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -57,8 +57,8 @@ build_flags = build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -68,7 +68,7 @@ lib_deps = extends = Heltec_Wireless_Paper_base build_flags = ${Heltec_Wireless_Paper_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=E213Display @@ -76,8 +76,8 @@ build_flags = build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -95,7 +95,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} ${esp32_ota.lib_deps} @@ -120,7 +120,7 @@ lib_deps = ; build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} ; + ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${Heltec_Wireless_Paper_base.lib_deps} ; ${esp32_ota.lib_deps} @@ -142,7 +142,7 @@ build_flags = build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} ${esp32_ota.lib_deps} @@ -160,7 +160,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Heltec_Wireless_Paper_base.lib_deps} ${esp32_ota.lib_deps} @@ -169,4 +169,4 @@ lib_deps = [env:Heltec_Wireless_Paper_kiss_modem] extends = Heltec_Wireless_Paper_base build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/ikoka_handheld_nrf/platformio.ini b/variants/ikoka_handheld_nrf/platformio.ini index cd036e4fb3..cd9344280d 100644 --- a/variants/ikoka_handheld_nrf/platformio.ini +++ b/variants/ikoka_handheld_nrf/platformio.ini @@ -44,11 +44,11 @@ build_flags = ${ikoka_handheld_nrf.build_flags} -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 -D QSPIFLASH=1 - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new build_src_filter = ${ikoka_handheld_nrf.build_src_filter} + - +<../apps/companion_radio/ui-new/UITask.cpp> - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/UITask.cpp> + +<../firmware/companion_radio/*.cpp> [env:ikoka_handheld_nrf_e22_30dbm_096_companion_radio_ble] extends = ikoka_handheld_nrf @@ -94,7 +94,7 @@ build_flags = ${ikoka_handheld_nrf.build_flags} -D MAX_NEIGHBOURS=50 -D LORA_TX_POWER=20 build_src_filter = ${ikoka_handheld_nrf.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [env:ikoka_handheld_nrf_e22_30dbm_room_server] extends = ikoka_handheld_nrf @@ -105,11 +105,11 @@ build_flags = ${ikoka_handheld_nrf.build_flags} -D ADMIN_PASSWORD='"password"' -D LORA_TX_POWER=20 build_src_filter = ${ikoka_handheld_nrf.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> [env:ikoka_handheld_nrf_kiss_modem] extends = ikoka_handheld_nrf build_flags = ${ikoka_handheld_nrf.build_flags} -D LORA_TX_POWER=20 build_src_filter = ${ikoka_handheld_nrf.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/ikoka_nano_nrf/platformio.ini b/variants/ikoka_nano_nrf/platformio.ini index c9d96dc7ba..8e9ff14e3b 100644 --- a/variants/ikoka_nano_nrf/platformio.ini +++ b/variants/ikoka_nano_nrf/platformio.ini @@ -83,15 +83,15 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D QSPIFLASH=1 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_nano_nrf.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ikoka_nano_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -104,14 +104,14 @@ build_flags = ${ikoka_nano_nrf.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D QSPIFLASH=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_nano_nrf.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ikoka_nano_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -128,7 +128,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_nano_nrf.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [ikoka_nano_nrf_room_server] extends = ikoka_nano_nrf @@ -141,7 +141,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_nano_nrf.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> ;;; 22dBm EBYTE E22-900M22 variants [env:ikoka_nano_nrf_22dbm_companion_radio_usb] @@ -283,14 +283,14 @@ build_src_filter = [env:ikoka_nano_nrf_22dbm_kiss_modem] extends = ikoka_nano_nrf_e22_22dbm build_src_filter = ${ikoka_nano_nrf_e22_22dbm.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> [env:ikoka_nano_nrf_30dbm_kiss_modem] extends = ikoka_nano_nrf_e22_30dbm build_src_filter = ${ikoka_nano_nrf_e22_30dbm.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> [env:ikoka_nano_nrf_33dbm_kiss_modem] extends = ikoka_nano_nrf_e22_33dbm build_src_filter = ${ikoka_nano_nrf_e22_33dbm.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/ikoka_stick_nrf/platformio.ini b/variants/ikoka_stick_nrf/platformio.ini index b8004b2f2b..b85d729647 100644 --- a/variants/ikoka_stick_nrf/platformio.ini +++ b/variants/ikoka_stick_nrf/platformio.ini @@ -88,15 +88,15 @@ build_flags = -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 -D OFFLINE_QUEUE_SIZE=256 - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D QSPIFLASH=1 ; -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_stick_nrf.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ikoka_stick_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,14 +109,14 @@ build_flags = ${ikoka_stick_nrf.build_flags} -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D QSPIFLASH=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_stick_nrf.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ikoka_stick_nrf.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -134,7 +134,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_stick_nrf.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [ikoka_stick_nrf_room_server] extends = ikoka_stick_nrf @@ -147,7 +147,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ikoka_stick_nrf.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> ;;; hardware + firmware variants @@ -294,14 +294,14 @@ build_src_filter = [env:ikoka_stick_nrf_22dbm_kiss_modem] extends = ikoka_stick_nrf_e22_22dbm build_src_filter = ${ikoka_stick_nrf_e22_22dbm.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> [env:ikoka_stick_nrf_30dbm_kiss_modem] extends = ikoka_stick_nrf_e22_30dbm build_src_filter = ${ikoka_stick_nrf_e22_30dbm.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> [env:ikoka_stick_nrf_33dbm_kiss_modem] extends = ikoka_stick_nrf_e22_33dbm build_src_filter = ${ikoka_stick_nrf_e22_33dbm.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/keepteen_lt1/platformio.ini b/variants/keepteen_lt1/platformio.ini index 1a1916c2e5..b6c0590b11 100644 --- a/variants/keepteen_lt1/platformio.ini +++ b/variants/keepteen_lt1/platformio.ini @@ -23,7 +23,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:KeepteenLT1_repeater] extends = KeepteenLT1 build_src_filter = ${KeepteenLT1.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> + + build_flags = @@ -42,7 +42,7 @@ lib_deps = ${KeepteenLT1.lib_deps} [env:KeepteenLT1_room_server] extends = KeepteenLT1 build_src_filter = ${KeepteenLT1.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> + + build_flags = ${KeepteenLT1.build_flags} @@ -62,7 +62,7 @@ extends = KeepteenLT1 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${KeepteenLT1.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -71,8 +71,8 @@ build_flags = ${KeepteenLT1.build_flags} build_src_filter = ${KeepteenLT1.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${KeepteenLT1.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -82,7 +82,7 @@ extends = KeepteenLT1 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${KeepteenLT1.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -95,8 +95,8 @@ build_src_filter = ${KeepteenLT1.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${KeepteenLT1.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -104,4 +104,4 @@ lib_deps = ${KeepteenLT1.lib_deps} [env:KeepteenLT1_kiss_modem] extends = KeepteenLT1 build_src_filter = ${KeepteenLT1.build_src_filter} - +<../apps/kiss_modem/> \ No newline at end of file + +<../firmware/kiss_modem/> \ No newline at end of file diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini index 08de975bfd..c112d3682a 100644 --- a/variants/lilygo_t3s3/platformio.ini +++ b/variants/lilygo_t3s3/platformio.ini @@ -48,7 +48,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -72,7 +72,7 @@ lib_deps = ; build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} ; + ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${LilyGo_T3S3_sx1262.lib_deps} ; ${esp32_ota.lib_deps} @@ -94,7 +94,7 @@ build_flags = build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -108,7 +108,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -127,7 +127,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -136,7 +136,7 @@ lib_deps = extends = LilyGo_T3S3_sx1262 build_flags = ${LilyGo_T3S3_sx1262.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -145,8 +145,8 @@ build_flags = build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -155,7 +155,7 @@ lib_deps = extends = LilyGo_T3S3_sx1262 build_flags = ${LilyGo_T3S3_sx1262.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -168,8 +168,8 @@ build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T3S3_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -177,4 +177,4 @@ lib_deps = [env:LilyGo_T3S3_sx1262_kiss_modem] extends = LilyGo_T3S3_sx1262 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini index 290e9621b0..50bea0534a 100644 --- a/variants/lilygo_t3s3_sx1276/platformio.ini +++ b/variants/lilygo_t3s3_sx1276/platformio.ini @@ -45,7 +45,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} ${esp32_ota.lib_deps} @@ -69,7 +69,7 @@ lib_deps = ; build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} ; + ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${LilyGo_T3S3_sx1276.lib_deps} ; ${esp32_ota.lib_deps} @@ -91,7 +91,7 @@ build_flags = build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} ${esp32_ota.lib_deps} @@ -105,7 +105,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -124,7 +124,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} ${esp32_ota.lib_deps} @@ -134,15 +134,15 @@ extends = LilyGo_T3S3_sx1276 upload_speed = 115200 build_flags = ${LilyGo_T3S3_sx1276.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -151,7 +151,7 @@ lib_deps = extends = LilyGo_T3S3_sx1276 build_flags = ${LilyGo_T3S3_sx1276.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -164,8 +164,8 @@ build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T3S3_sx1276.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -173,4 +173,4 @@ lib_deps = [env:LilyGo_T3S3_sx1276_kiss_modem] extends = LilyGo_T3S3_sx1276 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_t_impulse_plus/platformio.ini b/variants/lilygo_t_impulse_plus/platformio.ini index 163bfb85be..c094229416 100644 --- a/variants/lilygo_t_impulse_plus/platformio.ini +++ b/variants/lilygo_t_impulse_plus/platformio.ini @@ -31,7 +31,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:LilyGo_T_Impulse_Plus_repeater] extends = LilyGo_T_Impulse_Plus build_src_filter = ${LilyGo_T_Impulse_Plus.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${LilyGo_T_Impulse_Plus.build_flags} -D ADVERT_NAME='"T-Impulse-Plus Repeater"' @@ -49,7 +49,7 @@ extends = LilyGo_T_Impulse_Plus build_flags = ${LilyGo_T_Impulse_Plus.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -61,8 +61,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_T_Impulse_Plus.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T_Impulse_Plus.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -70,4 +70,4 @@ lib_deps = [env:LilyGo_T_Impulse_Plus_kiss_modem] extends = LilyGo_T_Impulse_Plus build_src_filter = ${LilyGo_T_Impulse_Plus.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_tbeam_1w/platformio.ini b/variants/lilygo_tbeam_1w/platformio.ini index ffd086055c..89c2058e43 100644 --- a/variants/lilygo_tbeam_1w/platformio.ini +++ b/variants/lilygo_tbeam_1w/platformio.ini @@ -79,7 +79,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_TBeam_1W.lib_deps} ${esp32_ota.lib_deps} @@ -99,7 +99,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${LilyGo_TBeam_1W.lib_deps} ${esp32_ota.lib_deps} @@ -109,7 +109,7 @@ lib_deps = extends = LilyGo_TBeam_1W build_flags = ${LilyGo_TBeam_1W.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D PERSISTANT_GPS=1 @@ -117,8 +117,8 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_1W.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -128,7 +128,7 @@ lib_deps = extends = LilyGo_TBeam_1W build_flags = ${LilyGo_TBeam_1W.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -140,8 +140,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_1W.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -151,7 +151,7 @@ lib_deps = extends = LilyGo_TBeam_1W build_flags = ${LilyGo_TBeam_1W.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -164,8 +164,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_1W.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -188,7 +188,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_TBeam_1W.lib_deps} ${esp32_ota.lib_deps} @@ -196,4 +196,4 @@ lib_deps = [env:LilyGo_TBeam_1W_kiss_modem] extends = LilyGo_TBeam_1W build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini index 824bd4a9b8..a8f923dfbd 100644 --- a/variants/lilygo_tbeam_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_SX1262/platformio.ini @@ -45,7 +45,7 @@ extends = LilyGo_TBeam_SX1262 board_build.upload.maximum_ram_size=2000000 build_flags = ${LilyGo_TBeam_SX1262.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 @@ -59,8 +59,8 @@ build_flags = build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_SX1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -77,7 +77,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_TBeam_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -99,7 +99,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${LilyGo_TBeam_SX1262.lib_deps} ; ${esp32_ota.lib_deps} @@ -119,7 +119,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_TBeam_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -136,7 +136,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${LilyGo_TBeam_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -144,4 +144,4 @@ lib_deps = [env:Tbeam_SX1262_kiss_modem] extends = LilyGo_TBeam_SX1262 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_tbeam_SX1276/platformio.ini b/variants/lilygo_tbeam_SX1276/platformio.ini index 03bf6d19ee..c96c24ee46 100644 --- a/variants/lilygo_tbeam_SX1276/platformio.ini +++ b/variants/lilygo_tbeam_SX1276/platformio.ini @@ -43,7 +43,7 @@ extends = LilyGo_TBeam_SX1276 board_build.upload.maximum_ram_size=2000000 build_flags = ${LilyGo_TBeam_SX1276.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 @@ -55,8 +55,8 @@ build_flags = build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TBeam_SX1276.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -74,7 +74,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_TBeam_SX1276.lib_deps} ${esp32_ota.lib_deps} @@ -97,7 +97,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${LilyGo_TBeam_SX1276.lib_deps} ; ${esp32_ota.lib_deps} @@ -118,7 +118,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_TBeam_SX1276.lib_deps} ${esp32_ota.lib_deps} @@ -134,7 +134,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${LilyGo_TBeam_SX1276.lib_deps} ${esp32_ota.lib_deps} @@ -142,4 +142,4 @@ lib_deps = [env:Tbeam_SX1276_kiss_modem] extends = LilyGo_TBeam_SX1276 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini index a4dfb814b9..f2d267822e 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini @@ -57,7 +57,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -79,7 +79,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${T_Beam_S3_Supreme_SX1262.lib_deps} ; ${esp32_ota.lib_deps} @@ -99,7 +99,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -116,7 +116,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} ${esp32_ota.lib_deps} @@ -125,7 +125,7 @@ lib_deps = extends = T_Beam_S3_Supreme_SX1262 build_flags = ${T_Beam_S3_Supreme_SX1262.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -136,8 +136,8 @@ build_flags = build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -146,7 +146,7 @@ lib_deps = extends = T_Beam_S3_Supreme_SX1262 build_flags = ${T_Beam_S3_Supreme_SX1262.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -160,8 +160,8 @@ build_flags = build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${T_Beam_S3_Supreme_SX1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -169,4 +169,4 @@ lib_deps = [env:T_Beam_S3_Supreme_SX1262_kiss_modem] extends = T_Beam_S3_Supreme_SX1262 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_tdeck/platformio.ini b/variants/lilygo_tdeck/platformio.ini index 2ee2283a5b..9a96325f55 100644 --- a/variants/lilygo_tdeck/platformio.ini +++ b/variants/lilygo_tdeck/platformio.ini @@ -67,15 +67,15 @@ lib_deps = extends = LilyGo_TDeck build_flags = ${LilyGo_TDeck.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${LilyGo_TDeck.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TDeck.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -84,7 +84,7 @@ lib_deps = extends = LilyGo_TDeck build_flags = ${LilyGo_TDeck.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -92,8 +92,8 @@ build_flags = build_src_filter = ${LilyGo_TDeck.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TDeck.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -108,7 +108,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${LilyGo_TDeck.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> + lib_deps = ${LilyGo_TDeck.lib_deps} @@ -117,4 +117,4 @@ lib_deps = [env:LilyGo_TDeck_kiss_modem] extends = LilyGo_TDeck build_src_filter = ${LilyGo_TDeck.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_techo/platformio.ini b/variants/lilygo_techo/platformio.ini index 2b9e37ee13..cc1f9c0375 100644 --- a/variants/lilygo_techo/platformio.ini +++ b/variants/lilygo_techo/platformio.ini @@ -53,7 +53,7 @@ upload_protocol = nrfutil [env:LilyGo_T-Echo_repeater] extends = LilyGo_T-Echo build_src_filter = ${LilyGo_T-Echo.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${LilyGo_T-Echo.build_flags} -D ADVERT_NAME='"T-Echo Repeater"' @@ -67,7 +67,7 @@ build_flags = [env:LilyGo_T-Echo_room_server] extends = LilyGo_T-Echo build_src_filter = ${LilyGo_T-Echo.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${LilyGo_T-Echo.build_flags} -D ADVERT_NAME='"T-Echo Room"' @@ -84,7 +84,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D QSPIFLASH=1 @@ -99,8 +99,8 @@ build_flags = -D AUTO_SHUTDOWN_MILLIVOLTS=3300 build_src_filter = ${LilyGo_T-Echo.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T-Echo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -112,7 +112,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -121,8 +121,8 @@ build_flags = -D AUTO_SHUTDOWN_MILLIVOLTS=3300 -D QSPIFLASH=1 build_src_filter = ${LilyGo_T-Echo.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T-Echo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -130,4 +130,4 @@ lib_deps = [env:LilyGo_T-Echo_kiss_modem] extends = LilyGo_T-Echo build_src_filter = ${LilyGo_T-Echo.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_techo_card/platformio.ini b/variants/lilygo_techo_card/platformio.ini index f92d950c02..ccfcbd4097 100644 --- a/variants/lilygo_techo_card/platformio.ini +++ b/variants/lilygo_techo_card/platformio.ini @@ -38,7 +38,7 @@ upload_protocol = nrfutil [env:LilyGo_T-Echo_Card_repeater] extends = LilyGo_T-Echo_Card build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${LilyGo_T-Echo_Card.build_flags} -D ADVERT_NAME='"T-Echo Card Repeater"' @@ -52,7 +52,7 @@ build_flags = [env:LilyGo_T-Echo_Card_room_server] extends = LilyGo_T-Echo_Card build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${LilyGo_T-Echo_Card.build_flags} -D ADVERT_NAME='"T-Echo Card Room"' @@ -69,7 +69,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo_Card.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-tiny + -I firmware/companion_radio/ui-tiny -D PIN_BUZZER=38 -D QSPIFLASH=1 -D MAX_CONTACTS=350 @@ -84,8 +84,8 @@ build_flags = -D AUTO_SHUTDOWN_MILLIVOLTS=3300 build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-tiny/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-tiny/*.cpp> + lib_deps = ${LilyGo_T-Echo_Card.lib_deps} @@ -99,7 +99,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo_Card.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-tiny + -I firmware/companion_radio/ui-tiny -D PIN_BUZZER=38 -D QSPIFLASH=1 -D MAX_CONTACTS=350 @@ -111,8 +111,8 @@ build_flags = ; -D MESH_DEBUG=1 -D AUTO_SHUTDOWN_MILLIVOLTS=3300 build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-tiny/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-tiny/*.cpp> + lib_deps = ${LilyGo_T-Echo_Card.lib_deps} diff --git a/variants/lilygo_techo_lite/platformio.ini b/variants/lilygo_techo_lite/platformio.ini index 288c2388a2..534a9aabe9 100644 --- a/variants/lilygo_techo_lite/platformio.ini +++ b/variants/lilygo_techo_lite/platformio.ini @@ -48,7 +48,7 @@ upload_protocol = nrfutil [env:LilyGo_T-Echo-Lite_repeater] extends = LilyGo_T-Echo-Lite build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${LilyGo_T-Echo-Lite.build_flags} -D ADVERT_NAME='"T-Echo-Lite Repeater"' @@ -62,7 +62,7 @@ build_flags = [env:LilyGo_T-Echo-Lite_room_server] extends = LilyGo_T-Echo-Lite build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${LilyGo_T-Echo-Lite.build_flags} -D ADVERT_NAME='"T-Echo-Lite Room"' @@ -79,7 +79,7 @@ board_upload.maximum_size = 712704 build_flags = ${LilyGo_T-Echo-Lite.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D QSPIFLASH=1 @@ -93,8 +93,8 @@ build_flags = -D AUTO_SHUTDOWN_MILLIVOLTS=3300 build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_T-Echo-Lite.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -111,7 +111,7 @@ build_flags = -I lib/nrf52/s140_nrf52_6.1.1_API/include -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52 -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D LILYGO_TECHO -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper @@ -139,7 +139,7 @@ build_src_filter = ${nrf52_base.build_src_filter} + +<../variants/lilygo_techo_lite> + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${LilyGo_T-Echo-Lite.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -156,7 +156,7 @@ build_flags = -I lib/nrf52/s140_nrf52_6.1.1_API/include -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52 -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D LILYGO_TECHO -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper @@ -182,7 +182,7 @@ build_src_filter = ${nrf52_base.build_src_filter} + + +<../variants/lilygo_techo_lite> - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${LilyGo_T-Echo-Lite.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -190,4 +190,4 @@ lib_deps = [env:LilyGo_T-Echo-Lite_kiss_modem] extends = LilyGo_T-Echo-Lite build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_teth_elite/platformio.ini b/variants/lilygo_teth_elite/platformio.ini index 577c655b6b..3f9ff12a88 100644 --- a/variants/lilygo_teth_elite/platformio.ini +++ b/variants/lilygo_teth_elite/platformio.ini @@ -43,7 +43,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${LilyGo_TETH_Elite_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -60,7 +60,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${LilyGo_TETH_Elite_sx1262.lib_deps} ${esp32_ota.lib_deps} @@ -75,7 +75,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${LilyGo_TETH_Elite_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -93,7 +93,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter} + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${LilyGo_TETH_Elite_sx1262.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini index 22d9b50ce8..2c10c65305 100644 --- a/variants/lilygo_tlora_c6/platformio.ini +++ b/variants/lilygo_tlora_c6/platformio.ini @@ -34,7 +34,7 @@ build_src_filter = ${esp32c6_base.build_src_filter} [env:LilyGo_Tlora_C6_repeater_] extends = tlora_c6 build_src_filter = ${tlora_c6.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${tlora_c6.build_flags} -D ADVERT_NAME='"Tlora C6 Repeater"' @@ -51,7 +51,7 @@ lib_deps = [env:LilyGo_Tlora_C6_room_server_] extends = tlora_c6 build_src_filter = ${tlora_c6.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${tlora_c6.build_flags} -D ADVERT_NAME='"Tlora C6 Room"' @@ -80,7 +80,7 @@ build_flags = ${tlora_c6.build_flags} build_src_filter = ${tlora_c6.build_src_filter} + - - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${tlora_c6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -88,4 +88,4 @@ lib_deps = [env:LilyGo_Tlora_C6_kiss_modem] extends = tlora_c6 build_src_filter = ${tlora_c6.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini index 6b25e2e34d..554b00648b 100644 --- a/variants/lilygo_tlora_v2_1/platformio.ini +++ b/variants/lilygo_tlora_v2_1/platformio.ini @@ -41,7 +41,7 @@ lib_deps = [env:LilyGo_TLora_V2_1_1_6_repeater] extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D ADVERT_NAME='"TLora-V2.1-1.6 Repeater"' @@ -65,7 +65,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -74,15 +74,15 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -91,7 +91,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 @@ -102,8 +102,8 @@ build_flags = build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -112,7 +112,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D ADVERT_NAME='"TLora-V2.1-1.6 Room"' @@ -130,7 +130,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=8 -D WIFI_SSID='"ssid"' @@ -140,8 +140,8 @@ build_flags = build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${LilyGo_TLora_V2_1_1_6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -153,7 +153,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D ADVERT_NAME='"RS232 Bridge"' @@ -176,7 +176,7 @@ lib_deps = extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${LilyGo_TLora_V2_1_1_6.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -196,4 +196,4 @@ lib_deps = [env:LilyGo_TLora_V2_1_1_6_kiss_modem] extends = LilyGo_TLora_V2_1_1_6 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/m5stack_unit_c6l/platformio.ini b/variants/m5stack_unit_c6l/platformio.ini index 1220920829..2358114bd1 100644 --- a/variants/m5stack_unit_c6l/platformio.ini +++ b/variants/m5stack_unit_c6l/platformio.ini @@ -39,7 +39,7 @@ lib_deps = [env:M5Stack_Unit_C6L_repeater] extends = M5Stack_Unit_C6L build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${M5Stack_Unit_C6L.build_flags} -D ADVERT_NAME='"Unit C6L Repeater"' @@ -56,7 +56,7 @@ lib_deps = [env:M5Stack_Unit_C6L_room_server] extends = M5Stack_Unit_C6L build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${M5Stack_Unit_C6L.build_flags} -D ADVERT_NAME='"Unit C6L Room"' @@ -83,7 +83,7 @@ build_flags = ${M5Stack_Unit_C6L.build_flags} build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} + - - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${M5Stack_Unit_C6L.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -100,7 +100,7 @@ build_flags = ${M5Stack_Unit_C6L.build_flags} build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} + - - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${M5Stack_Unit_C6L.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,4 +109,4 @@ lib_deps = [env:M5Stack_Unit_C6L_kiss_modem] extends = M5Stack_Unit_C6L build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/mesh_pocket/platformio.ini b/variants/mesh_pocket/platformio.ini index b9b1cf27dc..eb8ad25b6f 100644 --- a/variants/mesh_pocket/platformio.ini +++ b/variants/mesh_pocket/platformio.ini @@ -37,7 +37,7 @@ upload_protocol = nrfutil [env:Mesh_pocket_repeater] extends = Mesh_pocket build_src_filter = ${Mesh_pocket.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Mesh_pocket.build_flags} @@ -52,7 +52,7 @@ build_flags = [env:Mesh_pocket_room_server] extends = Mesh_pocket build_src_filter = ${Mesh_pocket.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Mesh_pocket.build_flags} -D ADVERT_NAME='"Heltec_Mesh_Pocket Room"' @@ -69,7 +69,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Mesh_pocket.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -81,8 +81,8 @@ build_flags = build_src_filter = ${Mesh_pocket.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Mesh_pocket.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -93,7 +93,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Mesh_pocket.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D AUTO_OFF_MILLIS=0 @@ -103,8 +103,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Mesh_pocket.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Mesh_pocket.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -112,4 +112,4 @@ lib_deps = [env:Mesh_pocket_kiss_modem] extends = Mesh_pocket build_src_filter = ${Mesh_pocket.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini index 85464f5301..e3b6d17514 100644 --- a/variants/meshadventurer/platformio.ini +++ b/variants/meshadventurer/platformio.ini @@ -38,7 +38,7 @@ lib_deps = [env:Meshadventurer_sx1262_repeater] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -59,7 +59,7 @@ lib_deps = ; extends = Meshadventurer ; build_src_filter = ${Meshadventurer.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; build_flags = ; ${Meshadventurer.build_flags} ; -D RADIO_CLASS=CustomSX1262 @@ -84,7 +84,7 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -106,7 +106,7 @@ lib_deps = [env:Meshadventurer_sx1268_repeater] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -127,7 +127,7 @@ lib_deps = ; extends = Meshadventurer ; build_src_filter = ${Meshadventurer.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; + ; build_flags = ; ${Meshadventurer.build_flags} @@ -153,7 +153,7 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -175,11 +175,11 @@ lib_deps = [env:Meshadventurer_sx1262_companion_radio_usb] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> build_flags = ${Meshadventurer.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 @@ -196,11 +196,11 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> build_flags = ${Meshadventurer.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 @@ -227,7 +227,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Meshadventurer.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -247,7 +247,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Meshadventurer.lib_deps} ${esp32_ota.lib_deps} @@ -255,11 +255,11 @@ lib_deps = [env:Meshadventurer_sx1268_companion_radio_usb] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> build_flags = ${Meshadventurer.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -276,11 +276,11 @@ lib_deps = extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> build_flags = ${Meshadventurer.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -307,7 +307,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Meshadventurer.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -327,7 +327,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${Meshadventurer.lib_deps} ${esp32_ota.lib_deps} @@ -335,7 +335,7 @@ lib_deps = [env:Meshadventurer_sx1262_kiss_modem] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper @@ -344,7 +344,7 @@ build_flags = ${Meshadventurer.build_flags} [env:Meshadventurer_sx1268_kiss_modem] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> build_flags = ${Meshadventurer.build_flags} -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper diff --git a/variants/meshtiny/platformio.ini b/variants/meshtiny/platformio.ini index adb44c179b..2b36cbbfd0 100644 --- a/variants/meshtiny/platformio.ini +++ b/variants/meshtiny/platformio.ini @@ -29,7 +29,7 @@ lib_deps = extends = Meshtiny build_flags = ${Meshtiny.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MESHTINY -D PIN_BUZZER=30 -D DISPLAY_CLASS=SSD1306Display @@ -39,8 +39,8 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Meshtiny.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Meshtiny.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -49,7 +49,7 @@ lib_deps = extends = Meshtiny build_flags = ${Meshtiny.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MESHTINY -D PIN_BUZZER=30 -D DISPLAY_CLASS=SSD1306Display @@ -62,8 +62,8 @@ build_flags = ; -D BLE_DEBUG_LOGGING=1 build_src_filter = ${Meshtiny.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Meshtiny.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -71,4 +71,4 @@ lib_deps = [env:Meshtiny_kiss_modem] extends = Meshtiny build_src_filter = ${Meshtiny.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/minewsemi_me25ls01/platformio.ini b/variants/minewsemi_me25ls01/platformio.ini index 2cbf25f41c..a6a509f2cc 100644 --- a/variants/minewsemi_me25ls01/platformio.ini +++ b/variants/minewsemi_me25ls01/platformio.ini @@ -41,7 +41,7 @@ extends = me25ls01 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${me25ls01.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -56,8 +56,8 @@ build_flags = ${me25ls01.build_flags} ;-D PIN_BUZZER_EN=37 build_src_filter = ${me25ls01.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> [env:Minewsemi_me25ls01_repeater] extends = me25ls01 @@ -78,7 +78,7 @@ build_flags = ${me25ls01.build_flags} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:Minewsemi_me25ls01_room_server] extends = me25ls01 @@ -100,7 +100,7 @@ build_flags = ${me25ls01.build_flags} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:Minewsemi_me25ls01_terminal_chat] extends = me25ls01 @@ -122,14 +122,14 @@ build_flags = ${me25ls01.build_flags} -D MAX_NEIGHBOURS=50 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> [env:Minewsemi_me25ls01_companion_radio_usb] extends = me25ls01 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${me25ls01.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ;-D BLE_PIN_CODE=123456 @@ -142,10 +142,10 @@ build_flags = ${me25ls01.build_flags} -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> [env:Minewsemi_me25ls01_kiss_modem] extends = me25ls01 build_src_filter = ${me25ls01.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/muziworks_r1_neo/platformio.ini b/variants/muziworks_r1_neo/platformio.ini index 3c81082b0f..c54e064157 100644 --- a/variants/muziworks_r1_neo/platformio.ini +++ b/variants/muziworks_r1_neo/platformio.ini @@ -41,7 +41,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:R1Neo_room_server] extends = R1Neo @@ -55,7 +55,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:R1Neo_companion_radio_usb] extends = R1Neo @@ -63,15 +63,15 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${R1Neo.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${R1Neo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -83,7 +83,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${R1Neo.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D ENV_INCLUDE_GPS=1 -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -95,8 +95,8 @@ build_flags = build_src_filter = ${R1Neo.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${R1Neo.lib_deps} ${rak4631.lib_deps} @@ -112,7 +112,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${R1Neo.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -129,9 +129,9 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 build_src_filter = ${R1Neo.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> [env:R1Neo_kiss_modem] extends = R1Neo build_src_filter = ${R1Neo.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini index 5ae1b33dee..034821ae40 100644 --- a/variants/nano_g2_ultra/platformio.ini +++ b/variants/nano_g2_ultra/platformio.ini @@ -38,7 +38,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Nano_G2_Ultra.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:Nano_G2_Ultra_room_server] extends = Nano_G2_Ultra @@ -54,7 +54,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Nano_G2_Ultra.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:Nano_G2_Ultra_companion_radio_ble] extends = Nano_G2_Ultra @@ -63,7 +63,7 @@ board_upload.maximum_size = 712704 build_flags = ${Nano_G2_Ultra.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -79,8 +79,8 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Nano_G2_Ultra.lib_deps} densaugeo/base64 @ ~1.4.0 end2endzone/NonBlockingRTTTL@^1.3.0 @@ -92,7 +92,7 @@ board_upload.maximum_size = 712704 build_flags = ${Nano_G2_Ultra.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D QSPIFLASH=1 @@ -105,8 +105,8 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Nano_G2_Ultra.lib_deps} densaugeo/base64 @ ~1.4.0 end2endzone/NonBlockingRTTTL@^1.3.0 @@ -114,4 +114,4 @@ lib_deps = ${Nano_G2_Ultra.lib_deps} [env:Nano_G2_Ultra_kiss_modem] extends = Nano_G2_Ultra build_src_filter = ${Nano_G2_Ultra.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/nibble_screen_connect/platformio.ini b/variants/nibble_screen_connect/platformio.ini index f1da4c63f8..061ea87db8 100644 --- a/variants/nibble_screen_connect/platformio.ini +++ b/variants/nibble_screen_connect/platformio.ini @@ -46,7 +46,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${nibble_screen_connect_base.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${nibble_screen_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -65,7 +65,7 @@ build_flags = build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${nibble_screen_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -77,7 +77,7 @@ build_flags = -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=1 build_src_filter = ${nibble_screen_connect_base.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -94,7 +94,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${nibble_screen_connect_base.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${nibble_screen_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -103,15 +103,15 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -120,7 +120,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -131,8 +131,8 @@ build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -141,7 +141,7 @@ lib_deps = extends = nibble_screen_connect_base build_flags = ${nibble_screen_connect_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -153,8 +153,8 @@ build_src_filter = ${nibble_screen_connect_base.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_screen_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -163,4 +163,4 @@ lib_deps = [env:nibble_screen_connect_kiss_modem_] extends = nibble_screen_connect_base build_src_filter = ${nibble_screen_connect_base.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/nibble_zero_connect/platformio.ini b/variants/nibble_zero_connect/platformio.ini index 1ac9a9789a..d878aafbfe 100644 --- a/variants/nibble_zero_connect/platformio.ini +++ b/variants/nibble_zero_connect/platformio.ini @@ -43,7 +43,7 @@ build_flags = -D MAX_NEIGHBOURS=50 build_src_filter = ${nibble_zero_connect_base.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${nibble_zero_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -62,7 +62,7 @@ build_flags = build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${nibble_zero_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -74,7 +74,7 @@ build_flags = -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=1 build_src_filter = ${nibble_zero_connect_base.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -91,7 +91,7 @@ build_flags = -D ROOM_PASSWORD='"hello"' build_src_filter = ${nibble_zero_connect_base.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${nibble_zero_connect_base.lib_deps} ${esp32_ota.lib_deps} @@ -100,15 +100,15 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -117,7 +117,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -128,8 +128,8 @@ build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -138,7 +138,7 @@ lib_deps = extends = nibble_zero_connect_base build_flags = ${nibble_zero_connect_base.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=300 -D MAX_GROUP_CHANNELS=8 @@ -149,8 +149,8 @@ build_src_filter = ${nibble_zero_connect_base.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${nibble_zero_connect_base.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index 4b9f2104c5..1fc242e86b 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -38,7 +38,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:ProMicro_repeater] extends = Promicro build_src_filter = ${Promicro.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> + + build_flags = @@ -57,7 +57,7 @@ lib_deps = ${Promicro.lib_deps} [env:ProMicro_repeater_bridge_rs232_serial1] extends = Promicro build_src_filter = ${Promicro.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> + + + @@ -82,7 +82,7 @@ lib_deps = ${Promicro.lib_deps} [env:ProMicro_room_server] extends = Promicro build_src_filter = ${Promicro.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> + + build_flags = ${Promicro.build_flags} @@ -105,7 +105,7 @@ build_flags = ${Promicro.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Promicro.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Promicro.lib_deps} densaugeo/base64 @ ~1.4.0 adafruit/RTClib @ ^2.1.3 @@ -115,7 +115,7 @@ extends = Promicro board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Promicro.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -124,8 +124,8 @@ build_flags = ${Promicro.build_flags} build_src_filter = ${Promicro.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Promicro.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -135,7 +135,7 @@ extends = Promicro board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${Promicro.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -148,8 +148,8 @@ build_src_filter = ${Promicro.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Promicro.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -168,11 +168,11 @@ build_flags = build_src_filter = ${Promicro.build_src_filter} + + - +<../apps/simple_sensor> + +<../firmware/simple_sensor> lib_deps = ${Promicro.lib_deps} [env:ProMicro_kiss_modem] extends = Promicro build_src_filter = ${Promicro.build_src_filter} - +<../apps/kiss_modem/> \ No newline at end of file + +<../firmware/kiss_modem/> \ No newline at end of file diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini index 3926a21fa7..d7f159f890 100644 --- a/variants/rak11310/platformio.ini +++ b/variants/rak11310/platformio.ini @@ -47,7 +47,7 @@ build_flags = ${rak11310.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:RAK_11310_repeater_bridge_rs232] extends = rak11310 @@ -65,7 +65,7 @@ build_flags = ${rak11310.build_flags} ; -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:RAK_11310_room_server] extends = rak11310 @@ -78,7 +78,7 @@ build_flags = ${rak11310.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:RAK_11310_companion_radio_usb] extends = rak11310 @@ -88,7 +88,7 @@ build_flags = ${rak11310.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${rak11310.lib_deps} densaugeo/base64 @ ~1.4.0 lib_ignore = BLE @@ -103,7 +103,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rak11310.build_src_filter} -; +<../apps/companion_radio/*.cpp> +; +<../firmware/companion_radio/*.cpp> ; lib_deps = ${rak11310.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -118,7 +118,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rak11310.build_src_filter} -; +<../apps/companion_radio/*.cpp> +; +<../firmware/companion_radio/*.cpp> ; lib_deps = ${rak11310.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -130,11 +130,11 @@ build_flags = ${rak11310.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak11310.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${rak11310.lib_deps} densaugeo/base64 @ ~1.4.0 [env:RAK_11310_kiss_modem] extends = rak11310 build_src_filter = ${rak11310.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/rak3112/platformio.ini b/variants/rak3112/platformio.ini index 6f27dc8115..f96357d82e 100644 --- a/variants/rak3112/platformio.ini +++ b/variants/rak3112/platformio.ini @@ -50,7 +50,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -73,7 +73,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -93,7 +93,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -110,7 +110,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -124,7 +124,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -133,14 +133,14 @@ lib_deps = extends = rak3112 build_flags = ${rak3112.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -149,7 +149,7 @@ lib_deps = extends = rak3112 build_flags = ${rak3112.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 ; dynamic, random PIN @@ -160,8 +160,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -170,7 +170,7 @@ lib_deps = extends = rak3112 build_flags = ${rak3112.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 @@ -181,8 +181,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${rak3112.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -200,7 +200,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak3112.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> lib_deps = ${rak3112.lib_deps} ${esp32_ota.lib_deps} @@ -208,4 +208,4 @@ lib_deps = [env:RAK_3112_kiss_modem] extends = rak3112 build_src_filter = ${rak3112.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/rak3401/platformio.ini b/variants/rak3401/platformio.ini index e310b523be..ddd5ccec78 100644 --- a/variants/rak3401/platformio.ini +++ b/variants/rak3401/platformio.ini @@ -38,7 +38,7 @@ build_flags = ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:RAK_3401_room_server] extends = rak3401 @@ -54,7 +54,7 @@ build_flags = ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:RAK_3401_companion_radio_usb] extends = rak3401 @@ -62,7 +62,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak3401.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 @@ -70,8 +70,8 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${rak3401.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -82,7 +82,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak3401.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display -D MAX_CONTACTS=350 @@ -94,8 +94,8 @@ build_flags = ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${rak3401.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -109,7 +109,7 @@ build_flags = ;-D MESH_PACKET_LOGGING=1 ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${rak3401.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -127,9 +127,9 @@ build_flags = ;-D MESH_DEBUG=1 build_src_filter = ${rak3401.build_src_filter} + - +<../apps/simple_sensor> + +<../firmware/simple_sensor> [env:RAK_3401_kiss_modem] extends = rak3401 build_src_filter = ${rak3401.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/rak3x72/platformio.ini b/variants/rak3x72/platformio.ini index cd9900d13e..f25c5cd8cc 100644 --- a/variants/rak3x72/platformio.ini +++ b/variants/rak3x72/platformio.ini @@ -21,7 +21,7 @@ build_flags = ${rak3x72.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${rak3x72.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [env:RAK_3x72_sensor] extends = rak3x72 @@ -29,7 +29,7 @@ build_flags = ${rak3x72.build_flags} -D ADVERT_NAME='"RAK3x72 Sensor"' -D ADMIN_PASSWORD='"password"' build_src_filter = ${rak3x72.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> [env:RAK_3x72_companion_radio_usb] extends = rak3x72 @@ -38,11 +38,11 @@ build_flags = ${rak3x72.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 build_src_filter = ${rak3x72.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${rak3x72.lib_deps} densaugeo/base64 @ ~1.4.0 [env:RAK_3x72_kiss_modem] extends = rak3x72 build_src_filter = ${rak3x72.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini index f22a3a0452..c21eb52517 100644 --- a/variants/rak4631/platformio.ini +++ b/variants/rak4631/platformio.ini @@ -51,7 +51,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:RAK_4631_repeater_ethernet] extends = rak4631 @@ -67,7 +67,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${rak4631.lib_deps} https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip @@ -93,7 +93,7 @@ build_flags = build_src_filter = ${rak4631.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:RAK_4631_repeater_bridge_rs232_serial2] extends = rak4631 @@ -116,7 +116,7 @@ build_flags = build_src_filter = ${rak4631.build_src_filter} + + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:RAK_4631_room_server] extends = rak4631 @@ -132,7 +132,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:RAK_4631_room_server_ethernet] extends = rak4631 @@ -148,7 +148,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${rak4631.lib_deps} https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip @@ -159,7 +159,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak4631.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D PIN_USER_BTN=9 -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display @@ -168,8 +168,8 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${rak4631.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -183,7 +183,7 @@ build_unflags = -D EXTRAFS=1 build_flags = ${rak4631.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D PIN_USER_BTN=9 -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display @@ -194,8 +194,8 @@ build_flags = ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; -D ETHERNET_DEBUG_LOGGING=1 build_src_filter = ${rak4631.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + lib_deps = ${rak4631.lib_deps} @@ -209,7 +209,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak4631.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D PIN_USER_BTN=9 -D PIN_USER_BTN_ANA=31 -D DISPLAY_CLASS=SSD1306Display @@ -222,8 +222,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${rak4631.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -239,7 +239,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${rak4631.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -257,13 +257,13 @@ build_flags = -D MESH_DEBUG=1 build_src_filter = ${rak4631.build_src_filter} + - +<../apps/simple_sensor> + +<../firmware/simple_sensor> [env:RAK_4631_kiss_modem] extends = rak4631 build_flags = ${rak4631.build_flags} build_src_filter = ${rak4631.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> lib_deps = ${rak4631.lib_deps} diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini index 45f09adf33..c922c51a8a 100644 --- a/variants/rak_wismesh_tag/platformio.ini +++ b/variants/rak_wismesh_tag/platformio.ini @@ -46,7 +46,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak_wismesh_tag.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:RAK_WisMesh_Tag_room_server] extends = rak_wismesh_tag @@ -60,7 +60,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak_wismesh_tag.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:RAK_WisMesh_Tag_companion_radio_usb] extends = rak_wismesh_tag @@ -68,15 +68,15 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak_wismesh_tag.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rak_wismesh_tag.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${rak_wismesh_tag.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -88,7 +88,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 712704 build_flags = ${rak_wismesh_tag.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -100,8 +100,8 @@ build_flags = build_src_filter = ${rak_wismesh_tag.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${rak_wismesh_tag.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -118,9 +118,9 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rak_wismesh_tag.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> [env:RAK_WisMesh_Tag_kiss_modem] extends = rak_wismesh_tag build_src_filter = ${rak_wismesh_tag.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini index 9327bc1f1a..aad229c4ba 100644 --- a/variants/rpi_picow/platformio.ini +++ b/variants/rpi_picow/platformio.ini @@ -38,7 +38,7 @@ build_flags = ${rpi_picow.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:PicoW_room_server] extends = rpi_picow @@ -51,7 +51,7 @@ build_flags = ${rpi_picow.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:PicoW_companion_radio_usb] extends = rpi_picow @@ -61,7 +61,7 @@ build_flags = ${rpi_picow.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${rpi_picow.lib_deps} densaugeo/base64 @ ~1.4.0 lib_ignore = BLE @@ -76,7 +76,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rpi_picow.build_src_filter} -; +<../apps/companion_radio/*.cpp> +; +<../firmware/companion_radio/*.cpp> ; lib_deps = ${rpi_picow.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -91,7 +91,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${rpi_picow.build_src_filter} -; +<../apps/companion_radio/*.cpp> +; +<../firmware/companion_radio/*.cpp> ; lib_deps = ${rpi_picow.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -103,11 +103,11 @@ build_flags = ${rpi_picow.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${rpi_picow.lib_deps} densaugeo/base64 @ ~1.4.0 [env:PicoW_kiss_modem] extends = rpi_picow build_src_filter = ${rpi_picow.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/sensecap_indicator-espnow/platformio.ini b/variants/sensecap_indicator-espnow/platformio.ini index 650f084fa1..cea98343bc 100644 --- a/variants/sensecap_indicator-espnow/platformio.ini +++ b/variants/sensecap_indicator-espnow/platformio.ini @@ -36,15 +36,15 @@ lib_deps=${esp32_base.lib_deps} extends =SenseCapIndicator-ESPNow build_flags = ${SenseCapIndicator-ESPNow.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D ESPNOW_DEBUG_LOGGING=1 build_src_filter = ${SenseCapIndicator-ESPNow.build_src_filter} - +<../apps/companion_radio/ui-new/*.cpp> - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${SenseCapIndicator-ESPNow.lib_deps} densaugeo/base64 @ ~1.4.0 \ No newline at end of file diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini index d217418cb0..de7eee617d 100644 --- a/variants/sensecap_solar/platformio.ini +++ b/variants/sensecap_solar/platformio.ini @@ -49,7 +49,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${SenseCap_Solar.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [env:SenseCap_Solar_room_server] extends = SenseCap_Solar @@ -62,7 +62,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${SenseCap_Solar.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> [env:SenseCap_Solar_companion_radio_ble] extends = SenseCap_Solar @@ -79,7 +79,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${SenseCap_Solar.build_src_filter} + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${SenseCap_Solar.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -96,7 +96,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${SenseCap_Solar.build_src_filter} + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${SenseCap_Solar.lib_deps} densaugeo/base64 @ ~1.4.0 diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini index 410b76542e..3c91c0d82b 100644 --- a/variants/station_g2/platformio.ini +++ b/variants/station_g2/platformio.ini @@ -54,7 +54,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -76,7 +76,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Station_G2.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${Station_G2.lib_deps} ; ${esp32_ota.lib_deps} @@ -96,7 +96,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -115,7 +115,7 @@ build_flags = ; https://wiki.uniteng.com/en/meshtastic/station-g2#impact-of-lora-node-dense-areashigh-noise-environments-on-rf-performance ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -138,7 +138,7 @@ lib_deps = ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Station_G2.build_src_filter} ; + -; +<../apps/simple_repeater> +; +<../firmware/simple_repeater> ; lib_deps = ; ${Station_G2.lib_deps} ; ${esp32_ota.lib_deps} @@ -159,7 +159,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} @@ -167,7 +167,7 @@ lib_deps = [env:Station_G2_room_server] extends = Station_G2 build_src_filter = ${Station_G2.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Station_G2.build_flags} -D ADVERT_NAME='"Station G2 Room"' @@ -185,15 +185,15 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -202,7 +202,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -212,8 +212,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -222,7 +222,7 @@ lib_deps = extends = Station_G2 build_flags = ${Station_G2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 @@ -233,8 +233,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G2.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -242,4 +242,4 @@ lib_deps = [env:Station_G2_kiss_modem] extends = Station_G2 build_src_filter = ${Station_G2.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/station_g3_esp32/platformio.ini b/variants/station_g3_esp32/platformio.ini index 547af7b302..72f3f537bf 100644 --- a/variants/station_g3_esp32/platformio.ini +++ b/variants/station_g3_esp32/platformio.ini @@ -57,7 +57,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Station_G3_ESP32.lib_deps} ${esp32_ota.lib_deps} @@ -74,7 +74,7 @@ build_flags = -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${Station_G3_ESP32.lib_deps} ${esp32_ota.lib_deps} @@ -82,7 +82,7 @@ lib_deps = [env:Station_G3_ESP32_room_server] extends = Station_G3_ESP32 build_src_filter = ${Station_G3_ESP32.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Station_G3_ESP32.build_flags} -D ADVERT_NAME='"Station G3 ESP32 Room"' @@ -100,15 +100,15 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G3_ESP32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -117,7 +117,7 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -127,8 +127,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G3_ESP32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -137,7 +137,7 @@ lib_deps = extends = Station_G3_ESP32 build_flags = ${Station_G3_ESP32.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 @@ -148,8 +148,8 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${Station_G3_ESP32.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Station_G3_ESP32.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -157,4 +157,4 @@ lib_deps = [env:Station_G3_ESP32_kiss_modem] extends = Station_G3_ESP32 build_src_filter = ${Station_G3_ESP32.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/t1000-e/platformio.ini b/variants/t1000-e/platformio.ini index 08a1811ed0..b52fa19c13 100644 --- a/variants/t1000-e/platformio.ini +++ b/variants/t1000-e/platformio.ini @@ -38,7 +38,7 @@ upload_protocol = nrfutil [env:t1000e_repeater] extends = t1000-e build_flags = ${t1000-e.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D ADVERT_NAME='"t1000-e Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -47,14 +47,14 @@ build_flags = ${t1000-e.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${t1000-e.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${t1000-e.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 [env:t1000e_room_server] extends = t1000-e build_flags = ${t1000-e.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D ADVERT_NAME='"t1000-e Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -64,7 +64,7 @@ build_flags = ${t1000-e.build_flags} ; -D MESH_DEBUG=1 -D RF_SWITCH_TABLE build_src_filter = ${t1000-e.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${t1000-e.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 @@ -73,7 +73,7 @@ extends = t1000-e board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${t1000-e.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -84,8 +84,8 @@ build_flags = ${t1000-e.build_flags} -D PIN_BUZZER_EN=37 ; P1/5 - required for T1000-E build_src_filter = ${t1000-e.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${t1000-e.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -96,7 +96,7 @@ extends = t1000-e board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${t1000-e.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -112,8 +112,8 @@ build_flags = ${t1000-e.build_flags} build_src_filter = ${t1000-e.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${t1000-e.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -122,6 +122,6 @@ lib_deps = ${t1000-e.lib_deps} [env:t1000e_kiss_modem] extends = t1000-e build_src_filter = ${t1000-e.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> lib_deps = ${t1000-e.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 diff --git a/variants/tenstar_c3/platformio.ini b/variants/tenstar_c3/platformio.ini index cba0ae0395..517135e22e 100644 --- a/variants/tenstar_c3/platformio.ini +++ b/variants/tenstar_c3/platformio.ini @@ -26,7 +26,7 @@ build_src_filter = ${esp32_base.build_src_filter} [env:Tenstar_C3_sx1262_repeater] extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -48,7 +48,7 @@ lib_deps = ; extends = Tenstar_esp32_C3 ; build_src_filter = ${Tenstar_esp32_C3.build_src_filter} ; + -; +<../apps/simple_repeater/*.cpp> +; +<../firmware/simple_repeater/*.cpp> ; build_flags = ; ${Tenstar_esp32_C3.build_flags} ; -D RADIO_CLASS=CustomSX1262 @@ -74,7 +74,7 @@ lib_deps = extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -97,7 +97,7 @@ lib_deps = [env:Tenstar_C3_sx1268_repeater] extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -118,7 +118,7 @@ lib_deps = ; extends = Tenstar_esp32_C3 ; build_src_filter = ${Tenstar_esp32_C3.build_src_filter} ; + -; +<../apps/simple_repeater/*.cpp> +; +<../firmware/simple_repeater/*.cpp> ; build_flags = ; ${Tenstar_esp32_C3.build_flags} ; -D RADIO_CLASS=CustomSX1268 @@ -143,7 +143,7 @@ lib_deps = extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1268 @@ -165,7 +165,7 @@ lib_deps = [env:Tenstar_C3_sx1262_kiss_modem] extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1262 @@ -175,7 +175,7 @@ build_flags = [env:Tenstar_C3_sx1268_kiss_modem] extends = Tenstar_esp32_C3 build_src_filter = ${Tenstar_esp32_C3.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> build_flags = ${Tenstar_esp32_C3.build_flags} -D RADIO_CLASS=CustomSX1268 diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini index 6dd0749a06..1723bcac1b 100644 --- a/variants/thinknode_m1/platformio.ini +++ b/variants/thinknode_m1/platformio.ini @@ -46,7 +46,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> lib_deps = ${ThinkNode_M1.lib_deps} @@ -62,7 +62,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M1.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> lib_deps = ${ThinkNode_M1.lib_deps} @@ -73,7 +73,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M1.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -92,8 +92,8 @@ build_src_filter = ${ThinkNode_M1.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -108,7 +108,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M1.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_ROTATION=4 @@ -121,8 +121,8 @@ build_src_filter = ${ThinkNode_M1.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M1.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -133,4 +133,4 @@ lib_deps = [env:ThinkNode_M1_kiss_modem] extends = ThinkNode_M1 build_src_filter = ${ThinkNode_M1.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini index 30decbf9a1..2d72d867d9 100644 --- a/variants/thinknode_m2/platformio.ini +++ b/variants/thinknode_m2/platformio.ini @@ -42,7 +42,7 @@ lib_deps = ${esp32_base.lib_deps} [env:ThinkNode_M2_Repeater] extends = ThinkNode_M2 build_src_filter = ${ThinkNode_M2.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${ThinkNode_M2.build_flags} -D ADVERT_NAME='"Thinknode M2 Repeater"' @@ -60,7 +60,7 @@ lib_deps = ; extends = ThinkNode_M2 ; build_src_filter = ${ThinkNode_M2.build_src_filter} ; + -; +<../apps/simple_repeater/*.cpp> +; +<../firmware/simple_repeater/*.cpp> ; build_flags = ; ${ThinkNode_M2.build_flags} ; -D ADVERT_NAME='"RS232 Bridge"' @@ -81,7 +81,7 @@ lib_deps = extends = ThinkNode_M2 build_src_filter = ${ThinkNode_M2.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${ThinkNode_M2.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -100,7 +100,7 @@ lib_deps = [env:ThinkNode_M2_room_server] extends = ThinkNode_M2 build_src_filter = ${ThinkNode_M2.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${ThinkNode_M2.build_flags} -D ADVERT_NAME='"Thinknode M2 Room Server"' @@ -123,7 +123,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M2.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -132,7 +132,7 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -144,8 +144,8 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -155,7 +155,7 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -163,8 +163,8 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -174,7 +174,7 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -185,8 +185,8 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -196,7 +196,7 @@ lib_deps = extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D SERIAL_TX=43 @@ -207,8 +207,8 @@ build_src_filter = ${ThinkNode_M2.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M2.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -219,4 +219,4 @@ extends = ThinkNode_M2 build_flags = ${ThinkNode_M2.build_flags} -UPIN_BUZZER build_src_filter = ${ThinkNode_M2.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/thinknode_m3/platformio.ini b/variants/thinknode_m3/platformio.ini index b55f793f67..6ccb953dbd 100644 --- a/variants/thinknode_m3/platformio.ini +++ b/variants/thinknode_m3/platformio.ini @@ -40,7 +40,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:ThinkNode_M3_repeater] extends = ThinkNode_M3 build_flags = ${ThinkNode_M3.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D ADVERT_NAME='"ThinkNode_M3 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -49,14 +49,14 @@ build_flags = ${ThinkNode_M3.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M3.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> lib_deps = ${ThinkNode_M3.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 [env:ThinkNode_M3_room_server] extends = ThinkNode_M3 build_flags = ${ThinkNode_M3.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D ADVERT_NAME='"ThinkNode_M3 Room"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 @@ -66,7 +66,7 @@ build_flags = ${ThinkNode_M3.build_flags} ; -D MESH_DEBUG=1 -D RF_SWITCH_TABLE build_src_filter = ${ThinkNode_M3.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> lib_deps = ${ThinkNode_M3.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 @@ -75,7 +75,7 @@ extends = ThinkNode_M3 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${ThinkNode_M3.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 @@ -86,8 +86,8 @@ build_flags = ${ThinkNode_M3.build_flags} -D PIN_BUZZER_EN=36 build_src_filter = ${ThinkNode_M3.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M3.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -98,7 +98,7 @@ extends = ThinkNode_M3 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${ThinkNode_M3.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -113,8 +113,8 @@ build_flags = ${ThinkNode_M3.build_flags} build_src_filter = ${ThinkNode_M3.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M3.lib_deps} densaugeo/base64 @ ~1.4.0 stevemarple/MicroNMEA @ ^2.0.6 @@ -123,6 +123,6 @@ lib_deps = ${ThinkNode_M3.lib_deps} [env:ThinkNode_M3_kiss_modem] extends = ThinkNode_M3 build_src_filter = ${ThinkNode_M3.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> lib_deps = ${ThinkNode_M3.lib_deps} stevemarple/MicroNMEA @ ^2.0.6 diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini index 6c180980fc..aae63c6004 100644 --- a/variants/thinknode_m5/platformio.ini +++ b/variants/thinknode_m5/platformio.ini @@ -55,7 +55,7 @@ lib_deps = ${esp32_base.lib_deps} [env:ThinkNode_M5_Repeater] extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${ThinkNode_M5.build_flags} -D ADVERT_NAME='"Thinknode M5 Repeater"' @@ -73,7 +73,7 @@ lib_deps = ; extends = ThinkNode_M5 ; build_src_filter = ${ThinkNode_M5.build_src_filter} ; + -; +<../apps/simple_repeater/*.cpp> +; +<../firmware/simple_repeater/*.cpp> ; build_flags = ; ${ThinkNode_M5.build_flags} ; -D ADVERT_NAME='"RS232 Bridge"' @@ -94,7 +94,7 @@ lib_deps = extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${ThinkNode_M5.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -113,7 +113,7 @@ lib_deps = [env:ThinkNode_M5_room_server] extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${ThinkNode_M5.build_flags} -D ADVERT_NAME='"Thinknode M5 Room Server"' @@ -136,7 +136,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M5.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${ThinkNode_M5.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -145,7 +145,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -157,8 +157,8 @@ build_flags = build_src_filter = ${ThinkNode_M5.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -169,15 +169,15 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${ThinkNode_M5.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -188,7 +188,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -198,8 +198,8 @@ build_flags = build_src_filter = ${ThinkNode_M5.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -210,7 +210,7 @@ lib_deps = extends = ThinkNode_M5 build_flags = ${ThinkNode_M5.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D SERIAL_TX=D6 @@ -220,8 +220,8 @@ build_flags = build_src_filter = ${ThinkNode_M5.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + lib_deps = ${ThinkNode_M5.lib_deps} @@ -231,4 +231,4 @@ lib_deps = [env:ThinkNode_M5_kiss_modem] extends = ThinkNode_M5 build_src_filter = ${ThinkNode_M5.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini index b72c2a55e4..5afc03e70e 100644 --- a/variants/thinknode_m6/platformio.ini +++ b/variants/thinknode_m6/platformio.ini @@ -51,7 +51,7 @@ build_flags = ; -D MESH_DEBUG=1 ; -D GPS_NMEA_DEBUG=1 build_src_filter = ${ThinkNode_M6.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> lib_deps = ${ThinkNode_M6.lib_deps} @@ -67,7 +67,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M6.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> lib_deps = ${ThinkNode_M6.lib_deps} @@ -78,7 +78,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M6.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -91,7 +91,7 @@ build_flags = build_src_filter = ${ThinkNode_M6.build_src_filter} + + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${ThinkNode_M6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -104,7 +104,7 @@ board_upload.maximum_size = 712704 build_flags = ${ThinkNode_M6.build_flags} -I src/helpers/ui - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D QSPIFLASH=1 @@ -113,7 +113,7 @@ build_flags = build_src_filter = ${ThinkNode_M6.build_src_filter} + + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${ThinkNode_M6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -122,4 +122,4 @@ lib_deps = [env:ThinkNode_M6_kiss_modem] extends = ThinkNode_M6 build_src_filter = ${ThinkNode_M6.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/thinknode_m7/platformio.ini b/variants/thinknode_m7/platformio.ini index 723e7c719d..ec67dcaa6c 100644 --- a/variants/thinknode_m7/platformio.ini +++ b/variants/thinknode_m7/platformio.ini @@ -37,7 +37,7 @@ lib_deps = ${esp32_base.lib_deps} [env:ThinkNode_M7_repeater] extends = ThinkNode_M7 build_src_filter = ${ThinkNode_M7.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${ThinkNode_M7.build_flags} -D ADVERT_NAME='"ThinkNode M7 Repeater"' @@ -54,7 +54,7 @@ lib_deps = [env:ThinkNode_M7_room_server] extends = ThinkNode_M7 build_src_filter = ${ThinkNode_M7.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${ThinkNode_M7.build_flags} -D ADVERT_NAME='"ThinkNode M7 Room Server"' @@ -72,7 +72,7 @@ lib_deps = extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D DISPLAY_CLASS=NullDisplayDriver -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 @@ -83,8 +83,8 @@ build_flags = build_src_filter = ${ThinkNode_M7.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M7.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -93,15 +93,15 @@ lib_deps = extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 build_src_filter = ${ThinkNode_M7.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M7.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -110,7 +110,7 @@ lib_deps = extends = ThinkNode_M7 build_flags = ${ThinkNode_M7.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=NullDisplayDriver @@ -122,8 +122,8 @@ build_flags = build_src_filter = ${ThinkNode_M7.build_src_filter} + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${ThinkNode_M7.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -131,4 +131,4 @@ lib_deps = [env:ThinkNode_M7_kiss_modem] extends = ThinkNode_M7 build_src_filter = ${ThinkNode_M7.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/thinknode_m9/platformio.ini b/variants/thinknode_m9/platformio.ini index cf51e02a3c..04762a0920 100755 --- a/variants/thinknode_m9/platformio.ini +++ b/variants/thinknode_m9/platformio.ini @@ -68,7 +68,7 @@ build_flags = ;-D MESH_PACKET_LOGGING=1 ;-D MESH_DEBUG=1 build_src_filter = ${ThinkNode_M9.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> lib_deps = ${ThinkNode_M9.lib_deps} ${esp32_ota.lib_deps} @@ -76,7 +76,7 @@ lib_deps = [env:ThinkNode_M9_room_server_] extends = ThinkNode_M9 build_src_filter = ${ThinkNode_M9.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${ThinkNode_M9.build_flags} -D ADVERT_NAME='"ThinkNode M9 Room Server"' @@ -94,7 +94,7 @@ lib_deps = extends = ThinkNode_M9 build_flags = ${ThinkNode_M9.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -105,8 +105,8 @@ build_src_filter = ${ThinkNode_M9.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M9.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -116,7 +116,7 @@ lib_deps = extends = ThinkNode_M9 build_flags = ${ThinkNode_M9.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -124,8 +124,8 @@ build_src_filter = ${ThinkNode_M9.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M9.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -135,7 +135,7 @@ lib_deps = extends = ThinkNode_M9 build_flags = ${ThinkNode_M9.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D WIFI_DEBUG_LOGGING=1 @@ -147,8 +147,8 @@ build_src_filter = ${ThinkNode_M9.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${ThinkNode_M9.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -157,4 +157,4 @@ lib_deps = [env:ThinkNode_M9_kiss_modem] extends = ThinkNode_M9 build_src_filter = ${ThinkNode_M9.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/tiny_relay/platformio.ini b/variants/tiny_relay/platformio.ini index 3d03d21191..dc8ee211f0 100644 --- a/variants/tiny_relay/platformio.ini +++ b/variants/tiny_relay/platformio.ini @@ -24,7 +24,7 @@ build_flags = ${Tiny_Relay.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${Tiny_Relay.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:Tiny_Relay_sensor] extends = Tiny_Relay @@ -35,7 +35,7 @@ build_flags = ${Tiny_Relay.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${Tiny_Relay.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> [env:Tiny_Relay_companion_radio_usb] extends = Tiny_Relay @@ -45,11 +45,11 @@ build_flags = ${Tiny_Relay.build_flags} -D MAX_GROUP_CHANNELS=8 -D MAX_LORA_TX_POWER=22 build_src_filter = ${Tiny_Relay.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Tiny_Relay.lib_deps} densaugeo/base64 @ ~1.4.0 [env:Tiny_Relay_kiss_modem] extends = Tiny_Relay build_src_filter = ${Tiny_Relay.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/waveshare_rp2040_lora/platformio.ini b/variants/waveshare_rp2040_lora/platformio.ini index 431222fa95..cd6616f758 100644 --- a/variants/waveshare_rp2040_lora/platformio.ini +++ b/variants/waveshare_rp2040_lora/platformio.ini @@ -46,7 +46,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:waveshare_rp2040_lora_repeater_bridge_rs232] extends = waveshare_rp2040_lora @@ -64,7 +64,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} + - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:waveshare_rp2040_lora_room_server] extends = waveshare_rp2040_lora @@ -77,7 +77,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:waveshare_rp2040_lora_companion_radio_usb] extends = waveshare_rp2040_lora @@ -87,7 +87,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${waveshare_rp2040_lora.lib_deps} densaugeo/base64 @ ~1.4.0 lib_ignore = BLE @@ -102,7 +102,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} -; +<../apps/companion_radio/*.cpp> +; +<../firmware/companion_radio/*.cpp> ; lib_deps = ${waveshare_rp2040_lora.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -117,7 +117,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} -; +<../apps/companion_radio/*.cpp> +; +<../firmware/companion_radio/*.cpp> ; lib_deps = ${waveshare_rp2040_lora.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -129,11 +129,11 @@ build_flags = ${waveshare_rp2040_lora.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${waveshare_rp2040_lora.lib_deps} densaugeo/base64 @ ~1.4.0 [env:waveshare_rp2040_lora_kiss_modem] extends = waveshare_rp2040_lora build_src_filter = ${waveshare_rp2040_lora.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/wio-e5-dev/platformio.ini b/variants/wio-e5-dev/platformio.ini index 9d79011abb..2aa30df34d 100644 --- a/variants/wio-e5-dev/platformio.ini +++ b/variants/wio-e5-dev/platformio.ini @@ -23,7 +23,7 @@ build_flags = ${lora_e5.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${lora_e5.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [env:wio-e5-repeater_bridge_rs232] extends = lora_e5 @@ -38,7 +38,7 @@ build_flags = ${lora_e5.build_flags} -D WITH_RS232_BRIDGE_TX=PA2 build_src_filter = ${lora_e5.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [env:wio-e5_companion_radio_usb] extends = lora_e5 @@ -47,11 +47,11 @@ build_flags = ${lora_e5.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 build_src_filter = ${lora_e5.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${lora_e5.lib_deps} densaugeo/base64 @ ~1.4.0 [env:wio-e5_kiss_modem] extends = lora_e5 build_src_filter = ${lora_e5.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/wio-e5-mini/platformio.ini b/variants/wio-e5-mini/platformio.ini index 34c01ae344..a12dcbe0d5 100644 --- a/variants/wio-e5-mini/platformio.ini +++ b/variants/wio-e5-mini/platformio.ini @@ -25,7 +25,7 @@ build_flags = ${lora_e5_mini.build_flags} -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 build_src_filter = ${lora_e5_mini.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [env:wio-e5-mini_sensor] extends = lora_e5_mini @@ -34,23 +34,23 @@ build_flags = ${lora_e5_mini.build_flags} -D ADVERT_NAME='"wio-e5-mini Sensor"' -D ADMIN_PASSWORD='"password"' build_src_filter = ${lora_e5_mini.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> [env:wio-e5-mini_companion_radio_usb] extends = lora_e5_mini build_flags = ${lora_e5_mini.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D LORA_TX_POWER=22 -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${lora_e5_mini.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${lora_e5_mini.lib_deps} densaugeo/base64 @ ~1.4.0 [env:wio-e5-mini_kiss_modem] extends = lora_e5_mini build_src_filter = ${lora_e5_mini.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini index f7101027af..030c5a799e 100644 --- a/variants/wio-tracker-l1-eink/platformio.ini +++ b/variants/wio-tracker-l1-eink/platformio.ini @@ -43,7 +43,7 @@ extends = WioTrackerL1Eink board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1Eink.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -61,8 +61,8 @@ build_src_filter = ${WioTrackerL1Eink.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${WioTrackerL1Eink.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -72,4 +72,4 @@ debug_tool=stlink [env:WioTrackerL1Eink_kiss_modem] extends = WioTrackerL1Eink build_src_filter = ${WioTrackerL1Eink.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini index ed20261769..3c3cdfd88b 100644 --- a/variants/wio-tracker-l1/platformio.ini +++ b/variants/wio-tracker-l1/platformio.ini @@ -29,7 +29,7 @@ lib_deps= ${nrf52_base.lib_deps} [env:WioTrackerL1_repeater] extends = WioTrackerL1 build_src_filter = ${WioTrackerL1.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> build_flags = ${WioTrackerL1.build_flags} -D ADVERT_NAME='"WioTrackerL1 Repeater"' @@ -44,7 +44,7 @@ lib_deps = ${WioTrackerL1.lib_deps} [env:WioTrackerL1_room_server] extends = WioTrackerL1 build_src_filter = ${WioTrackerL1.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${WioTrackerL1.build_flags} -D ADVERT_NAME='"WioTrackerL1 Room"' -D ADMIN_PASSWORD='"password"' @@ -60,7 +60,7 @@ extends = WioTrackerL1 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SH1106Display @@ -72,8 +72,8 @@ build_flags = ${WioTrackerL1.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${WioTrackerL1.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> + + lib_deps = ${WioTrackerL1.lib_deps} @@ -86,7 +86,7 @@ extends = WioTrackerL1 board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${WioTrackerL1.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -105,8 +105,8 @@ build_src_filter = ${WioTrackerL1.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${WioTrackerL1.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -115,4 +115,4 @@ lib_deps = ${WioTrackerL1.lib_deps} [env:WioTrackerL1_kiss_modem] extends = WioTrackerL1 build_src_filter = ${WioTrackerL1.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/wio_wm1110/platformio.ini b/variants/wio_wm1110/platformio.ini index c8202d3d3c..341bd13b87 100644 --- a/variants/wio_wm1110/platformio.ini +++ b/variants/wio_wm1110/platformio.ini @@ -48,7 +48,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${wio_wm1110.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [env:wio_wm1110_room_server] extends = wio_wm1110 @@ -62,7 +62,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${wio_wm1110.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> [env:wio_wm1110_companion_radio_ble] extends = wio_wm1110 @@ -80,7 +80,7 @@ build_flags = ; -D MESH_DEBUG=1 build_src_filter = ${wio_wm1110.build_src_filter} + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${wio_wm1110.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -88,4 +88,4 @@ lib_deps = [env:wio_wm1110_kiss_modem] extends = wio_wm1110 build_src_filter = ${wio_wm1110.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini index 5a5cdfb505..8096fe5c33 100644 --- a/variants/xiao_c3/platformio.ini +++ b/variants/xiao_c3/platformio.ini @@ -30,7 +30,7 @@ lib_deps = [env:Xiao_C3_repeater] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Xiao_esp32_C3.build_flags} ${sensor_base.build_flags} @@ -52,7 +52,7 @@ lib_deps = [env:Xiao_C3_room_server] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> build_flags = ${Xiao_esp32_C3.build_flags} ${sensor_base.build_flags} @@ -74,7 +74,7 @@ lib_deps = [env:Xiao_C3_companion_radio_ble] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> + build_flags = ${Xiao_esp32_C3.build_flags} @@ -93,7 +93,7 @@ lib_deps = [env:Xiao_C3_companion_radio_usb] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> + build_flags = ${Xiao_esp32_C3.build_flags} @@ -111,7 +111,7 @@ lib_deps = [env:Xiao_C3_companion_radio_wifi] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> + build_flags = ${Xiao_esp32_C3.build_flags} @@ -132,4 +132,4 @@ lib_deps = [env:Xiao_C3_kiss_modem] extends = Xiao_esp32_C3 build_src_filter = ${Xiao_esp32_C3.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini index 1154b7689e..23b4b31085 100644 --- a/variants/xiao_c6/platformio.ini +++ b/variants/xiao_c6/platformio.ini @@ -35,7 +35,7 @@ build_src_filter = ${esp32c6_base.build_src_filter} [env:Xiao_C6_repeater_] extends = Xiao_C6 build_src_filter = ${Xiao_C6.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Xiao_C6.build_flags} -D ADVERT_NAME='"Xiao C6 Repeater"' @@ -64,7 +64,7 @@ build_flags = ${Xiao_C6.build_flags} build_src_filter = ${Xiao_C6.build_src_filter} + - - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Xiao_C6.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -95,7 +95,7 @@ build_flags = [env:Meshimi_repeater_] extends = Meshimi build_src_filter = ${Meshimi.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Meshimi.build_flags} -D ADVERT_NAME='"Meshimi Repeater"' @@ -119,7 +119,7 @@ build_flags = ${Meshimi.build_flags} build_src_filter = ${Meshimi.build_src_filter} + - - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Meshimi.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -152,7 +152,7 @@ build_flags = [env:WHY2025_badge_repeater_] extends = WHY2025_badge build_src_filter = ${WHY2025_badge.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${WHY2025_badge.build_flags} -D ADVERT_NAME='"WHY2025 Badge Repeater"' @@ -181,7 +181,7 @@ build_flags = ${WHY2025_badge.build_flags} build_src_filter = ${WHY2025_badge.build_src_filter} + - - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${WHY2025_badge.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -189,4 +189,4 @@ lib_deps = [env:Xiao_C6_kiss_modem] extends = Xiao_C6 build_src_filter = ${Xiao_C6.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini index da3628026f..6756e98c98 100644 --- a/variants/xiao_nrf52/platformio.ini +++ b/variants/xiao_nrf52/platformio.ini @@ -46,7 +46,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${Xiao_nrf52.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -57,8 +57,8 @@ build_flags = -D QSPIFLASH=1 build_src_filter = ${Xiao_nrf52.build_src_filter} + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${Xiao_nrf52.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -69,7 +69,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld board_upload.maximum_size = 708608 build_flags = ${Xiao_nrf52.build_flags} - -I apps/companion_radio/ui-orig + -I firmware/companion_radio/ui-orig -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -77,8 +77,8 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-orig/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-orig/*.cpp> lib_deps = ${Xiao_nrf52.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -95,7 +95,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> [env:Xiao_nrf52_room_server] extends = Xiao_nrf52 @@ -108,13 +108,13 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_nrf52.build_src_filter} - +<../apps/simple_room_server/*.cpp> + +<../firmware/simple_room_server/*.cpp> [env:Xiao_nrf52_kiss_modem] extends = Xiao_nrf52 build_flags = ${Xiao_nrf52.build_flags} build_src_filter = ${Xiao_nrf52.build_src_filter} - +<../apps/kiss_modem/*.cpp> + +<../firmware/kiss_modem/*.cpp> lib_deps = ${Xiao_nrf52.lib_deps} diff --git a/variants/xiao_rp2040/platformio.ini b/variants/xiao_rp2040/platformio.ini index 4a1c435254..1bef2f509a 100644 --- a/variants/xiao_rp2040/platformio.ini +++ b/variants/xiao_rp2040/platformio.ini @@ -41,7 +41,7 @@ build_flags = ${Xiao_rp2040.build_flags} -D MESH_PACKET_LOGGING=1 -D MESH_DEBUG=1 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../apps/simple_repeater> + +<../firmware/simple_repeater> [env:Xiao_rp2040_room_server] extends = Xiao_rp2040 @@ -54,7 +54,7 @@ build_flags = ${Xiao_rp2040.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> [env:Xiao_rp2040_companion_radio_usb] extends = Xiao_rp2040 @@ -64,7 +64,7 @@ build_flags = ${Xiao_rp2040.build_flags} ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> lib_deps = ${Xiao_rp2040.lib_deps} densaugeo/base64 @ ~1.4.0 lib_ignore = BLE @@ -79,7 +79,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Xiao_rp2040.build_src_filter} -; +<../apps/companion_radio/*.cpp> +; +<../firmware/companion_radio/*.cpp> ; lib_deps = ${Xiao_rp2040.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -94,7 +94,7 @@ lib_ignore = BLE ; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_DEBUG=1 ; build_src_filter = ${Xiao_rp2040.build_src_filter} -; +<../apps/companion_radio/*.cpp> +; +<../firmware/companion_radio/*.cpp> ; lib_deps = ${Xiao_rp2040.lib_deps} ; densaugeo/base64 @ ~1.4.0 @@ -106,11 +106,11 @@ build_flags = ${Xiao_rp2040.build_flags} ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Xiao_rp2040.lib_deps} densaugeo/base64 @ ~1.4.0 [env:Xiao_rp2040_kiss_modem] extends = Xiao_rp2040 build_src_filter = ${Xiao_rp2040.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/xiao_s3/platformio.ini b/variants/xiao_s3/platformio.ini index 10455159a9..b4e8155852 100644 --- a/variants/xiao_s3/platformio.ini +++ b/variants/xiao_s3/platformio.ini @@ -39,7 +39,7 @@ lib_deps = [env:Xiao_S3_repeater] extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Xiao_S3.build_flags} -D ADVERT_NAME='"Xiao S3 Repeater"' @@ -57,7 +57,7 @@ lib_deps = extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Xiao_S3.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -76,7 +76,7 @@ lib_deps = [env:Xiao_S3_room_server] extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Xiao_S3.build_flags} -D ADVERT_NAME='"Xiao S3 Room"' @@ -94,7 +94,7 @@ lib_deps = extends = Xiao_S3 build_flags = ${Xiao_S3.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -107,8 +107,8 @@ build_src_filter = ${Xiao_S3.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -118,7 +118,7 @@ lib_deps = extends = Xiao_S3 build_flags = ${Xiao_S3.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -130,8 +130,8 @@ build_src_filter = ${Xiao_S3.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -140,7 +140,7 @@ lib_deps = [env:Xiao_S3_sensor] extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> build_flags = ${Xiao_S3.build_flags} -D ADVERT_NAME='"Xiao S3 Sensor"' @@ -156,4 +156,4 @@ lib_deps = [env:Xiao_S3_kiss_modem] extends = Xiao_S3 build_src_filter = ${Xiao_S3.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/> diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini index 389a811c26..b288b18d08 100644 --- a/variants/xiao_s3_wio/platformio.ini +++ b/variants/xiao_s3_wio/platformio.ini @@ -39,7 +39,7 @@ lib_deps = [env:Xiao_S3_WIO_repeater] extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Xiao_S3_WIO.build_flags} -D ADVERT_NAME='"XiaoS3 Repeater"' @@ -57,7 +57,7 @@ lib_deps = ; extends = Xiao_S3_WIO ; build_src_filter = ${Xiao_S3_WIO.build_src_filter} ; + -; +<../apps/simple_repeater/*.cpp> +; +<../firmware/simple_repeater/*.cpp> ; build_flags = ; ${Xiao_S3_WIO.build_flags} ; -D ADVERT_NAME='"RS232 Bridge"' @@ -80,7 +80,7 @@ lib_deps = extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} + - +<../apps/simple_repeater/*.cpp> + +<../firmware/simple_repeater/*.cpp> build_flags = ${Xiao_S3_WIO.build_flags} -D ADVERT_NAME='"ESPNow Bridge"' @@ -99,7 +99,7 @@ lib_deps = [env:Xiao_S3_WIO_room_server] extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../apps/simple_room_server> + +<../firmware/simple_room_server> build_flags = ${Xiao_S3_WIO.build_flags} -D ADVERT_NAME='"XiaoS3 Room"' @@ -122,7 +122,7 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../apps/simple_secure_chat/main.cpp> + +<../firmware/simple_secure_chat/main.cpp> lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -131,7 +131,7 @@ lib_deps = extends = Xiao_S3_WIO build_flags = ${Xiao_S3_WIO.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -142,8 +142,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -153,7 +153,7 @@ lib_deps = extends = Xiao_S3_WIO build_flags = ${Xiao_S3_WIO.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -166,8 +166,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -177,7 +177,7 @@ lib_deps = extends = Xiao_S3_WIO build_flags = ${Xiao_S3_WIO.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D DISPLAY_CLASS=SSD1306Display @@ -189,8 +189,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> - +<../apps/companion_radio/ui-new/*.cpp> + +<../firmware/companion_radio/*.cpp> + +<../firmware/companion_radio/ui-new/*.cpp> lib_deps = ${Xiao_S3_WIO.lib_deps} densaugeo/base64 @ ~1.4.0 @@ -202,10 +202,10 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + + - +<../apps/companion_radio/*.cpp> + +<../firmware/companion_radio/*.cpp> build_flags = ${Xiao_S3_WIO.build_flags} - -I apps/companion_radio/ui-new + -I firmware/companion_radio/ui-new -D MAX_CONTACTS=350 -D MAX_GROUP_CHANNELS=40 -D OFFLINE_QUEUE_SIZE=256 @@ -222,7 +222,7 @@ lib_deps = [env:Xiao_S3_WIO_sensor] extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../apps/simple_sensor> + +<../firmware/simple_sensor> build_flags = ${Xiao_S3_WIO.build_flags} -D ADVERT_NAME='"XiaoS3 sensor"' @@ -238,4 +238,4 @@ lib_deps = [env:Xiao_S3_WIO_kiss_modem] extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter} - +<../apps/kiss_modem/> + +<../firmware/kiss_modem/>