Diff: DeviceClient.cpp

Revision:

23:1523bdaba8c8

Parent:

19:85e9bc1a3a6a

Child:

25:f4727705353b

diff -r d9576c025cd7 -r 1523bdaba8c8 DeviceClient.cpp
--- a/DeviceClient.cpp	Fri Dec 27 14:06:13 2019 -0400
+++ b/DeviceClient.cpp	Tue Mar 10 21:26:49 2020 -0400
@@ -107,7 +107,8 @@
     sprintf(hostname, "%s%s", organizationName, IBM_IOT_MESSAGING);
 
     //NetworkInterface* net = mqttNetwork->getEth();
-    NetworkInterface* net = mqttNetwork->network;
+    //NetworkInterface* net = mqttNetwork->network;
+    EthernetInterface* net=mqttNetwork->net;
 
     const char* ip = net->get_ip_address();
 
@@ -180,7 +181,8 @@
     if(linkStatus())
     {
         //NetworkInterface* net = mqttNetwork->getEth();
-        NetworkInterface* net = mqttNetwork->network;
+        //NetworkInterface* net = mqttNetwork->network;
+        EthernetInterface*  net = mqttNetwork->net;
         if(net->connect() == 0)
         {
             bool status = connect();
@@ -226,12 +228,13 @@
             NVIC_SystemReset();
             return false;
         } else {
-            wait(timeout);
+            thread_sleep_for(timeout);
         }
     } while(true);
 }
 
-void DeviceClient::logData(NetworkInterface* net, char *hostname, char *clientId)
+//void DeviceClient::logData(NetworkInterface* net, char *hostname, char *clientId)
+void DeviceClient::logData(EthernetInterface* net, char *hostname, char *clientId)
 {
     // Network debug statements
     LOG("=====================================\r\n");
@@ -366,7 +369,8 @@
     }
 
     //NetworkInterface* net = mqttNetwork->getEth();
-    NetworkInterface* net = mqttNetwork->network;
+    //NetworkInterface* net = mqttNetwork->network;
+    EthernetInterface*  net = mqttNetwork->net;
     mqttNetwork->disconnect();
     net->disconnect();
     connected = false;
@@ -396,7 +400,8 @@
 char* DeviceClient::getMac(char* buf, int buflen)
 {
     //NetworkInterface* net = mqttNetwork->getEth();
-    NetworkInterface* net = mqttNetwork->network;
+    //NetworkInterface* net = mqttNetwork->network;
+    EthernetInterface*  net = mqttNetwork->net;
     strncpy(buf, net->get_mac_address(), buflen);
 
     char* pos;                                                 // Remove colons from mac address
@@ -409,7 +414,8 @@
     //char iplocal[25];
     
     //NetworkInterface* net = mqttNetwork->getEth();
-    NetworkInterface* net = mqttNetwork->network;
+    //NetworkInterface* net = mqttNetwork->network;
+    EthernetInterface*  net = mqttNetwork->net;
     //const char* ip = net->get_ip_address();
     
     //strcpy(iplocal,ip);