Modified WifiSerial to exclude <string> library (#155)

* Modified WifiSerial to exclude <string> library * update coding style Co-authored-by: zhangzhenwu <[email protected]>
Ameba-AIoT · Jan 19, 2023 · 687da83 · 687da83
1 parent 635abed
commit 687da83
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 27 deletions.
diff --git a/...ackage/hardware/libraries/WiFi/examples/ConnectWithWiFi/ConnectWithWEP/ConnectWithWEP.ino b/...ackage/hardware/libraries/WiFi/examples/ConnectWithWiFi/ConnectWithWEP/ConnectWithWEP.ino
@@ -32,7 +32,7 @@
 
 #ifdef MANUAL_INPUT // initialise ssid string, pwd string, and serial_in object
 // Initialise strings
-std::string str_ssid, str_pass, str_key;
+String str_ssid, str_pass, str_key;
 // Create serial_in object
 WifiSerial wifiSerial;
 #endif
@@ -120,11 +120,14 @@ void setup() {
     #endif
 #else
         char ssid_cust[str_ssid.length()+1];
+        char key_cust[str_key.length()+1];
         char pass_cust[str_pass.length()+1];
         strcpy(ssid_cust, str_ssid.c_str());
+        strcpy(key_cust, str_key.c_str());
         strcpy(pass_cust, str_pass.c_str());
         Serial.println(str_ssid.c_str());
-        status = WiFi.begin(ssid_cust,std::stoi( str_key ), pass_cust);
+        status = WiFi.begin(ssid_cust,atoi(key_cust), pass_cust);
+        str_ssid, str_key, str_pass = "";
 #endif
         // wait 10 seconds for connection:
         delay(10000);

diff --git a/...ackage/hardware/libraries/WiFi/examples/ConnectWithWiFi/ConnectWithWPA/ConnectWithWPA.ino b/...ackage/hardware/libraries/WiFi/examples/ConnectWithWiFi/ConnectWithWPA/ConnectWithWPA.ino
@@ -17,11 +17,11 @@
 #include "WifiSerial.h"
 
 // Set if user wants to key in ssid/pwd manually during operation
-//#define MANUAL_INPUT 
+//#define MANUAL_INPUT
 
 #ifdef MANUAL_INPUT  // Initialise ssid string, pwd string, and serial_in object
 // Initialise strings
-std::string str_ssid, str_pass;
+String str_ssid, str_pass;
 // Create serial_in object
 WifiSerial wifiSerial;
 #endif
@@ -65,7 +65,7 @@ void setup() {
         Serial.println("Enter your password");
         while (str_pass.length() == 0) {
             str_pass = wifiSerial.readInput();
-            if (str_pass.length() != 0) {  // user has entered data
+            if (str_pass.length() != 0) {   // user has entered data
                 if (str_pass.length() <8) { // to catch pwd<8 exception
                     Serial.println("Password cannot be less than 8 characters! Try again");
                     str_pass = ""; // clear entered pwd and try again
@@ -76,7 +76,7 @@ void setup() {
         }
 #endif
         Serial.print("Attempting to connect to WPA SSID: ");
-
+        
 #ifndef MANUAL_INPUT
         Serial.println(ssid);
         // Connect to WPA/WPA2 network:

diff --git a/Arduino_package/hardware/libraries/WiFi/examples/WiFiAPMode/WiFiAPMode.ino b/Arduino_package/hardware/libraries/WiFi/examples/WiFiAPMode/WiFiAPMode.ino
@@ -8,11 +8,11 @@
 #include "WifiSerial.h"
 
 // Set if user wants to key in ssid/pwd manually during operation
-//#define MANUAL_INPUT 
+//#define MANUAL_INPUT
 
 #ifdef MANUAL_INPUT  // Initialise ssid string, pwd string, and serial_in object
 // Initialise strings
-std::string str_ssid, str_pass;
+String str_ssid, str_pass;
 // Create serial_in object
 WifiSerial wifiSerial;
 #endif

diff --git a/Arduino_package/hardware/libraries/WiFi/src/WiFiClient.h b/Arduino_package/hardware/libraries/WiFi/src/WiFiClient.h
@@ -1,5 +1,5 @@
-#ifndef wificlient_h
-#define wificlient_h
+#ifndef WifiClient_h
+#define WifiClient_h
 
 #include "Print.h"
 #include "Client.h"

diff --git a/Arduino_package/hardware/libraries/WiFi/src/WiFiSSLClient.h b/Arduino_package/hardware/libraries/WiFi/src/WiFiSSLClient.h
@@ -1,5 +1,5 @@
-#ifndef wifisslclient_h
-#define wifisslclient_h
+#ifndef WifiSSLClient_h
+#define WifiSSLClient_h
 
 #include "Print.h"
 #include "Client.h"

diff --git a/Arduino_package/hardware/libraries/WiFi/src/WiFiServer.h b/Arduino_package/hardware/libraries/WiFi/src/WiFiServer.h
@@ -1,5 +1,5 @@
-#ifndef wifiserver_h
-#define wifiserver_h
+#ifndef WifiServer_h
+#define WifiServer_h
 
 #include "Server.h"
 #include "server_drv.h"

diff --git a/Arduino_package/hardware/libraries/WiFi/src/WiFiUdp.h b/Arduino_package/hardware/libraries/WiFi/src/WiFiUdp.h
@@ -17,8 +17,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef wifiudp_h
-#define wifiudp_h
+#ifndef WifiUdp_h
+#define WifiUdp_h
 
 #include "IPAddress.h"
 #include "IPv6Address.h"

diff --git a/Arduino_package/hardware/libraries/WiFi/src/WifiSerial.cpp b/Arduino_package/hardware/libraries/WiFi/src/WifiSerial.cpp
@@ -1,20 +1,17 @@
 #include "WifiSerial.h"
 #include <stdlib.h>
 #include <Arduino.h>
-#include <string>
 
 WifiSerial::WifiSerial() {}//declaration
 
-
 //Function: Reads Serial monitor input
-//Output  : std::string
-std::string WifiSerial::readInput() {
+const char* WifiSerial::readInput() {
     currentInput = "";    //clear string output in preparation
     String name;
     while (Serial.available()) {
-      delay(2);    //add a delay to buy time for bytes to enter buffer
-      char c = Serial.read();
-      name += c;
+        delay(2);    //add a delay to buy time for bytes to enter buffer
+        char c = Serial.read();
+        name += c;
     }
     if (name.length() > 0) {          //loop triggers when Serial data is received.
         name.trim();                  //removes trailing newline

diff --git a/Arduino_package/hardware/libraries/WiFi/src/WifiSerial.h b/Arduino_package/hardware/libraries/WiFi/src/WifiSerial.h
@@ -1,10 +1,13 @@
-#include <string>
+#ifndef WifiSerial_h
+#define WifiSerial_h
 
 class WifiSerial {
     public:
-        WifiSerial();
-        std::string readInput();
+    WifiSerial();
+    const char* readInput();
 
     private:
-        std::string currentInput;
+        const char* currentInput;
 };
+
+#endif