Merge branch 'master' into neighborinfo

src/graphics/RAKled.h

@@ -0,0 +1,7 @@
+#include "main.h"
+
+#ifdef RAK4630
+#include <NCP5623.h>
+extern NCP5623 rgb;
+
+#endif

src/main.cpp

@@ -19,6 +19,7 @@
 #include "detect/ScanI2CTwoWire.h"
 #include "detect/axpDebug.h"
 #include "detect/einkScan.h"
+#include "graphics/RAKled.h"
 #include "graphics/Screen.h"
 #include "main.h"
 #include "mesh/generated/meshtastic/config.pb.h"
@@ -360,6 +361,15 @@ void setup()
     // Only one supported RGB LED currently
     rgb_found = i2cScanner->find(ScanI2C::DeviceType::NCP5623);
 
+// Start the RGB LED at 50%
+#ifdef RAK4630
+    if (rgb_found.type == ScanI2C::NCP5623) {
+        rgb.begin();
+        rgb.setCurrent(10);
+        rgb.setColor(128, 128, 128);
+    }
+#endif
+
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
     auto acc_info = i2cScanner->firstAccelerometer();
     accelerometer_found = acc_info.type != ScanI2C::DeviceType::NONE ? acc_info.address : accelerometer_found;

src/mesh/NodeDB.cpp

@@ -294,9 +294,6 @@ void NodeDB::installDefaultDeviceState()
 
     generatePacketId(); // FIXME - ugly way to init current_packet_id;
 
-    // Init our blank owner info to reasonable defaults
-    getMacAddr(ourMacAddr);
-
     // Set default owner name
     pickNewNodeNum(); // based on macaddr now
     snprintf(owner.long_name, sizeof(owner.long_name), "Meshtastic %02x%02x", ourMacAddr[4], ourMacAddr[5]);
@@ -382,6 +379,8 @@ void NodeDB::pickNewNodeNum()
 {
     NodeNum r = myNodeInfo.my_node_num;
 
+    getMacAddr(ourMacAddr); // Make sure ourMacAddr is set
+
     // Pick an initial nodenum based on the macaddr
     r = (ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5];
 

src/modules/ExternalNotificationModule.cpp

@@ -11,7 +11,7 @@
 #include "main.h"
 
 #ifdef RAK4630
-#include <NCP5623.h>
+#include <graphics/RAKled.h>
 NCP5623 rgb;
 
 uint8_t red = 0;