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

diff --cc Boards.h
index b921b4e5daba76b8dd53c46d22c1315314db7283,29886cf4eba1b432bb75b6e2448e3d57aed5e9c6..10544fb68e38329acbb5f0fd7ae4d1c98b287ce0
--- 1/Boards.h
--- 2/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