Diff: ETHW5500.cpp

Revision:

5:23424c038538

Parent:

4:10f83daba9ea

--- a/ETHW5500.cpp	Fri Apr 20 07:28:56 2018 +0000
+++ b/ETHW5500.cpp	Fri Apr 27 06:50:55 2018 +0000
@@ -1,11 +1,15 @@
 #include "ETHW5500.h"
-
+#include "WIZnetInterface.h"
+#include "MQTTSocket.h"
+#include "MQTTClient.h"
 //W5500接线 mosi,miso,sclk,cs,reset
 //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, 
+extern MQTTSocket sock;
+extern MClient client;
+void meta_report( 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);
     pc.printf("client.publish()=%d\r\n",ret);
@@ -22,18 +26,20 @@
     sscanf(buf, "%d", &value);
     pc.printf("received %d\r\n", value);
 }
-MQTTSocket sock;
-MClient client(sock);
-int Eth_Init(uint8_t *mac_addr)
+
+void Eth_Init(uint8_t *mac_addr)
 {
-    int ret;
     wiz.init(mac_addr);
     pc.printf("DHCP...\r\n");
     wiz.connect();
     pc.printf("IP: %s\r\n", wiz.getIPAddress());
-    
+}
+
+int Eth_ConnetToSever(char* URL)
+{
+    int ret;
     int timecount=1;
-    ret = sock.connect("tdxls-iot.xicp.net",1883);
+    ret = sock.connect(URL,1883);
     //pc.printf("%d-th Server connetion attemp\n",timecount);
     while(ret!=0){
         timecount++;
@@ -71,7 +77,7 @@
         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);
+        meta_report(topic,payload,payload_len,retain);
 }