shade/MeshCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

добавил e22p 433m30s и e22p 868m30s
Build and deploy Docs site to GitHub Pages / github-pages (push) Canceled after 0s
Details
PR Build Check / build (Heltec_v3_companion_radio_ble) (push) Canceled after 0s
Details
PR Build Check / build (Heltec_v3_repeater) (push) Canceled after 0s
Details
PR Build Check / build (Heltec_v3_room_server) (push) Canceled after 0s
Details
PR Build Check / build (LilyGo_Tlora_C6_repeater_) (push) Canceled after 0s
Details
PR Build Check / build (PicoW_repeater) (push) Canceled after 0s
Details
PR Build Check / build (RAK_4631_companion_radio_ble) (push) Canceled after 0s
Details
PR Build Check / build (RAK_4631_companion_radio_ethernet) (push) Canceled after 0s
Details
PR Build Check / build (RAK_4631_repeater) (push) Canceled after 0s
Details
PR Build Check / build (RAK_4631_repeater_ethernet) (push) Canceled after 0s
Details
PR Build Check / build (RAK_4631_room_server) (push) Canceled after 0s
Details
PR Build Check / build (RAK_4631_room_server_ethernet) (push) Canceled after 0s
Details
PR Build Check / build (Tbeam_SX1276_repeater) (push) Canceled after 0s
Details
PR Build Check / build (wio-e5-mini_repeater) (push) Canceled after 0s
Details
PR Build Check / build (wio_wm1110_repeater) (push) Canceled after 0s
Details
Run Unit Tests / test (push) Canceled after 0s
Details

Browse Source
This commit is contained in:
shade
2026-09-06 09:39:22 +03:00
parent 80077b8c55
commit 7d18e35854
4 changed files with 193 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/extensions.json
Vendored
+2 -1
View File
@@ -6,6 +6,7 @@
"platformio.platformio-ide" "platformio.platformio-ide"
], ],
"unwantedRecommendations": [ "unwantedRecommendations": [
"ms-vscode.cpptools-extension-pack" "ms-vscode.cpptools-extension-pack",
"pioarduino.pioarduino-ide"
] ]
} }
variants/meshadventurer/platformio.ini
+163
View File
@@ -355,6 +355,116 @@ build_flags = ${Meshadventurer.build_flags}
-D WRAPPER_CLASS=CustomSX1268Wrapper -D WRAPPER_CLASS=CustomSX1268Wrapper
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22
[env:Meshadventurer_e22p_433m30s_companion_radio_ble]
extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter}
+<helpers/esp32/*.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
build_flags =
${Meshadventurer.build_flags}
-I examples/companion_radio/ui-new
-D RADIO_CLASS=CustomSX1268
-D WRAPPER_CLASS=CustomSX1268Wrapper
-D LORA_TX_POWER=22
-D MAX_CONTACTS=160
-D MAX_GROUP_CHANNELS=40
-D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1
-D OFFLINE_QUEUE_SIZE=128
-D TCXO_OPTIONAL=1
-D LORA_FREQ=433.0
-D SX126X_RXEN=RADIOLIB_NC
-D SX126X_TXEN=RADIOLIB_NC
-D P_LORA_EN=14
-D SX126X_DIO2_AS_RF_SWITCH=1
; -D MESH_PACKET_LOGGING=1
-D MESH_DEBUG=1
lib_deps =
${Meshadventurer.lib_deps}
densaugeo/base64 @ ~1.4.0
[env:Meshadventurer_sx1262_e22p_433m30s_companion_radio_usb]
extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
build_flags =
${Meshadventurer.build_flags}
-I examples/companion_radio/ui-new
-D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper
-D SX126X_RXEN=RADIOLIB_NC
-D SX126X_TXEN=RADIOLIB_NC
-D P_LORA_EN=14
-D SX126X_DIO2_AS_RF_SWITCH=1
-D LORA_FREQ=433.0
-D LORA_TX_POWER=12
-D MAX_CONTACTS=160
-D MAX_GROUP_CHANNELS=40
-D OFFLINE_QUEUE_SIZE=128
-D ENABLE_USB_INTERFACE
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
lib_deps =
${Meshadventurer.lib_deps}
densaugeo/base64 @ ~1.4.0
[env:Meshadventurer_sx1262_e22p_433m30s_repeater]
extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/simple_repeater>
build_flags =
${Meshadventurer.build_flags}
-D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper
-D SX126X_RXEN=RADIOLIB_NC
-D SX126X_TXEN=RADIOLIB_NC
-D P_LORA_EN=14
-D SX126X_DIO2_AS_RF_SWITCH=1
-D LORA_FREQ=433.0
-D LORA_TX_POWER=12
-D ADVERT_NAME='"Meshadventurer Repeater"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
lib_deps =
${Meshadventurer.lib_deps}
${esp32_ota.lib_deps}
[env:Meshadventurer_sx1262_e22p_433m30s_repeater_bridge_espnow]
extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter}
+<helpers/bridges/ESPNowBridge.cpp>
+<../examples/simple_repeater>
build_flags =
${Meshadventurer.build_flags}
-D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper
-D SX126X_RXEN=RADIOLIB_NC
-D SX126X_TXEN=RADIOLIB_NC
-D P_LORA_EN=14
-D SX126X_DIO2_AS_RF_SWITCH=1
-D LORA_FREQ=433.0
-D LORA_TX_POWER=12
-D ADVERT_NAME='"ESPNow Bridge"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
-D WITH_ESPNOW_BRIDGE=1
; -D BRIDGE_DEBUG=1
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
lib_deps =
${Meshadventurer.lib_deps}
${esp32_ota.lib_deps}
////
[env:Meshadventurer_sx1262_e22p_868m30s_companion_radio_ble] [env:Meshadventurer_sx1262_e22p_868m30s_companion_radio_ble]
extends = Meshadventurer extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter} build_src_filter = ${Meshadventurer.build_src_filter}
@@ -384,6 +494,31 @@ lib_deps =
${Meshadventurer.lib_deps} ${Meshadventurer.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:Meshadventurer_sx1262_e22p_868m30s_companion_radio_usb]
extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
build_flags =
${Meshadventurer.build_flags}
-I examples/companion_radio/ui-new
-D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper
-D SX126X_RXEN=RADIOLIB_NC
-D SX126X_TXEN=RADIOLIB_NC
-D P_LORA_EN=14
-D SX126X_DIO2_AS_RF_SWITCH=1
-D LORA_TX_POWER=12
-D MAX_CONTACTS=160
-D MAX_GROUP_CHANNELS=40
-D OFFLINE_QUEUE_SIZE=128
-D ENABLE_USB_INTERFACE
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
lib_deps =
${Meshadventurer.lib_deps}
densaugeo/base64 @ ~1.4.0
[env:Meshadventurer_sx1262_e22p_868m30s_repeater] [env:Meshadventurer_sx1262_e22p_868m30s_repeater]
extends = Meshadventurer extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter} build_src_filter = ${Meshadventurer.build_src_filter}
@@ -396,6 +531,7 @@ build_flags =
-D SX126X_TXEN=RADIOLIB_NC -D SX126X_TXEN=RADIOLIB_NC
-D P_LORA_EN=14 -D P_LORA_EN=14
-D SX126X_DIO2_AS_RF_SWITCH=1 -D SX126X_DIO2_AS_RF_SWITCH=1
-D LORA_TX_POWER=12
-D ADVERT_NAME='"Meshadventurer Repeater"' -D ADVERT_NAME='"Meshadventurer Repeater"'
-D ADVERT_LAT=0.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=0.0 -D ADVERT_LON=0.0
@@ -403,6 +539,33 @@ build_flags =
-D MAX_NEIGHBOURS=50 -D MAX_NEIGHBOURS=50
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
lib_deps =
${Meshadventurer.lib_deps}
${esp32_ota.lib_deps}
[env:Meshadventurer_sx1262_e22p_868m30s_repeater_bridge_espnow]
extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter}
+<helpers/bridges/ESPNowBridge.cpp>
+<../examples/simple_repeater>
build_flags =
${Meshadventurer.build_flags}
-D RADIO_CLASS=CustomSX1262
-D WRAPPER_CLASS=CustomSX1262Wrapper
-D SX126X_RXEN=RADIOLIB_NC
-D SX126X_TXEN=RADIOLIB_NC
-D P_LORA_EN=14
-D SX126X_DIO2_AS_RF_SWITCH=1
-D LORA_TX_POWER=12
-D ADVERT_NAME='"ESPNow Bridge"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
-D WITH_ESPNOW_BRIDGE=1
; -D BRIDGE_DEBUG=1
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
lib_deps = lib_deps =
${Meshadventurer.lib_deps} ${Meshadventurer.lib_deps}
${esp32_ota.lib_deps} ${esp32_ota.lib_deps}
variants/promicro/PromicroBoard.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include <helpers/NRF52Board.h> #include <helpers/NRF52Board.h>
#define PIN_VBAT_READ 17 #define PIN_VBAT_READ 17
#define ADC_MULTIPLIER (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking #define ADC_MULTIPLIER (1.778f) // was 1.815 dependent on voltage divider resistors. TODO: more accurate battery tracking
class PromicroBoard : public NRF52BoardDCDC { class PromicroBoard : public NRF52BoardDCDC {
protected: protected:
variants/promicro/platformio.ini
+27
View File
@@ -156,6 +156,33 @@ lib_deps = ${Promicro.lib_deps}
adafruit/RTClib @ ^2.1.3 adafruit/RTClib @ ^2.1.3
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:ProMicro_companion_xiaowa_radio_ble]
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
-D SX126X_TXEN=RADIOLIB_NC
-D SX126X_DIO2_AS_RF_SWITCH=1
-D SX126X_POWER_EN=21
-D MAX_CONTACTS=350
-D MAX_GROUP_CHANNELS=40
-D BLE_PIN_CODE=123456
-D BLE_DEBUG_LOGGING=1
-D OFFLINE_QUEUE_SIZE=256
-D DISPLAY_CLASS=SSD1306Display
; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1
build_src_filter = ${Promicro.build_src_filter}
+<helpers/nrf52/SerialBLEInterface.cpp>
+<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
lib_deps = ${Promicro.lib_deps}
adafruit/RTClib @ ^2.1.3
densaugeo/base64 @ ~1.4.0
[env:ProMicro_sensor] [env:ProMicro_sensor]
extends = Promicro extends = Promicro
build_flags = build_flags =