Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-09-14 15:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address PR review feedback from oltaco

Browse Source 
- Remove extra blank line in companion_radio main.cpp before NRF52/STM32 block
- Revert unintended STM32_PLATFORM ETHERNET_ENABLED branch (no STM32 ethernet target exists, and it incorrectly included nrf52 headers)
- Drop renovate annotations from rak4631 platformio.ini (no renovate config in this repo)
This commit is contained in:
Ryan Gregg
2026-04-26 20:22:35 +00:00
parent 2a2c7a171d
commit a3354db521
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/main.cpp
+2 -8
View File
@@ -12,7 +12,6 @@ static uint32_t _atoi(const char* sp) {
return n; return n;
} }
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM) #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
#include <InternalFileSystem.h> #include <InternalFileSystem.h>
#if defined(QSPIFLASH) #if defined(QSPIFLASH)
@@ -83,13 +82,8 @@ static uint32_t _atoi(const char* sp) {
ArduinoSerialInterface serial_interface; ArduinoSerialInterface serial_interface;
#endif #endif
#elif defined(STM32_PLATFORM) #elif defined(STM32_PLATFORM)
#ifdef ETHERNET_ENABLED #include <helpers/ArduinoSerialInterface.h>
#include <helpers/nrf52/SerialEthernetInterface.h> ArduinoSerialInterface serial_interface;
SerialEthernetInterface serial_interface;
#else
#include <helpers/ArduinoSerialInterface.h>
ArduinoSerialInterface serial_interface;
#endif
#else #else
#error "need to define a serial interface" #error "need to define a serial interface"
#endif #endif
variants/rak4631/platformio.ini
-3
View File
@@ -65,7 +65,6 @@ build_src_filter = ${rak4631.build_src_filter}
+<../examples/simple_repeater> +<../examples/simple_repeater>
lib_deps = lib_deps =
${rak4631.lib_deps} ${rak4631.lib_deps}
# renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
[env:RAK_4631_repeater_bridge_rs232_serial1] [env:RAK_4631_repeater_bridge_rs232_serial1]
@@ -147,7 +146,6 @@ build_src_filter = ${rak4631.build_src_filter}
+<../examples/simple_room_server> +<../examples/simple_room_server>
lib_deps = lib_deps =
${rak4631.lib_deps} ${rak4631.lib_deps}
# renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
[env:RAK_4631_companion_radio_usb] [env:RAK_4631_companion_radio_usb]
@@ -197,7 +195,6 @@ build_src_filter = ${rak4631.build_src_filter}
lib_deps = lib_deps =
${rak4631.lib_deps} ${rak4631.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
# renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip