Put a bit of order in the src directory, group and name things appropriately

This commit is contained in:
Thomas Göttgens 2022-08-10 11:31:29 +02:00
parent 2c37be58ac
commit 5e842dd735
38 changed files with 1051 additions and 1052 deletions

View File

@ -65,7 +65,7 @@ lib_deps =
build_flags = ${env.build_flags} -Os build_flags = ${env.build_flags} -Os
# -DRADIOLIB_GODMODE # -DRADIOLIB_GODMODE
build_src_filter = ${env.build_src_filter} -<portduino/> build_src_filter = ${env.build_src_filter} -<platform/portduino/>
; Common libs for communicating over TCP/IP networks such as MQTT ; Common libs for communicating over TCP/IP networks such as MQTT
[networking_base] [networking_base]
@ -92,7 +92,7 @@ lib_deps =
extends = arduino_base extends = arduino_base
platform = espressif32@3.5.0 platform = espressif32@3.5.0
build_src_filter = build_src_filter =
${arduino_base.build_src_filter} -<nrf52/> -<stm32wl> -<rp2040> ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040>
upload_speed = 115200 upload_speed = 115200
debug_init_break = tbreak setup debug_init_break = tbreak setup
@ -101,7 +101,7 @@ debug_init_break = tbreak setup
# This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h # This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
# -DUSE_NEW_ESP32_BLUETOOTH will enable the new NimBLE C++ api # -DUSE_NEW_ESP32_BLUETOOTH will enable the new NimBLE C++ api
build_flags = build_flags =
${arduino_base.build_flags} -Wall -Wextra -Isrc/esp32 -Isrc/esp32-mfix-esp32-psram-cache-issue -lnimble -std=c++11 ${arduino_base.build_flags} -Wall -Wextra -Isrc/platform/esp32 -lnimble -std=c++11
-DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
-DAXP_DEBUG_PORT=Serial -DUSE_NEW_ESP32_BLUETOOTH -DCONFIG_BT_NIMBLE_ENABLED -DCONFIG_NIMBLE_CPP_LOG_LEVEL=1 -DAXP_DEBUG_PORT=Serial -DUSE_NEW_ESP32_BLUETOOTH -DCONFIG_BT_NIMBLE_ENABLED -DCONFIG_NIMBLE_CPP_LOG_LEVEL=1
lib_deps = lib_deps =
@ -142,9 +142,9 @@ build_type = debug ; I'm debugging with ICE a lot now
; note: liboberon provides the AES256 implementation for NRF52 (though not using the hardware acceleration of the NRF52840 - FIXME) ; note: liboberon provides the AES256 implementation for NRF52 (though not using the hardware acceleration of the NRF52840 - FIXME)
build_flags = build_flags =
${arduino_base.build_flags} -Wno-unused-variable ${arduino_base.build_flags} -Wno-unused-variable
-Isrc/nrf52 -Isrc/platform/nrf52
build_src_filter = build_src_filter =
${arduino_base.build_src_filter} -<esp32/> -<stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<rp2040> ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/rp2040>
lib_ignore = lib_ignore =
BluetoothOTA BluetoothOTA
@ -174,11 +174,11 @@ board_build.core = earlephilhower
board_build.filesystem_size = 0.5m board_build.filesystem_size = 0.5m
build_flags = build_flags =
${arduino_base.build_flags} -Wno-unused-variable ${arduino_base.build_flags} -Wno-unused-variable
-Isrc/rp2040 -Isrc/platform/rp2040
-D__PLAT_RP2040__ -D__PLAT_RP2040__
# -D _POSIX_THREADS # -D _POSIX_THREADS
build_src_filter = build_src_filter =
${arduino_base.build_src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<nrf52/> -<stm32wl> ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/nrf52/> -<platform/stm32wl>
lib_ignore = lib_ignore =
BluetoothOTA BluetoothOTA
lib_deps = lib_deps =

View File

@ -1 +0,0 @@
// Placeholder FIXME

View File

@ -17,9 +17,9 @@
#include "SPILock.h" #include "SPILock.h"
#include "concurrency/OSThread.h" #include "concurrency/OSThread.h"
#include "concurrency/Periodic.h" #include "concurrency/Periodic.h"
#include "debug/axpDebug.h" #include "detect/axpDebug.h"
#include "debug/einkScan.h" #include "detect/einkScan.h"
#include "debug/i2cScan.h" #include "detect/i2cScan.h"
#include "graphics/Screen.h" #include "graphics/Screen.h"
#include "main.h" #include "main.h"
#include "modules/Modules.h" #include "modules/Modules.h"
@ -35,7 +35,7 @@
#include "mesh/http/WebServer.h" #include "mesh/http/WebServer.h"
#ifdef USE_NEW_ESP32_BLUETOOTH #ifdef USE_NEW_ESP32_BLUETOOTH
#include "esp32/ESP32Bluetooth.h" #include "platform/esp32/ESP32Bluetooth.h"
#else #else
#include "nimble/BluetoothUtil.h" #include "nimble/BluetoothUtil.h"
#endif #endif

View File

@ -2,11 +2,11 @@
[portduino_base] [portduino_base]
build_src_filter = build_src_filter =
${env.build_src_filter} ${env.build_src_filter}
-<esp32/> -<platform/esp32/>
-<nimble/> -<nimble/>
-<nrf52/> -<platform/nrf52/>
-<stm32wl/> -<platform/stm32wl/>
-<rp2040> -<platform/rp2040>
-<mesh/http/> -<mesh/http/>
-<modules/esp32> -<modules/esp32>
-<modules/Telemetry> -<modules/Telemetry>
@ -16,7 +16,7 @@ lib_deps =
${networking_base.lib_deps} ${networking_base.lib_deps}
rweather/Crypto rweather/Crypto
https://github.com/meshtastic/RadioLib.git#5582ac30578ff3f53f20630a00b2a8a4b8f92c74 https://github.com/meshtastic/RadioLib.git#5582ac30578ff3f53f20630a00b2a8a4b8f92c74
build_flags = ${arduino_base.build_flags} -Isrc/portduino build_flags = ${arduino_base.build_flags} -Isrc/platform/portduino
[env:native] [env:native]
platform = https://github.com/meshtastic/platform-native.git platform = https://github.com/meshtastic/platform-native.git