Merge branch 'master' into master

meshtastic · Feb 25, 2022 · aaf28b8 · aaf28b8
2 parents 390aad4 + 2e402a7
commit aaf28b8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 111 deletions.
diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp
@@ -140,16 +140,9 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         myNodeInfo.has_gps = gps && gps->isConnected(); // Update with latest GPS connect info
         fromRadioScratch.which_payloadVariant = FromRadio_my_info_tag;
         fromRadioScratch.my_info = myNodeInfo;
-        state = STATE_SEND_GROUPS;
-
-        service.refreshMyNodeInfo(); // Update my NodeInfo because the client will be asking for it soon.
-        break;
-
-    case STATE_SEND_GROUPS:
-        fromRadioScratch.which_payloadVariant = FromRadio_groups_tag;
-        fromRadioScratch.groups = ourGroupInfo;
         state = STATE_SEND_NODEINFO;
 
+        service.refreshMyNodeInfo(); // Update my NodeInfo because the client will be asking for it soon.
         break;
 
     case STATE_SEND_NODEINFO: {
@@ -228,9 +221,6 @@ bool PhoneAPI::available()
     case STATE_SEND_MY_INFO:
         return true;
 
-    case STATE_SEND_GROUPS:
-        return true;
-
     case STATE_SEND_NODEINFO:
         if (!nodeInfoForPhone)
             nodeInfoForPhone = nodeDB.readNextInfo();

diff --git a/src/mesh/http/WiFiAPClient.cpp b/src/mesh/http/WiFiAPClient.cpp
@@ -175,6 +175,9 @@ bool initWifi(bool forceSoftAP)
 {
     forcedSoftAP = forceSoftAP;
 
+    // strcpy(radioConfig.preferences.wifi_ssid, "meshtastic");
+    // strcpy(radioConfig.preferences.wifi_password, "meshtastic!");
+
     if ((radioConfig.has_preferences && radioConfig.preferences.wifi_ssid[0]) || forceSoftAP) {
         const char *wifiName = radioConfig.preferences.wifi_ssid;
         const char *wifiPsw = radioConfig.preferences.wifi_password;

diff --git a/src/plugins/GroupPlugin.cpp b/src/plugins/GroupPlugin.cpp
diff --git a/src/plugins/GroupPlugin.h b/src/plugins/GroupPlugin.h
diff --git a/src/plugins/Plugins.cpp b/src/plugins/Plugins.cpp
@@ -4,7 +4,6 @@
 #include "plugins/AdminPlugin.h"
 #include "plugins/CannedMessagePlugin.h"
 #include "plugins/ExternalNotificationPlugin.h"
-#include "plugins/GroupPlugin.h"
 #include "plugins/NodeInfoPlugin.h"
 #include "plugins/PositionPlugin.h"
 #include "plugins/RemoteHardwarePlugin.h"
@@ -30,8 +29,7 @@ void setupPlugins()
     nodeInfoPlugin = new NodeInfoPlugin();
     positionPlugin = new PositionPlugin();
     textMessagePlugin = new TextMessagePlugin();
-    groupPlugin = new GroupPlugin();
-
+
     // Note: if the rest of meshtastic doesn't need to explicitly use your plugin, you do not need to assign the instance
     // to a global variable.