meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #172 from recrof/dev

Browse source 
set repeater/room server Lat & Lon to 0.0 as default
This commit is contained in:
ripplebiz 2025-04-04 19:26:30 +11:00 • committed by GitHub
commit 86a3f592b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 55 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

9
variants/generic_espnow/platformio.ini
View file

@ -39,8 +39,8 @@ extends = Generic_ESPNOW
build_flags = build_flags =
${Generic_ESPNOW.build_flags} ${Generic_ESPNOW.build_flags}
-D ADVERT_NAME='"ESPNOW Repeater"' -D ADVERT_NAME='"ESPNOW Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
build_src_filter = ${Generic_ESPNOW.build_src_filter} build_src_filter = ${Generic_ESPNOW.build_src_filter}
+<../examples/simple_repeater/main.cpp> +<../examples/simple_repeater/main.cpp>
@ -71,8 +71,8 @@ extends = Generic_ESPNOW
build_flags = build_flags =
${Generic_ESPNOW.build_flags} ${Generic_ESPNOW.build_flags}
-D ADVERT_NAME='"Heltec Room"' -D ADVERT_NAME='"Heltec Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
build_src_filter = ${Generic_ESPNOW.build_src_filter} build_src_filter = ${Generic_ESPNOW.build_src_filter}
@ -80,4 +80,3 @@ build_src_filter = ${Generic_ESPNOW.build_src_filter}
lib_deps = lib_deps =
${Generic_ESPNOW.lib_deps} ${Generic_ESPNOW.lib_deps}
${esp32_ota.lib_deps} ${esp32_ota.lib_deps}

8
variants/heltec_v2/platformio.ini
View file

@ -25,8 +25,8 @@ build_flags =
${Heltec_lora32_v2.build_flags} ${Heltec_lora32_v2.build_flags}
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_NAME='"Heltec Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -43,8 +43,8 @@ build_flags =
${Heltec_lora32_v2.build_flags} ${Heltec_lora32_v2.build_flags}
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"Heltec Room"' -D ADVERT_NAME='"Heltec Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1

16
variants/heltec_v3/platformio.ini
View file

@ -28,8 +28,8 @@ build_flags =
${Heltec_lora32_v3.build_flags} ${Heltec_lora32_v3.build_flags}
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_NAME='"Heltec Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D MESH_PACKET_LOGGING=1 -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -46,8 +46,8 @@ build_flags =
${Heltec_lora32_v3.build_flags} ${Heltec_lora32_v3.build_flags}
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"Heltec Room"' -D ADVERT_NAME='"Heltec Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
@ -139,8 +139,8 @@ extends = Heltec_lora32_v3
build_flags = build_flags =
${Heltec_lora32_v3.build_flags} ${Heltec_lora32_v3.build_flags}
-D ADVERT_NAME='"Heltec Repeater"' -D ADVERT_NAME='"Heltec Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D MESH_PACKET_LOGGING=1 -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -157,8 +157,8 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter}
build_flags = build_flags =
${Heltec_lora32_v3.build_flags} ${Heltec_lora32_v3.build_flags}
-D ADVERT_NAME='"Heltec Room"' -D ADVERT_NAME='"Heltec Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1

8
variants/lilygo_t3s3/platformio.ini
View file

@ -39,8 +39,8 @@ build_flags =
${LilyGo_T3S3_sx1262.build_flags} ${LilyGo_T3S3_sx1262.build_flags}
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"T3S3-1262 Repeater"' -D ADVERT_NAME='"T3S3-1262 Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -71,8 +71,8 @@ build_flags =
${LilyGo_T3S3_sx1262.build_flags} ${LilyGo_T3S3_sx1262.build_flags}
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"T3S3-1262 Room"' -D ADVERT_NAME='"T3S3-1262 Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1

4
variants/lilygo_tbeam/platformio.ini
View file

@ -51,8 +51,8 @@ build_flags =
${LilyGo_TBeam.build_flags} ${LilyGo_TBeam.build_flags}
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"Tbeam Repeater"' -D ADVERT_NAME='"Tbeam Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D MESH_PACKET_LOGGING=1 -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1

8
variants/lilygo_tlora_v2_1/platformio.ini
View file

@ -39,8 +39,8 @@ build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
build_flags = build_flags =
${LilyGo_TLora_V2_1_1_6.build_flags} ${LilyGo_TLora_V2_1_1_6.build_flags}
-D ADVERT_NAME='"TLora-V2.1-1.6 Repeater"' -D ADVERT_NAME='"TLora-V2.1-1.6 Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -109,8 +109,8 @@ build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
build_flags = build_flags =
${LilyGo_TLora_V2_1_1_6.build_flags} ${LilyGo_TLora_V2_1_1_6.build_flags}
-D ADVERT_NAME='"TLora-V2.1-1.6 Room"' -D ADVERT_NAME='"TLora-V2.1-1.6 Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1

8
variants/promicro/platformio.ini
View file

@ -27,8 +27,8 @@ build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_repeater> +<
build_flags = build_flags =
${Faketec.build_flags} ${Faketec.build_flags}
-D ADVERT_NAME="\"Faketec Repeater\"" -D ADVERT_NAME="\"Faketec Repeater\""
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD="\"password\"" -D ADMIN_PASSWORD="\"password\""
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -42,8 +42,8 @@ build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_room_server>
build_flags = build_flags =
${Faketec.build_flags} ${Faketec.build_flags}
-D ADVERT_NAME="\"Test Room\"" -D ADVERT_NAME="\"Test Room\""
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD="\"password\"" -D ADMIN_PASSWORD="\"password\""
-D ROOM_PASSWORD="\"hello\"" -D ROOM_PASSWORD="\"hello\""
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1

8
variants/rak4631/platformio.ini
View file

@ -25,8 +25,8 @@ build_flags =
${rak4631.build_flags} ${rak4631.build_flags}
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"RAK4631 Repeater"' -D ADVERT_NAME='"RAK4631 Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -40,8 +40,8 @@ build_flags =
${rak4631.build_flags} ${rak4631.build_flags}
-D DISPLAY_CLASS=SSD1306Display -D DISPLAY_CLASS=SSD1306Display
-D ADVERT_NAME='"Test Room"' -D ADVERT_NAME='"Test Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1

8
variants/station_g2/platformio.ini
View file

@ -27,8 +27,8 @@ extends = Station_G2
build_flags = build_flags =
${Station_G2.build_flags} ${Station_G2.build_flags}
-D ADVERT_NAME='"Station G2 Repeater"' -D ADVERT_NAME='"Station G2 Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D MESH_PACKET_LOGGING=1 -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -45,8 +45,8 @@ build_src_filter = ${Station_G2.build_src_filter}
build_flags = build_flags =
${Station_G2.build_flags} ${Station_G2.build_flags}
-D ADVERT_NAME='"Station G2 Room"' -D ADVERT_NAME='"Station G2 Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1

8
variants/t114/platformio.ini
View file

@ -36,8 +36,8 @@ build_src_filter = ${Heltec_t114.build_src_filter}
build_flags = build_flags =
${Heltec_t114.build_flags} ${Heltec_t114.build_flags}
-D ADVERT_NAME='"Heltec_T114 Repeater"' -D ADVERT_NAME='"Heltec_T114 Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -49,8 +49,8 @@ build_src_filter = ${Heltec_t114.build_src_filter}
build_flags = build_flags =
${Heltec_t114.build_flags} ${Heltec_t114.build_flags}
-D ADVERT_NAME='"Heltec_T114 Room"' -D ADVERT_NAME='"Heltec_T114 Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1

8
variants/techo/platformio.ini
View file

@ -34,8 +34,8 @@ build_src_filter = ${LilyGo_Techo.build_src_filter} +<../examples/simple_repeate
build_flags = build_flags =
${LilyGo_Techo.build_flags} ${LilyGo_Techo.build_flags}
-D ADVERT_NAME='"T-Echo Repeater"' -D ADVERT_NAME='"T-Echo Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -46,8 +46,8 @@ build_src_filter = ${LilyGo_Techo.build_src_filter} +<../examples/simple_room_se
build_flags = build_flags =
${LilyGo_Techo.build_flags} ${LilyGo_Techo.build_flags}
-D ADVERT_NAME='"T-Echo Room"' -D ADVERT_NAME='"T-Echo Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1

8
variants/xiao_c3/platformio.ini
View file

@ -30,8 +30,8 @@ build_flags =
-D SX126X_RX_BOOSTED_GAIN=1 -D SX126X_RX_BOOSTED_GAIN=1
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22
-D ADVERT_NAME='"Xiao Repeater"' -D ADVERT_NAME='"Xiao Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -49,8 +49,8 @@ build_flags =
-D WRAPPER_CLASS=CustomSX1268Wrapper -D WRAPPER_CLASS=CustomSX1268Wrapper
-D LORA_TX_POWER=22 -D LORA_TX_POWER=22
-D ADVERT_NAME='"Xiao Repeater"' -D ADVERT_NAME='"Xiao Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1

9
variants/xiao_s3_wio/platformio.ini
View file

@ -30,8 +30,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
build_flags = build_flags =
${Xiao_S3_WIO.build_flags} ${Xiao_S3_WIO.build_flags}
-D ADVERT_NAME='"XiaoS3 Repeater"' -D ADVERT_NAME='"XiaoS3 Repeater"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
@ -46,8 +46,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
build_flags = build_flags =
${Xiao_S3_WIO.build_flags} ${Xiao_S3_WIO.build_flags}
-D ADVERT_NAME='"XiaoS3 Room"' -D ADVERT_NAME='"XiaoS3 Room"'
-D ADVERT_LAT=-37.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=145.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D ROOM_PASSWORD='"hello"' -D ROOM_PASSWORD='"hello"'
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
@ -105,4 +105,3 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
lib_deps = lib_deps =
${Xiao_S3_WIO.lib_deps} ${Xiao_S3_WIO.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0