Merge remote-tracking branch 'origin/master' into develop

src/mesh/NodeDB.cpp

@@ -81,6 +81,14 @@ static unsigned char userprefs_admin_key_1[] = USERPREFS_USE_ADMIN_KEY_1;
 static unsigned char userprefs_admin_key_2[] = USERPREFS_USE_ADMIN_KEY_2;
 #endif
 
+// Weak empty variant initialization function.
+// May be redefined by variant files.
+void variantDefaultConfig() __attribute__((weak));
+void variantDefaultConfig() {}
+
+void variantDefaultModuleConfig() __attribute__((weak));
+void variantDefaultModuleConfig() {}
+
 #ifdef HELTEC_MESH_NODE_T114
 
 uint32_t read8(uint8_t bits, uint8_t dummy, uint8_t cs, uint8_t sck, uint8_t mosi, uint8_t dc, uint8_t rst)
@@ -904,6 +912,8 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
 #endif
 
     initConfigIntervals();
+    variantDefaultConfig();
+    variantDefaultModuleConfig();
 }
 
 void NodeDB::initConfigIntervals()

variants/esp32s3/ELECROW-ThinkNode-G3/platformio.ini

@@ -12,7 +12,11 @@ build_flags =
   -mfix-esp32-psram-cache-issue
 
 lib_ignore =
-    Ethernet
+  Ethernet
+
+build_src_filter =
+  ${esp32s3_base.build_src_filter}
+  +<../variants/esp32s3/ELECROW-ThinkNode-G3/*>
 
 lib_deps =
   ${esp32s3_base.lib_deps}

variants/esp32s3/ELECROW-ThinkNode-G3/variant.cpp

@@ -0,0 +1,6 @@
+#include "mesh/NodeDB.h"
+
+void variantDefaultConfig()
+{
+    config.network.eth_enabled = true;
+}

variants/esp32s3/ELECROW-ThinkNode-M7/platformio.ini

@@ -11,7 +11,11 @@ build_flags =
   -mfix-esp32-psram-cache-issue
 
 lib_ignore = 
-    Ethernet
+  Ethernet
+
+build_src_filter =
+  ${esp32s3_base.build_src_filter}
+  +<../variants/esp32s3/ELECROW-ThinkNode-M7/*>
 
 lib_deps =
   ${esp32s3_base.lib_deps}

variants/esp32s3/ELECROW-ThinkNode-M7/variant.cpp

@@ -0,0 +1,6 @@
+#include "mesh/NodeDB.h"
+
+void variantDefaultConfig()
+{
+    config.network.eth_enabled = true;
+}