Merge branch 'dev' of https://github.com/meshcore-dev/MeshCore into muzi-base-duo

.gitignore

@@ -16,3 +16,4 @@ cmake-*
 compile_commands.json
 .venv/
 venv/
+platformio.local.ini

platformio.ini

@@ -11,6 +11,7 @@
 [platformio]
 extra_configs =
 	variants/*/platformio.ini
+	platformio.local.ini
 
 [arduino_base]
 framework = arduino

variants/generic_espnow/platformio.ini

@@ -69,7 +69,7 @@ lib_deps =
 extends = Generic_ESPNOW
 build_flags =
   ${Generic_ESPNOW.build_flags}
-  -D ADVERT_NAME='"Heltec Room"'
+  -D ADVERT_NAME='"Generic ESPNow Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'

variants/thinknode_m5/platformio.ini

@@ -58,7 +58,7 @@ build_src_filter = ${ThinkNode_M5.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${ThinkNode_M5.build_flags}
-  -D ADVERT_NAME='"Thinknode M2 Repeater"'
+  -D ADVERT_NAME='"Thinknode M5 Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
@@ -116,7 +116,7 @@ build_src_filter = ${ThinkNode_M5.build_src_filter}
   +<../examples/simple_room_server>
 build_flags =
   ${ThinkNode_M5.build_flags}
-  -D ADVERT_NAME='"Thinknode M2 Room Server"'
+  -D ADVERT_NAME='"Thinknode M5 Room Server"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
@@ -193,8 +193,8 @@ build_flags =
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D WIFI_DEBUG_LOGGING=1
-  -D WIFI_SSID='"Livebox-633C"'
+  -D WIFI_SSID='"myssid"'
-  -D WIFI_PWD='"vvQUHGSxsWd7fKMYSr"'
+  -D WIFI_PWD='"mypwd"'
 build_src_filter = ${ThinkNode_M5.build_src_filter}
   +<helpers/esp32/*.cpp>
   +<helpers/ui/MomentaryButton.cpp>