Scott Powell před 1 rokem
rodič
revize
e4ec9aec0b

+ 1 - 1
examples/simple_repeater/main.cpp

@@ -310,7 +310,7 @@ public:
      : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables)
   {
     my_radio = &radio;
-    airtime_factor = 0.0;  // 5.0;   // 1/6th
+    airtime_factor = 1.0;    // one half
     num_clients = 0;
   }
 

+ 1 - 1
examples/simple_secure_chat/main.cpp

@@ -45,7 +45,7 @@
 
 #define SEND_TIMEOUT_BASE_MILLIS          300
 #define FLOOD_SEND_TIMEOUT_FACTOR         16.0f
-#define DIRECT_SEND_PERHOP_FACTOR         3.7213f
+#define DIRECT_SEND_PERHOP_FACTOR         4.0f
 #define DIRECT_SEND_PERHOP_EXTRA_MILLIS   100
 
 /* -------------------------------------------------------------------------------------- */

+ 1 - 1
license.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Scott Powell
+Copyright (c) 2025 Scott Powell / rippleradios.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

+ 21 - 28
platformio.ini

@@ -17,6 +17,9 @@ lib_deps =
   jgromes/RadioLib @ ^6.3.0
   rweather/Crypto @ ^0.4.0
 build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1
+  -D LORA_FREQ=867.5
+  -D LORA_BW=250
+  -D LORA_SF=10
 build_src_filter = +<*.cpp> +<helpers/*.cpp>
 
 [esp32_base]
@@ -25,16 +28,6 @@ platform = espressif32
 monitor_filters = esp32_exception_decoder
 build_src_filter = ${arduino_base.build_src_filter}
 
-[esp32_S3]
-extends = esp32_base
-platform = espressif32
-board = esp32-s3-devkitc-1
-build_src_filter = ${esp32_base.build_src_filter}
-build_flags =
-  ${esp32_base.build_flags}
-lib_deps =
-  ${esp32_base.lib_deps}
-
 [Heltec_stick_lite]
 extends = esp32_base
 board = heltec_wireless_stick_lite
@@ -50,9 +43,6 @@ board = esp32-s3-devkitc-1
 build_flags =
   ${esp32_base.build_flags} 
   -D HELTEC_LORA_V3
-;  -D LORA_FREQ=867.5
-;  -D LORA_BW=125
-;  -D LORA_SF=11
   -D LORA_TX_POWER=22
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
@@ -73,9 +63,12 @@ build_flags =
   ${Heltec_lora32_v3.build_flags} 
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
-; -D NODE_ID=2
-  -D MESH_PACKET_LOGGING=1
-  -D MESH_DEBUG=1
+  -D ADVERT_NAME="\"Heltec Repeater\""
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD="\"password\""
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_repeater/main.cpp>
 
 [env:Heltec_v3_chat_alice]
@@ -83,7 +76,6 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags} 
   -D RUN_AS_ALICE=true
-; -D NODE_ID=1
   -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
@@ -93,7 +85,6 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags} 
   -D RUN_AS_ALICE=false
-; -D NODE_ID=3
   -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
 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
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags} 
-; -D NODE_ID=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/test_admin/main.cpp>
 
 ; ================
@@ -130,9 +120,10 @@ build_flags =
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
-  -D LORA_FREQ=915.0
-  -D LORA_BW=250
-  -D LORA_SF=10
+  -D ADVERT_NAME="\"Xiao Repeater\""
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD="\"password\""
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -144,9 +135,10 @@ build_flags =
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
-  -D LORA_FREQ=433.0
-  -D LORA_BW=250
-  -D LORA_SF=10
+  -D ADVERT_NAME="\"Xiao Repeater\""
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD="\"password\""
  ; -D MESH_PACKET_LOGGING=1
  ; -D MESH_DEBUG=1
 
@@ -177,8 +169,9 @@ build_flags =
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
-  -D LORA_FREQ=915.0
-  -D LORA_BW=250
-  -D LORA_SF=10
+  -D ADVERT_NAME="\"XiaoS3 Repeater\""
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD="\"password\""
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1

+ 1 - 1
src/Dispatcher.cpp

@@ -15,7 +15,7 @@ void Dispatcher::begin() {
 }
 
 float Dispatcher::getAirtimeBudgetFactor() const {
-  return 5.0;   // default, 16.6%  (1/6th)
+  return 2.0;   // default, 33.3%  (1/3rd)
 }
 
 void Dispatcher::loop() {