Diff: ETHW5500.cpp

Revision:

4:10f83daba9ea

Parent:

3:54ad271708ff

Child:

5:23424c038538

--- a/ETHW5500.cpp	Fri Apr 20 01:37:27 2018 +0000
+++ b/ETHW5500.cpp	Fri Apr 20 07:28:56 2018 +0000
@@ -1,13 +1,14 @@
 #include "ETHW5500.h"
 
 //W5500接线 mosi,miso,sclk,cs,reset
-WIZnetInterface wiz(PA_7,PA_6,PA_5,PB_6,PC_7);
-
+//WIZnetInterface wiz(PA_7,PA_6,PA_5,PB_6,PC_7);
+extern WIZnetInterface wiz;
+extern Serial pc;
 void meta_report(MClient& client, const char *topic, 
                     const char* payload = NULL, size_t payload_len = 0, 
                     bool retain = false, MQTT::QoS qos = MQTT::QOS1){
     int ret = client.publish(topic, (void*)payload, payload_len, qos, retain);
-    printf("client.publish()=%d\r\n",ret);
+    pc.printf("client.publish()=%d\r\n",ret);
 }
 void messageArrived(MQTT::MessageData& md)
 {
@@ -19,7 +20,7 @@
     memcpy(buf, message.payload, len);
     buf[len] = '\0';
     sscanf(buf, "%d", &value);
-    printf("received %d\r\n", value);
+    pc.printf("received %d\r\n", value);
 }
 MQTTSocket sock;
 MClient client(sock);
@@ -27,37 +28,31 @@
 {
     int ret;
     wiz.init(mac_addr);
-    printf("DHCP...\r\n");
+    pc.printf("DHCP...\r\n");
     wiz.connect();
-    printf("IP: %s\r\n", wiz.getIPAddress());
-    return ret;
+    pc.printf("IP: %s\r\n", wiz.getIPAddress());
     
-}
-int Eth_ConnectToSer(char *URL)
-{
-    int ret;
     int timecount=1;
-    ret = sock.connect(URL,1883);
-    //printf("%d-th Server connetion attemp\n",timecount);
+    ret = sock.connect("tdxls-iot.xicp.net",1883);
+    //pc.printf("%d-th Server connetion attemp\n",timecount);
     while(ret!=0){
         timecount++;
-        //printf("%d-th Server connetion attemp\n",timecount);
-        ret = sock.connect(URL,1883);
+        //pc.printf("%d-th Server connetion attemp\n",timecount);
+        ret = sock.connect("tdxls-iot.xicp.net",1883);
         if(timecount>20){
-            printf("failed to connet Server,Please Check out and Reset\n");
+            pc.printf("failed to connet Server,Please Check out and Reset\n");
             return 1;
         }
     }
-    printf("sock.connect()=%d\r\n",ret);
+    pc.printf("sock.connect()=%d\r\n",ret);
     
     ret = client.connect();
     if(ret != 0){
-        printf("MQTT connect failed\r\n");
+        pc.printf("MQTT connect failed\r\n");
         return 1;
     }
-    printf("client.connect()=%d\r\n",ret);
+    pc.printf("client.connect()=%d\r\n",ret);
     return ret;
-    
 }
 
 int Eth_Subscribe(const char* ns,const char *NODE_NAME, const char* type)
@@ -67,16 +62,16 @@
     sprintf(topic, "/%s/%s/%s", ns, NODE_NAME, type);
     //printf("topic=%s\r\n",topic);
     ret = client.subscribe(topic, MQTT::QOS1, messageArrived);    
-    printf("sock.subscribe()=%d\r\n",ret);
+    pc.printf("sock.subscribe()=%d\r\n",ret);
     return ret;
 }
 void Eth_Report(const char* ns,const char *NODE_NAME, const char* type,const char* payload = NULL, size_t payload_len = 0, 
                     bool retain = false)
 {
-    char topic[64];
-    sprintf(topic, "/%s/%s/%s", ns, NODE_NAME, type);
-    //printf("topic=%s\r\n",topic);
-    meta_report(client, topic,payload,payload_len,retain);
+        char topic[64];
+        sprintf(topic, "/%s/%s/%s", ns, NODE_NAME, type);
+        //printf("topic=%s\r\n",topic);
+        meta_report(client, topic,payload,payload_len,retain);
 }