Skip to content

Commit e4ec9ae

Browse files
author
Scott Powell
committed
* tidy ups
1 parent 919e6d3 commit e4ec9ae

File tree

5 files changed

+25
-32
lines changed

5 files changed

+25
-32
lines changed

examples/simple_repeater/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ class MyMesh : public mesh::Mesh {
310310
: mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables)
311311
{
312312
my_radio = &radio;
313-
airtime_factor = 0.0; // 5.0; // 1/6th
313+
airtime_factor = 1.0; // one half
314314
num_clients = 0;
315315
}
316316

examples/simple_secure_chat/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#define SEND_TIMEOUT_BASE_MILLIS 300
4747
#define FLOOD_SEND_TIMEOUT_FACTOR 16.0f
48-
#define DIRECT_SEND_PERHOP_FACTOR 3.7213f
48+
#define DIRECT_SEND_PERHOP_FACTOR 4.0f
4949
#define DIRECT_SEND_PERHOP_EXTRA_MILLIS 100
5050

5151
/* -------------------------------------------------------------------------------------- */

license.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2025 Scott Powell
3+
Copyright (c) 2025 Scott Powell / rippleradios.com
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

platformio.ini

+21-28
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ lib_deps =
1717
jgromes/RadioLib @ ^6.3.0
1818
rweather/Crypto @ ^0.4.0
1919
build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1
20+
-D LORA_FREQ=867.5
21+
-D LORA_BW=250
22+
-D LORA_SF=10
2023
build_src_filter = +<*.cpp> +<helpers/*.cpp>
2124

2225
[esp32_base]
@@ -25,16 +28,6 @@ platform = espressif32
2528
monitor_filters = esp32_exception_decoder
2629
build_src_filter = ${arduino_base.build_src_filter}
2730

28-
[esp32_S3]
29-
extends = esp32_base
30-
platform = espressif32
31-
board = esp32-s3-devkitc-1
32-
build_src_filter = ${esp32_base.build_src_filter}
33-
build_flags =
34-
${esp32_base.build_flags}
35-
lib_deps =
36-
${esp32_base.lib_deps}
37-
3831
[Heltec_stick_lite]
3932
extends = esp32_base
4033
board = heltec_wireless_stick_lite
@@ -50,9 +43,6 @@ board = esp32-s3-devkitc-1
5043
build_flags =
5144
${esp32_base.build_flags}
5245
-D HELTEC_LORA_V3
53-
; -D LORA_FREQ=867.5
54-
; -D LORA_BW=125
55-
; -D LORA_SF=11
5646
-D LORA_TX_POWER=22
5747
-D SX126X_DIO2_AS_RF_SWITCH=true
5848
-D SX126X_DIO3_TCXO_VOLTAGE=1.8
@@ -73,17 +63,19 @@ build_flags =
7363
${Heltec_lora32_v3.build_flags}
7464
-D RADIO_CLASS=CustomSX1262
7565
-D WRAPPER_CLASS=CustomSX1262Wrapper
76-
; -D NODE_ID=2
77-
-D MESH_PACKET_LOGGING=1
78-
-D MESH_DEBUG=1
66+
-D ADVERT_NAME="\"Heltec Repeater\""
67+
-D ADVERT_LAT=-37.0
68+
-D ADVERT_LON=145.0
69+
-D ADMIN_PASSWORD="\"password\""
70+
; -D MESH_PACKET_LOGGING=1
71+
; -D MESH_DEBUG=1
7972
build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_repeater/main.cpp>
8073

8174
[env:Heltec_v3_chat_alice]
8275
extends = Heltec_lora32_v3
8376
build_flags =
8477
${Heltec_lora32_v3.build_flags}
8578
-D RUN_AS_ALICE=true
86-
; -D NODE_ID=1
8779
-D MESH_PACKET_LOGGING=1
8880
-D MESH_DEBUG=1
8981
build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
@@ -93,7 +85,6 @@ extends = Heltec_lora32_v3
9385
build_flags =
9486
${Heltec_lora32_v3.build_flags}
9587
-D RUN_AS_ALICE=false
96-
; -D NODE_ID=3
9788
-D MESH_PACKET_LOGGING=1
9889
-D MESH_DEBUG=1
9990
build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
@@ -102,7 +93,6 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_sec
10293
extends = Heltec_lora32_v3
10394
build_flags =
10495
${Heltec_lora32_v3.build_flags}
105-
; -D NODE_ID=1
10696
build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/test_admin/main.cpp>
10797

10898
; ================
@@ -130,9 +120,10 @@ build_flags =
130120
-D RADIO_CLASS=CustomSX1262
131121
-D WRAPPER_CLASS=CustomSX1262Wrapper
132122
-D LORA_TX_POWER=22
133-
-D LORA_FREQ=915.0
134-
-D LORA_BW=250
135-
-D LORA_SF=10
123+
-D ADVERT_NAME="\"Xiao Repeater\""
124+
-D ADVERT_LAT=-37.0
125+
-D ADVERT_LON=145.0
126+
-D ADMIN_PASSWORD="\"password\""
136127
; -D MESH_PACKET_LOGGING=1
137128
; -D MESH_DEBUG=1
138129

@@ -144,9 +135,10 @@ build_flags =
144135
-D RADIO_CLASS=CustomSX1268
145136
-D WRAPPER_CLASS=CustomSX1268Wrapper
146137
-D LORA_TX_POWER=22
147-
-D LORA_FREQ=433.0
148-
-D LORA_BW=250
149-
-D LORA_SF=10
138+
-D ADVERT_NAME="\"Xiao Repeater\""
139+
-D ADVERT_LAT=-37.0
140+
-D ADVERT_LON=145.0
141+
-D ADMIN_PASSWORD="\"password\""
150142
; -D MESH_PACKET_LOGGING=1
151143
; -D MESH_DEBUG=1
152144

@@ -177,8 +169,9 @@ build_flags =
177169
-D RADIO_CLASS=CustomSX1262
178170
-D WRAPPER_CLASS=CustomSX1262Wrapper
179171
-D LORA_TX_POWER=22
180-
-D LORA_FREQ=915.0
181-
-D LORA_BW=250
182-
-D LORA_SF=10
172+
-D ADVERT_NAME="\"XiaoS3 Repeater\""
173+
-D ADVERT_LAT=-37.0
174+
-D ADVERT_LON=145.0
175+
-D ADMIN_PASSWORD="\"password\""
183176
; -D MESH_PACKET_LOGGING=1
184177
; -D MESH_DEBUG=1

src/Dispatcher.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void Dispatcher::begin() {
1515
}
1616

1717
float Dispatcher::getAirtimeBudgetFactor() const {
18-
return 5.0; // default, 16.6% (1/6th)
18+
return 2.0; // default, 33.3% (1/3rd)
1919
}
2020

2121
void Dispatcher::loop() {

0 commit comments

Comments
 (0)