From 8c9947b05c00e8137200a2b9093cbb19edd2aaa9 Mon Sep 17 00:00:00 2001
From: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Date: Sat, 15 Feb 2025 14:55:51 +0100
Subject: [PATCH 1/2] Allow NeighborInfo on non-default frequency slot (#6061)

---
 src/modules/NeighborInfoModule.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/NeighborInfoModule.cpp b/src/modules/NeighborInfoModule.cpp
index fb658421d..eebf428a4 100644
--- a/src/modules/NeighborInfoModule.cpp
+++ b/src/modules/NeighborInfoModule.cpp
@@ -121,7 +121,8 @@ Will be used for broadcast.
 */
 int32_t NeighborInfoModule::runOnce()
 {
-    if (moduleConfig.neighbor_info.transmit_over_lora && !channels.isDefaultChannel(channels.getPrimaryIndex()) &&
+    if (moduleConfig.neighbor_info.transmit_over_lora &&
+        (!channels.isDefaultChannel(channels.getPrimaryIndex()) || !RadioInterface::uses_default_frequency_slot) &&
         airTime->isTxAllowedChannelUtil(true) && airTime->isTxAllowedAirUtil()) {
         sendNeighborInfo(NODENUM_BROADCAST, false);
     } else {

From 2f6cd021115d0e63975cf8248bb550c76a7497a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gjels=C3=B8?=
 <36234524+gjelsoe@users.noreply.github.com>
Date: Sat, 15 Feb 2025 15:06:41 +0100
Subject: [PATCH 2/2] Typo for Bandit button LEDs (#6053)

Changed Button 2 LED index define from BUTTON1_COLOR_INDEX to correct BUTTON2_COLOR_INDEX
---
 src/AmbientLightingThread.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AmbientLightingThread.h b/src/AmbientLightingThread.h
index 600583348..c487f9d53 100644
--- a/src/AmbientLightingThread.h
+++ b/src/AmbientLightingThread.h
@@ -153,7 +153,7 @@ class AmbientLightingThread : public concurrency::OSThread
         pixels.fill(BUTTON1_COLOR, BUTTON1_COLOR_INDEX, 1);
 #endif
 #if defined(BUTTON2_COLOR) && defined(BUTTON2_COLOR_INDEX)
-        pixels.fill(BUTTON2_COLOR, BUTTON1_COLOR_INDEX, 1);
+        pixels.fill(BUTTON2_COLOR, BUTTON2_COLOR_INDEX, 1);
 #endif
 #endif
         pixels.show();