Merge remote-tracking branch 'root/master'

src/mesh/MeshRadio.h

@@ -41,6 +41,12 @@
 #define CH_SPACING_ANZ 0.5f
 #define NUM_CHANNELS_ANZ 20
 
+// KR channel settings (KR920-923)
+// Start from TTN download channel freq. (921.9f is for download, others are for uplink)
+#define CH0_KR 921.9f // MHz
+#define CH_SPACING_KR 0.2f
+#define NUM_CHANNELS_KR 8
+
 // FIXME add defs for other regions and use them here
 #ifdef HW_VERSION_US
 #define CH0 CH0_US
@@ -73,9 +79,14 @@
 #define CH0 CH0_ANZ
 #define CH_SPACING CH_SPACING_ANZ
 #define NUM_CHANNELS NUM_CHANNELS_ANZ
+#elif defined(HW_VERSION_KR)
+// Republic of Korea
+#define CH0 CH0_KR
+#define CH_SPACING CH_SPACING_KR
+#define NUM_CHANNELS NUM_CHANNELS_KR
 #else
 // HW version not set - assume US
 #define CH0 CH0_US
 #define CH_SPACING CH_SPACING_US
 #define NUM_CHANNELS NUM_CHANNELS_US
-#endif
+#endif

src/mesh/NodeDB.cpp

@@ -15,6 +15,7 @@
 #include "mesh-pb-constants.h"
 #include <pb_decode.h>
 #include <pb_encode.h>
+#include "meshwifi/meshwifi.h"
 
 NodeDB nodeDB;
 
@@ -419,6 +420,12 @@ void NodeDB::updateFrom(const MeshPacket &mp)
                     updateTextMessage = true;
                     powerFSM.trigger(EVENT_RECEIVED_TEXT_MSG);
                     notifyObservers(true); // Force an update whether or not our node counts have changed
+
+// This is going into the wifidev feature branch
+// Only update the WebUI if WiFi is enabled
+//#if WiFi_MODE != 0
+//  notifyWebUI();
+//#endif
                 }
             }
             break;