Merge branch 'master' of https://github.com/EnviroDIY/TinyGSM
This commit is contained in:
		@@ -597,16 +597,22 @@ public:
 | 
				
			|||||||
  bool networkConnect(const char* ssid, const char* pwd) {
 | 
					  bool networkConnect(const char* ssid, const char* pwd) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!commandMode()) return false;  // return immediately
 | 
					    if (!commandMode()) return false;  // return immediately
 | 
				
			||||||
 | 
					    //nh For no pwd don't set setscurity or pwd
 | 
				
			||||||
 | 
					    if (NULL == ssid ) return exitAndFail(); 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (NULL != pwd) 
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
      sendAT(GF("EE"), 2);  // Set security to WPA2
 | 
					      sendAT(GF("EE"), 2);  // Set security to WPA2
 | 
				
			||||||
      if (waitResponse() != 1) return exitAndFail();
 | 
					      if (waitResponse() != 1) return exitAndFail();
 | 
				
			||||||
 | 
					      sendAT(GF("PK"), pwd);
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					      sendAT(GF("EE"), 0);  // Set No security 
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (waitResponse() != 1) return exitAndFail();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    sendAT(GF("ID"), ssid);
 | 
					    sendAT(GF("ID"), ssid);
 | 
				
			||||||
    if (waitResponse() != 1) return exitAndFail();
 | 
					    if (waitResponse() != 1) return exitAndFail();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    sendAT(GF("PK"), pwd);
 | 
					 | 
				
			||||||
    if (waitResponse() != 1) return exitAndFail();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (!writeChanges()) return exitAndFail();
 | 
					    if (!writeChanges()) return exitAndFail();
 | 
				
			||||||
    exitCommand();
 | 
					    exitCommand();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user