From: markqvist <mark@unsigned.io>
Date: Sat, 18 May 2024 08:26:10 +0000 (+0200)
Subject: Merge branch 'master' into master
X-Git-Url: https://git.tnoah.ca/?a=commitdiff_plain;h=30fb26e1a80b2382da97732bb275d988be192e20;p=lora-radio.git

Merge branch 'master' into master
---

30fb26e1a80b2382da97732bb275d988be192e20
diff --cc RNode_Firmware.ino
index 2fa93d3,db0605a..4410a91
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@@ -77,12 -77,8 +77,13 @@@ void setup() 
    fifo_init(&serialFIFO, serialBuffer, CONFIG_UART_BUFFER_SIZE);
  
    Serial.begin(serial_baudrate);
-   #if BOARD_MODEL != BOARD_RAK4631
 -  #if BOARD_MODEL != BOARD_RNODE_NG_22
++
++  #if BOARD_MODEL != BOARD_RAK4631 && BOARD_MODEL != BOARD_RNODE_NG_22
 +  // Some boards need to wait until the hardware UART is set up before booting
 +  // the full firmware. In the case of the RAK4631, the line below will wait
 +  // until a serial connection is actually established with a master. Thus, it
 +  // is disabled on this platform.
-   while (!Serial);
+     while (!Serial);
    #endif
  
    serial_interrupt_init();