From: Mark Qvist <mark@unsigned.io>
Date: Sat, 10 Feb 2024 12:49:47 +0000 (+0100)
Subject: Merge branch 'master' of github.com:markqvist/RNode_Firmware
X-Git-Url: https://git.tnoah.ca/?a=commitdiff_plain;h=35515bc7fa396f3ba87ea1b6a3e545df15334f99;p=lora-radio.git

Merge branch 'master' of github.com:markqvist/RNode_Firmware
---

35515bc7fa396f3ba87ea1b6a3e545df15334f99
diff --cc Boards.h
index b921b4e,29886cf..10544fb
--- a/Boards.h
+++ b/Boards.h
@@@ -42,16 -42,14 +42,16 @@@
      #define BOARD_GENERIC_NRF52 0x50
      #define BOARD_RAK4630       0x51
  
 -    #if BOARD_MODEL == BOARD_RAK4630
 -      #define MODEM SX1262
 -    #elif BOARD_MODEL == BOARD_RNODE_NG_22
 -      #define MODEM SX1262
 -    #elif BOARD_MODEL == BOARD_GENERIC_NRF52
 -      #define MODEM SX1262
 -    #else
 -      #define MODEM SX1276
 +    #ifndef MODEM
 +      #if BOARD_MODEL == BOARD_RAK4630
 +        #define MODEM SX1262
 +      #elif BOARD_MODEL == BOARD_RNODE_NG_22
 +        #define MODEM SX1262
 +      #elif BOARD_MODEL == BOARD_GENERIC_NRF52
 +        #define MODEM SX1262
 +      #else
 +        #define MODEM SX1276
 +      #endif
      #endif
  
- #endif
+ #endif