.github/workflows/build_raspbian_armv7l.yml

@@ -13,8 +13,8 @@ jobs:
       - name: Install libbluetooth
         shell: bash
         run: |
-          sudo apt-get update -y --fix-missing
+          apt-get update -y --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
+          apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
 
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/package_amd64.yml

@@ -54,10 +54,6 @@ jobs:
           mkdir -p .debpkg/etc/meshtasticd/available.d
           mkdir -p .debpkg/usr/lib/systemd/system/
           tar -xf build.tar -C .debpkg/usr/share/doc/meshtasticd/web
-          shopt -s dotglob nullglob
-          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then mv  .debpkg/usr/share/doc/meshtasticd/web/build/* .debpkg/usr/share/doc/meshtasticd/web/; fi
-          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/doc/meshtasticd/web/build; fi
-          if [ -d .debpkg/usr/share/doc/meshtasticd/web/.DS_Store]; then rm -f .debpkg/usr/share/doc/meshtasticd/web/.DS_Store; fi
           gunzip .debpkg/usr/share/doc/meshtasticd/web/*.gz
           cp release/meshtasticd_linux_x86_64 .debpkg/usr/sbin/meshtasticd
           cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml

.github/workflows/package_raspbian.yml

@@ -54,10 +54,6 @@ jobs:
           mkdir -p .debpkg/etc/meshtasticd/available.d
           mkdir -p .debpkg/usr/lib/systemd/system/
           tar -xf build.tar -C .debpkg/usr/share/doc/meshtasticd/web
-          shopt -s dotglob nullglob
-          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then mv  .debpkg/usr/share/doc/meshtasticd/web/build/* .debpkg/usr/share/doc/meshtasticd/web/; fi
-          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/doc/meshtasticd/web/build; fi
-          if [ -d .debpkg/usr/share/doc/meshtasticd/web/.DS_Store]; then rm -f .debpkg/usr/share/doc/meshtasticd/web/.DS_Store; fi
           gunzip .debpkg/usr/share/doc/meshtasticd/web/*.gz
           cp release/meshtasticd_linux_aarch64 .debpkg/usr/sbin/meshtasticd
           cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml

.github/workflows/package_raspbian_armv7l.yml

@@ -54,10 +54,6 @@ jobs:
           mkdir -p .debpkg/etc/meshtasticd/available.d
           mkdir -p .debpkg/usr/lib/systemd/system/
           tar -xf build.tar -C .debpkg/usr/share/doc/meshtasticd/web
-          shopt -s dotglob nullglob
-          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then mv  .debpkg/usr/share/doc/meshtasticd/web/build/* .debpkg/usr/share/doc/meshtasticd/web/; fi
-          if [ -d .debpkg/usr/share/doc/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/doc/meshtasticd/web/build; fi
-          if [ -d .debpkg/usr/share/doc/meshtasticd/web/.DS_Store]; then rm -f .debpkg/usr/share/doc/meshtasticd/web/.DS_Store; fi
           gunzip .debpkg/usr/share/doc/meshtasticd/web/*.gz
           cp release/meshtasticd_linux_armv7l .debpkg/usr/sbin/meshtasticd
           cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml

arch/nrf52/nrf52.ini

@@ -14,7 +14,6 @@ build_flags =
   -Wno-unused-variable
   -Isrc/platform/nrf52
   -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
-  -DMESHTASTIC_EXCLUDE_AUDIO=1
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>

platformio.ini

@@ -39,126 +39,128 @@ default_envs = tbeam
 ;default_envs = heltec_vision_master_e213
 ;default_envs = heltec_vision_master_e290
 ;default_envs = heltec_mesh_node_t114
+
 extra_configs =
-	arch/*/*.ini
+  arch/*/*.ini
-	variants/*/platformio.ini
+  variants/*/platformio.ini
-description = Meshtastic
 
 [env]
 test_build_src = true
 extra_scripts = bin/platformio-custom.py
+
 ; note: we add src to our include search path so that lmic_project_config can override
 ; note: TINYGPS_OPTION_NO_CUSTOM_FIELDS is VERY important.  We don't use custom fields and somewhere in that pile
 ; of code is a heap corruption bug!
 ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc
 ; The Radiolib stuff will speed up building considerably. Exclud all the stuff we dont need.
 build_flags = -Wno-missing-field-initializers
-
+  -Wno-format
-	-Wno-format
+  -Isrc -Isrc/mesh -Isrc/mesh/generated -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map
-	-Isrc -Isrc/mesh -Isrc/mesh/generated -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map
+  -DUSE_THREAD_NAMES
-	-DUSE_THREAD_NAMES
+  -DTINYGPS_OPTION_NO_CUSTOM_FIELDS
-	-DTINYGPS_OPTION_NO_CUSTOM_FIELDS
+  -DPB_ENABLE_MALLOC=1
-	-DPB_ENABLE_MALLOC=1
+  -DRADIOLIB_EXCLUDE_CC1101=1
-	-DRADIOLIB_EXCLUDE_CC1101=1
+  -DRADIOLIB_EXCLUDE_NRF24=1
-	-DRADIOLIB_EXCLUDE_NRF24=1
+  -DRADIOLIB_EXCLUDE_RF69=1
-	-DRADIOLIB_EXCLUDE_RF69=1
+  -DRADIOLIB_EXCLUDE_SX1231=1
-	-DRADIOLIB_EXCLUDE_SX1231=1
+  -DRADIOLIB_EXCLUDE_SX1233=1
-	-DRADIOLIB_EXCLUDE_SX1233=1
+  -DRADIOLIB_EXCLUDE_SI443X=1
-	-DRADIOLIB_EXCLUDE_SI443X=1
+  -DRADIOLIB_EXCLUDE_RFM2X=1
-	-DRADIOLIB_EXCLUDE_RFM2X=1
+  -DRADIOLIB_EXCLUDE_AFSK=1
-	-DRADIOLIB_EXCLUDE_AFSK=1
+  -DRADIOLIB_EXCLUDE_BELL=1
-	-DRADIOLIB_EXCLUDE_BELL=1
+  -DRADIOLIB_EXCLUDE_HELLSCHREIBER=1
-	-DRADIOLIB_EXCLUDE_HELLSCHREIBER=1
+  -DRADIOLIB_EXCLUDE_MORSE=1
-	-DRADIOLIB_EXCLUDE_MORSE=1
+  -DRADIOLIB_EXCLUDE_RTTY=1
-	-DRADIOLIB_EXCLUDE_RTTY=1
+  -DRADIOLIB_EXCLUDE_SSTV=1
-	-DRADIOLIB_EXCLUDE_SSTV=1
+  -DRADIOLIB_EXCLUDE_AX25=1
-	-DRADIOLIB_EXCLUDE_AX25=1
+  -DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1
-	-DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1
+  -DRADIOLIB_EXCLUDE_BELL=1
-	-DRADIOLIB_EXCLUDE_BELL=1
+  -DRADIOLIB_EXCLUDE_PAGER=1
-	-DRADIOLIB_EXCLUDE_PAGER=1
+  -DRADIOLIB_EXCLUDE_FSK4=1
-	-DRADIOLIB_EXCLUDE_FSK4=1
+  -DRADIOLIB_EXCLUDE_APRS=1
-	-DRADIOLIB_EXCLUDE_APRS=1
+  -DRADIOLIB_EXCLUDE_LORAWAN=1
-	-DRADIOLIB_EXCLUDE_LORAWAN=1
+  -DMESHTASTIC_EXCLUDE_DROPZONE=1
-	-DMESHTASTIC_EXCLUDE_DROPZONE=1
+  -DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
-	-DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
+  #-DBUILD_EPOCH=$UNIX_TIME
-  -DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
+  ;-D OLED_PL
-        #-DBUILD_EPOCH=$UNIX_TIME
-        ;-D OLED_PL
 
 monitor_speed = 115200
 monitor_filters = direct
+
 lib_deps =
-	jgromes/RadioLib@7.0.2
+  jgromes/RadioLib@~7.0.2
-	https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95
+  https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95 ; ESP8266_SSD1306
-	mathertel/OneButton@2.6.1
+  mathertel/OneButton@~2.6.1 ; OneButton library for non-blocking button debounce
-	https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
+  https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
-	https://github.com/meshtastic/TinyGPSPlus.git#71a82db35f3b973440044c476d4bcdc673b104f4
+  https://github.com/meshtastic/TinyGPSPlus.git#71a82db35f3b973440044c476d4bcdc673b104f4
-	https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
+  https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
-	nanopb/Nanopb@0.4.9
+  nanopb/Nanopb@^0.4.9
-	erriez/ErriezCRC32@1.0.1
+  erriez/ErriezCRC32@^1.0.1
+  
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
 check_skip_packages = yes
 check_flags =
-	-DAPP_VERSION=1.0.0
+  -DAPP_VERSION=1.0.0
-	--suppressions-list=suppressions.txt
+  --suppressions-list=suppressions.txt
-	--inline-suppr
+  --inline-suppr
 
 ; Common settings for conventional (non Portduino) Arduino targets
 [arduino_base]
 framework = arduino
 lib_deps =
-	${env.lib_deps}
+  ${env.lib_deps}
-	end2endzone/NonBlockingRTTTL@1.3.0
+  end2endzone/NonBlockingRTTTL@^1.3.0
-	https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#5cf62b36c6f30bc72a07bdb2c11fc9a22d1e31da
+  https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#5cf62b36c6f30bc72a07bdb2c11fc9a22d1e31da
+
 build_flags = ${env.build_flags} -Os
 build_src_filter = ${env.build_src_filter} -<platform/portduino/>
 
 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
 lib_deps =
-	knolleary/PubSubClient@2.8
+  knolleary/PubSubClient@^2.8
-	arduino-libraries/NTPClient@3.1.0
+  arduino-libraries/NTPClient@^3.1.0
-	arcao/Syslog@2.0.0
+  arcao/Syslog@^2.0.0
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
 [environmental_base]
 lib_deps =
-	adafruit/Adafruit BusIO@1.16.2
+  adafruit/Adafruit BusIO@^1.16.1
-	adafruit/Adafruit Unified Sensor@1.1.14
+  adafruit/Adafruit Unified Sensor@^1.1.11
-	adafruit/Adafruit BMP280 Library@2.6.8
+  adafruit/Adafruit BMP280 Library@^2.6.8
-	adafruit/Adafruit BMP085 Library@1.2.4
+  adafruit/Adafruit BMP085 Library@^1.2.4
-	adafruit/Adafruit BME280 Library@2.2.4
+  adafruit/Adafruit BME280 Library@^2.2.2
-	adafruit/Adafruit BMP3XX Library@2.1.5
+  adafruit/Adafruit BMP3XX Library@^2.1.5
-	adafruit/Adafruit MCP9808 Library@2.0.2
+  adafruit/Adafruit MCP9808 Library@^2.0.0
-	adafruit/Adafruit INA260 Library@1.5.2
+  adafruit/Adafruit INA260 Library@^1.5.0
-	adafruit/Adafruit INA219@1.2.3
+  adafruit/Adafruit INA219@^1.2.0
-	adafruit/Adafruit MAX1704X@1.0.3
+  adafruit/Adafruit MAX1704X@^1.0.3
-	adafruit/Adafruit SHTC3 Library@1.0.1
+  adafruit/Adafruit SHTC3 Library@^1.0.0
-	adafruit/Adafruit LPS2X@2.0.6
+  adafruit/Adafruit LPS2X@^2.0.4
-	adafruit/Adafruit SHT31 Library@2.2.2
+  adafruit/Adafruit SHT31 Library@^2.2.2
-	adafruit/Adafruit PM25 AQI Sensor@1.1.1
+  adafruit/Adafruit PM25 AQI Sensor@^1.1.1
-	adafruit/Adafruit MPU6050@2.2.6
+  adafruit/Adafruit MPU6050@^2.2.4
-	adafruit/Adafruit LIS3DH@1.3.0
+  adafruit/Adafruit LIS3DH@^1.3.0
-	adafruit/Adafruit AHTX0@2.0.5
+  adafruit/Adafruit AHTX0@^2.0.5
-	adafruit/Adafruit LSM6DS@4.7.3
+  adafruit/Adafruit LSM6DS@^4.7.2
-	adafruit/Adafruit VEML7700 Library@2.1.6
+  adafruit/Adafruit VEML7700 Library@^2.1.6
-	adafruit/Adafruit SHT4x Library@1.0.5
+  adafruit/Adafruit SHT4x Library@^1.0.4
-	adafruit/Adafruit TSL2591 Library@1.4.5
+  adafruit/Adafruit TSL2591 Library@^1.4.5
-	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
+  sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@^1.0.5
-	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.2.13
+  sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@^1.2.13
-	ClosedCube OPT3001@1.1.2
+  ClosedCube OPT3001@^1.1.2
-	emotibit/EmotiBit MLX90632@1.0.8
+  emotibit/EmotiBit MLX90632@^1.0.8
-	dfrobot/DFRobot_RTU@1.0.3
+  dfrobot/DFRobot_RTU@^1.0.3
-	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
+  sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@^1.1.2
-	adafruit/Adafruit MLX90614 Library@2.1.5
+  adafruit/Adafruit MLX90614 Library@^2.1.5
 
-	https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
+  https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
-	boschsensortec/BME68x Sensor Library@1.1.40407
+  boschsensortec/BME68x Sensor Library@^1.1.40407
-	https://github.com/KodinLanewave/INA3221@1.0.1
+  https://github.com/KodinLanewave/INA3221@^1.0.1
-	lewisxhe/SensorLib@0.2.0
+  lewisxhe/SensorLib@0.2.0
-	mprograms/QMC5883LCompass@1.2.3
+  mprograms/QMC5883LCompass@^1.2.0
-
+  
-	https://github.com/meshtastic/DFRobot_LarkWeatherStation#4de3a9cadef0f6a5220a8a906cf9775b02b0040d
+  https://github.com/meshtastic/DFRobot_LarkWeatherStation#4de3a9cadef0f6a5220a8a906cf9775b02b0040d
-	https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1
+  https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1

protobufs

@@ -1 +1 @@
-Subproject commit 04f21f5c7238b8e02f794d9282c4786752634b3c
+Subproject commit 834915aa046532da0bd8478c250eb33847e9518f

src/main.cpp

@@ -653,7 +653,7 @@ void setup()
     // but we need to do this after main cpu init (esp32setup), because we need the random seed set
     nodeDB = new NodeDB;
 
-    // If we're taking on the repeater role, use NextHopRouter and turn off 3V3_S rail because peripherals are not needed
+    // If we're taking on the repeater role, use flood router and turn off 3V3_S rail because peripherals are not needed
     if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER) {
         router = new NextHopRouter();
 #ifdef PIN_3V3_EN
@@ -1161,31 +1161,6 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
     deviceMetadata.hw_model = HW_VENDOR;
     deviceMetadata.hasRemoteHardware = moduleConfig.remote_hardware.enabled;
     deviceMetadata.excluded_modules = meshtastic_ExcludedModules_EXCLUDED_NONE;
-#if MESHTASTIC_EXCLUDE_REMOTEHARDWARE
-    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_REMOTEHARDWARE_CONFIG;
-#endif
-#if MESHTASTIC_EXCLUDE_AUDIO
-    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AUDIO_CONFIG;
-#endif
-#if !HAS_SCREEN || NO_EXT_GPIO
-    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_CANNEDMSG_CONFIG | meshtastic_ExcludedModules_EXTNOTIF_CONFIG;
-#endif
-// Only edge case here is if we apply this a device with built in Accelerometer and want to detect interrupts
-// We'll have to macro guard against those targets potentially
-#if NO_EXT_GPIO
-    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_DETECTIONSENSOR_CONFIG;
-#endif
-// If we don't have any GPIO and we don't have GPS, no purpose in having serial config
-#if NO_EXT_GPIO && NO_GPS
-    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_SERIAL_CONFIG;
-#endif
-#ifndef ARCH_ESP32
-    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_PAXCOUNTER_CONFIG;
-#endif
-#if !defined(HAS_NCP5623) && !defined(RGBLED_RED) && !defined(HAS_NEOPIXEL) && !defined(UNPHONE) && !RAK_4631
-    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AMBIENTLIGHTING_CONFIG;
-#endif
-
 #if !(MESHTASTIC_EXCLUDE_PKI)
     deviceMetadata.hasPKC = true;
 #endif

src/mesh/Default.h

@@ -19,7 +19,7 @@
 #define default_node_info_broadcast_secs 3 * 60 * 60
 #define default_neighbor_info_broadcast_secs 6 * 60 * 60
 #define min_node_info_broadcast_secs 60 * 60 // No regular broadcasts of more than once an hour
-#define min_neighbor_info_broadcast_secs 4 * 60 * 60
+#define min_neighbor_info_broadcast_secs 2 * 60 * 60
 
 #define default_mqtt_address "mqtt.meshtastic.org"
 #define default_mqtt_username "meshdev"

src/mesh/NextHopRouter.cpp

@@ -54,13 +54,14 @@ void NextHopRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtast
     if (isAckorReply) {
         // Update next-hop for the original transmitter of this successful transmission to the relay node, but ONLY if "from" is
         // not 0 (means implicit ACK) and original packet was also relayed by this node, or we sent it directly to the destination
-        if (p->from != 0) {
+        if (p->from != 0 && p->relay_node) {
             meshtastic_NodeInfoLite *origTx = nodeDB->getMeshNode(p->from);
             if (origTx) {
                 // Either relayer of ACK was also a relayer of the packet, or we were the relayer and the ACK came directly from
                 // the destination
                 if (wasRelayer(p->relay_node, p->decoded.request_id, p->to) ||
-                    (wasRelayer(ourRelayID, p->decoded.request_id, p->to) && p->hop_start != 0 && p->hop_start == p->hop_limit)) {
+                    (wasRelayer(ourRelayID, p->decoded.request_id, p->to) &&
+                     p->relay_node == nodeDB->getLastByteOfNodeNum(p->from))) {
                     if (origTx->next_hop != p->relay_node) { // Not already set
                         LOG_INFO("Update next hop of 0x%x to 0x%x based on ACK/reply", p->from, p->relay_node);
                         origTx->next_hop = p->relay_node;
@@ -75,18 +76,18 @@ void NextHopRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtast
         }
     }
 
-    if (!isToUs(p) && !isFromUs(p) && p->hop_limit > 0) {
+    if (isRebroadcaster()) {
-        if (p->next_hop == NO_NEXT_HOP_PREFERENCE || p->next_hop == ourRelayID) {
+        if (!isToUs(p) && !isFromUs(p)) {
-            if (isRebroadcaster()) {
+            if (p->next_hop == NO_NEXT_HOP_PREFERENCE || p->next_hop == ourRelayID) {
                 meshtastic_MeshPacket *tosend = packetPool.allocCopy(*p); // keep a copy because we will be sending it
                 LOG_INFO("Relaying received message coming from %x", p->relay_node);
 
                 tosend->hop_limit--; // bump down the hop count
                 NextHopRouter::send(tosend);
-            } else {
+            } // else don't relay
-                LOG_DEBUG("Not rebroadcasting: Role = CLIENT_MUTE or Rebroadcast Mode = NONE");
-            }
         }
+    } else {
+        LOG_DEBUG("Not rebroadcasting: Role = CLIENT_MUTE or Rebroadcast Mode = NONE");
     }
     // handle the packet as normal
     Router::sniffReceived(p, c);
@@ -98,10 +99,6 @@ void NextHopRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtast
  */
 uint8_t NextHopRouter::getNextHop(NodeNum to, uint8_t relay_node)
 {
-    // When we're a repeater router->sniffReceived will call NextHopRouter directly without checking for broadcast
-    if (isBroadcast(to))
-        return NO_NEXT_HOP_PREFERENCE;
-
     meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(to);
     if (node && node->next_hop) {
         // We are careful not to return the relay node as the next hop
@@ -122,7 +119,6 @@ PendingPacket *NextHopRouter::findPendingPacket(GlobalPacketId key)
     } else
         return NULL;
 }
-
 /**
  * Stop any retransmissions we are doing of the specified node/packet ID pair
  */
@@ -139,7 +135,7 @@ bool NextHopRouter::stopRetransmission(GlobalPacketId key)
         auto p = old->packet;
         /* Only when we already transmitted a packet via LoRa, we will cancel the packet in the Tx queue
           to avoid canceling a transmission if it was ACKed super fast via MQTT */
-        if (old->numRetransmissions < NUM_RELIABLE_RETX - 1) {
+        if (old->numRetransmissions < NUM_RETRANSMISSIONS - 1) {
             // remove the 'original' (identified by originator and packet->id) from the txqueue and free it
             cancelSending(getFrom(p), p->id);
             // now free the pooled copy for retransmission too

src/mesh/NextHopRouter.h

@@ -49,14 +49,13 @@ class GlobalPacketIdHashFunction
 };
 
 /*
-  Router for direct messages, which only relays if it is the next hop for a packet. The next hop is set by the current
+  Router which only relays if it is the next hop for a packet.
-  relayer of a packet, which bases this on information from a previous successful delivery to the destination via flooding.
+  The next hop is set by the relay node of a packet, which bases this on information from either the NeighborInfoModule, or a
-  Namely, in the PacketHistory, we keep track of (up to 3) relayers of a packet. When the ACK is delivered back to us via a node
+  previous successful delivery via flooding. It is only used for DMs and not used for broadcasts. Using the NeighborInfoModule, it
-  that also relayed the original packet, we use that node as next hop for the destination from then on. This makes sure that only
+  can derive the next hop of neighbors and that of neighbors of neighbors. For others, it has no information in the beginning,
-  when there’s a two-way connection, we assign a next hop. Both the ReliableRouter and NextHopRouter will do retransmissions (the
+  which results into falling back to the FloodingRouter. Upon successful delivery via flooding, it updates the next hop of the
-  NextHopRouter only 1 time). For the final retry, if no one actually relayed the packet, it will reset the next hop in order to
+  recipient to the node that last relayed the ACK to us. When the ReliableRouter is doing retransmissions, at the last retry, it
-  fall back to the FloodingRouter again. Note that thus also intermediate hops will do a single retransmission if the intended
+  will reset the next hop, in order to fall back to the FloodingRouter.
-  next-hop didn’t relay, in order to fix changes in the middle of the route.
 */
 class NextHopRouter : public FloodingRouter
 {
@@ -86,10 +85,7 @@ class NextHopRouter : public FloodingRouter
         return min(d, r);
     }
 
-    // The number of retransmissions intermediate nodes will do (actually 1 less than this)
+    constexpr static uint8_t NUM_RETRANSMISSIONS = 2;
-    constexpr static uint8_t NUM_INTERMEDIATE_RETX = 2;
-    // The number of retransmissions the original sender will do
-    constexpr static uint8_t NUM_RELIABLE_RETX = 3;
 
   protected:
     /**
@@ -119,7 +115,7 @@ class NextHopRouter : public FloodingRouter
     /**
      * Add p to the list of packets to retransmit occasionally.  We will free it once we stop retransmitting.
      */
-    PendingPacket *startRetransmission(meshtastic_MeshPacket *p, uint8_t numReTx = NUM_INTERMEDIATE_RETX);
+    PendingPacket *startRetransmission(meshtastic_MeshPacket *p, uint8_t numReTx = NUM_RETRANSMISSIONS);
 
     /**
      * Stop any retransmissions we are doing of the specified node/packet ID pair

src/mesh/NodeDB.cpp

@@ -1219,7 +1219,9 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
 
     if (!lite) {
         if (isFull()) {
-            LOG_INFO("Node database full with %i nodes and %i bytes free. Erasing oldest entry", numMeshNodes,
+            if (screen)
+                screen->print("Warn: node database full!\nErasing oldest entry\n");
+            LOG_WARN("Node database full with %i nodes and %i bytes free! Erasing oldest entry", numMeshNodes,
                      memGet.getFreeHeap());
             // look for oldest node and erase it
             uint32_t oldest = UINT32_MAX;
@@ -1283,4 +1285,4 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
     LOG_ERROR("A critical failure occurred, portduino is exiting");
     exit(2);
 #endif
-}
+}

src/mesh/PacketHistory.cpp

@@ -49,13 +49,13 @@ bool PacketHistory::wasSeenRecently(const meshtastic_MeshPacket *p, bool withUpd
     }
 
     if (seenRecently) {
-        // If it was seen with a next-hop not set to us and now it's NO_NEXT_HOP_PREFERENCE, and the relayer relayed already
+        // If it was seen with a next-hop not set to us and now it's NO_NEXT_HOP_PREFERENCE, relayer relayed already before, it's
-        // before, it's a fallback to flooding. If we didn't already relay and the next-hop neither, consider it unseen because we
+        // a fallback to flooding. If we didn't already relay and the next-hop neither, consider it unseen because we might need
-        // might need to handle it now
+        // to handle it now
         uint8_t ourRelayID = nodeDB->getLastByteOfNodeNum(nodeDB->getNodeNum());
-        if (found->sender != nodeDB->getNodeNum() && found->next_hop != NO_NEXT_HOP_PREFERENCE && found->next_hop != ourRelayID &&
+        if (found->sender != nodeDB->getNodeNum() && found->next_hop != NO_NEXT_HOP_PREFERENCE &&
-            p->next_hop == NO_NEXT_HOP_PREFERENCE && wasRelayer(p->relay_node, found) && !wasRelayer(ourRelayID, found) &&
+            p->next_hop == NO_NEXT_HOP_PREFERENCE && found->next_hop != ourRelayID && p->relay_node != 0 &&
-            !wasRelayer(found->next_hop, found)) {
+            wasRelayer(p->relay_node, found) && !wasRelayer(ourRelayID, found) && !wasRelayer(found->next_hop, found)) {
             LOG_INFO("Fallback to flooding, consider unseen relay_node=0x%x", p->relay_node);
             seenRecently = false;
         }
@@ -109,9 +109,6 @@ void PacketHistory::clearExpiredRecentPackets()
  * @return true if node was indeed a relayer, false if not */
 bool PacketHistory::wasRelayer(const uint8_t relayer, const uint32_t id, const NodeNum sender)
 {
-    if (relayer == 0)
-        return false;
-
     PacketRecord r = {.sender = sender, .id = id, .rxTimeMsec = 0, .next_hop = 0};
     auto found = recentPackets.find(r);
 

src/mesh/RadioInterface.cpp

@@ -315,6 +315,10 @@ void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
         out += " encrypted";
     }
 
+    if (p->next_hop != 0)
+        out += DEBUG_PORT.mt_sprintf(" nextHop=0x%x", p->next_hop);
+    if (p->relay_node != 0)
+        out += DEBUG_PORT.mt_sprintf(" relay=0x%x", p->relay_node);
     if (p->rx_time != 0)
         out += DEBUG_PORT.mt_sprintf(" rxtime=%u", p->rx_time);
     if (p->rx_snr != 0.0)
@@ -325,10 +329,6 @@ void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
         out += DEBUG_PORT.mt_sprintf(" via MQTT");
     if (p->hop_start != 0)
         out += DEBUG_PORT.mt_sprintf(" hopStart=%d", p->hop_start);
-    if (p->next_hop != 0)
-        out += DEBUG_PORT.mt_sprintf(" nextHop=0x%x", p->next_hop);
-    if (p->relay_node != 0)
-        out += DEBUG_PORT.mt_sprintf(" relay=0x%x", p->relay_node);
     if (p->priority != 0)
         out += DEBUG_PORT.mt_sprintf(" priority=%d", p->priority);
 

src/mesh/ReliableRouter.cpp

@@ -23,7 +23,7 @@ ErrorCode ReliableRouter::send(meshtastic_MeshPacket *p)
         }
 
         auto copy = packetPool.allocCopy(*p);
-        startRetransmission(copy, NUM_RELIABLE_RETX);
+        startRetransmission(copy, this->NUM_RETRANSMISSIONS);
     }
 
     /* If we have pending retransmissions, add the airtime of this packet to it, because during that time we cannot receive an

src/mesh/ReliableRouter.h

@@ -31,4 +31,6 @@ class ReliableRouter : public NextHopRouter
      * We hook this method so we can see packets before FloodingRouter says they should be discarded
      */
     virtual bool shouldFilterReceived(const meshtastic_MeshPacket *p) override;
+
+    constexpr static uint8_t NUM_RETRANSMISSIONS = 3;
 };

src/mesh/Router.cpp

@@ -187,10 +187,9 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
             handleReceived(p, src);
         }
 
-        // don't override if a channel was requested and no need to set it when PKI is enforced
+        if (!p->channel && !p->pki_encrypted) { // don't override if a channel was requested
-        if (!p->channel && !p->pki_encrypted) {
             meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
-            if (node) {
+            if (node && node->user.public_key.size == 0) {
                 p->channel = node->channel;
                 LOG_DEBUG("localSend to channel %d", p->channel);
             }

src/modules/Modules.cpp

@@ -245,4 +245,4 @@ void setupModules()
     // NOTE! This module must be added LAST because it likes to check for replies from other modules and avoid sending extra
     // acks
     routingModule = new RoutingModule();
-}
+}

src/modules/NeighborInfoModule.cpp

@@ -121,12 +121,7 @@ Will be used for broadcast.
 */
 int32_t NeighborInfoModule::runOnce()
 {
-    if (moduleConfig.neighbor_info.transmit_over_lora && !channels.isDefaultChannel(channels.getPrimaryIndex()) &&
+    sendNeighborInfo(NODENUM_BROADCAST_NO_LORA, false);
-        airTime->isTxAllowedChannelUtil(true) && airTime->isTxAllowedAirUtil()) {
-        sendNeighborInfo(NODENUM_BROADCAST, false);
-    } else {
-        sendNeighborInfo(NODENUM_BROADCAST_NO_LORA, false);
-    }
     return Default::getConfiguredOrDefaultMs(moduleConfig.neighbor_info.update_interval, default_neighbor_info_broadcast_secs);
 }
 
@@ -213,4 +208,4 @@ meshtastic_Neighbor *NeighborInfoModule::getOrCreateNeighbor(NodeNum originalSen
         neighbors.push_back(new_nbr);
     }
     return &neighbors.back();
-}
+}

src/modules/NeighborInfoModule.h

@@ -67,4 +67,4 @@ class NeighborInfoModule : public ProtobufModule<meshtastic_NeighborInfo>, priva
     void printNeighborInfo(const char *header, const meshtastic_NeighborInfo *np);
     void printNodeDBNeighbors();
 };
-extern NeighborInfoModule *neighborInfoModule;
+extern NeighborInfoModule *neighborInfoModule;

variants/heltec_wireless_paper/variant.h

@@ -32,9 +32,6 @@
 #define HAS_32768HZ
 #define ADC_CTRL_ENABLED LOW
 
-#define NO_EXT_GPIO 1
-#define NO_GPS 1
-
 // LoRa
 #define USE_SX1262
 

variants/heltec_wireless_paper_v1/variant.h

@@ -32,9 +32,6 @@
 #define HAS_32768HZ
 #define ADC_CTRL_ENABLED LOW
 
-#define NO_EXT_GPIO 1
-#define NO_GPS 1
-
 // LoRa
 #define USE_SX1262
 

variants/t-echo/variant.h

@@ -216,8 +216,6 @@ External serial flash WP25R1635FZUIL0
 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
 #define ADC_MULTIPLIER (2.0F)
 
-#define NO_EXT_GPIO 1
-
 #define HAS_RTC 1
 
 #ifdef __cplusplus