Diff: ESP8266.h

Revision:

22:f5d148878815

Parent:

21:af9656e070d3

Child:

23:4cec7b9e3715

diff -r af9656e070d3 -r f5d148878815 ESP8266.h
--- a/ESP8266.h	Wed Feb 04 09:46:55 2015 +0000
+++ b/ESP8266.h	Wed Feb 04 09:55:33 2015 +0000
@@ -7,23 +7,25 @@
 
 
 //The way of encrypstion
-#define    ESP8266_ECN_OPEN          0
-#define    ESP8266_ECN_WEP           1
-#define    ESP8266_ECN_WAP_PSK       2
-#define    ESP8266_ECN_WAP2_PSK      3
-#define    ESP8266_ECN_WAP_WAP2_PSK  4
+typedef enum {
+    ESP8266_ECN_OPEN          = 0,
+    ESP8266_ECN_WEP           = 1,
+    ESP8266_ECN_WAP_PSK       = 2,
+    ESP8266_ECN_WAP2_PSK      = 3,
+    ESP8266_ECN_WAP_WAP2_PSK  = 4,
+} ESP8266Encrypstion;
 
-//Communication mode 
-#define    ESP8266_TCP              1
-#define    ESP8266_UDP              0
+typedef enum {
+    ESP8266_COMM_UDP              = 0,
+    ESP8266_COMM_TCP              = 1,
+} ESP8266CommMode; 
 
-//The type of initialized ESP8266
-#define    ESP8266_MODE_STA         1
-#define    ESP8266_MODE_SAP         2
-#define    ESP8266_MODE_STA_SAP     3
+typedef enum {
+    ESP8266_MODE_STA         = 1,
+    ESP8266_MODE_SAP         = 2,
+    ESP8266_MODE_STA_SAP     = 3,
+} ESP8266WorkMode;
 
-//Default channel 
-#define ESP8266_DEFAULT_CHANNEL     (7) /* default 7 (1, 2, ..., 13) */
 
 class ArduinoSerial;
 
@@ -35,7 +37,7 @@
     bool begin(void);
     
     //Initialize port
-    bool Initialize(uint8_t mode, String ssid, String pwd, uint8_t chl = ESP8266_DEFAULT_CHANNEL, uint8_t ecn = ESP8266_ECN_WAP_WAP2_PSK);
+    bool Initialize(uint8_t mode, String ssid, String pwd, uint8_t chl = 7, uint8_t ecn = ESP8266_ECN_WAP_WAP2_PSK);
     
     bool ipConfig(uint8_t type, String addr, int port, uint8_t mux = 0, uint8_t id = 0);