Revision 29:833386b16f3e, committed 2014-05-20

Comitter:

icraggs

Date:

Tue May 20 15:03:29 2014 +0000

Parent:

25:d13a6c558164

Child:

30:a4e3a97dabe3

Commit message:

Refactor header locations and separation

Changed in this revision

--- a/IPStack/EthernetInterfaceIPStack.h	Fri May 09 23:01:35 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-
-#ifndef ETHERNETINTERFACEIPSTACK_H
-#define ETHERNETINTERFACEIPSTACK_H
-
-#include "EthernetInterface.h"
-
-class IPStack 
-{
-public:    
-    IPStack()
-    {
-        eth.init();                          // Use DHCP
-        eth.connect();
-        mysock.set_blocking(false, 1000);    // 1 second Timeout 
-    }
-    
-    int connect(char* hostname, int port)
-    {
-        return mysock.connect(hostname, port);
-    }
-
-    int read(char* buffer, int len, int timeout)
-    {
-        mysock.set_blocking(false, timeout);  
-        return mysock.receive(buffer, len);
-    }
-    
-    int write(char* buffer, int len, int timeout)
-    {
-        mysock.set_blocking(false, timeout);  
-        return mysock.send(buffer, len);
-    }
-    
-    int disconnect()
-    {
-        return mysock.close();
-    }
-    
-private:
-
-    EthernetInterface eth;
-    TCPSocketConnection mysock; 
-    
-};
-
-
-class Countdown
-{
-public:
-    Countdown()
-    {
-        t = Timer();   
-    }
-    
-    Countdown(int ms)
-    {
-        t = Timer();
-        countdown_ms(ms);   
-    }
-    
-    
-    bool expired()
-    {
-        return t.read_ms() >= interval_end_ms;
-    }
-    
-    void countdown_ms(int ms)  
-    {
-        t.stop();
-        interval_end_ms = ms;
-        t.reset();
-        t.start();
-    }
-    
-    void countdown(int seconds)
-    {
-        countdown_ms(seconds * 1000);
-    }
-    
-    int left_ms()
-    {
-        return interval_end_ms - t.read_ms();
-    }
-    
-private:
-    Timer t;
-    int interval_end_ms; 
-};
-
-#endif

--- a/MQTTClient.h	Fri May 09 23:01:35 2014 +0000
+++ b/MQTTClient.h	Tue May 20 15:03:29 2014 +0000
@@ -33,7 +33,7 @@
 #if !defined(MQTTCLIENT_H)
 #define MQTTCLIENT_H
 
-#include "FP.h"
+#include "FP.cpp"
 #include "MQTTPacket.h"
 #include "stdio.h"
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MQTTEthernet.h	Tue May 20 15:03:29 2014 +0000
@@ -0,0 +1,49 @@
+
+#if !defined(MQTTETHERNET_H)
+#define MQTTETHERNET_H
+
+#include "MQTT_mbed.h"
+#include "EthernetInterface.h"
+
+class MQTTEthernet
+{
+public:    
+    MQTTEthernet()
+    {
+        eth.init();                          // Use DHCP
+        eth.connect();
+        mysock.set_blocking(false, 1000);    // 1 second Timeout 
+    }
+    
+    int connect(char* hostname, int port)
+    {
+        return mysock.connect(hostname, port);
+    }
+
+    int read(char* buffer, int len, int timeout)
+    {
+        mysock.set_blocking(false, timeout);  
+        return mysock.receive(buffer, len);
+    }
+    
+    int write(char* buffer, int len, int timeout)
+    {
+        mysock.set_blocking(false, timeout);  
+        return mysock.send(buffer, len);
+    }
+    
+    int disconnect()
+    {
+        return mysock.close();
+    }
+    
+private:
+
+    EthernetInterface eth;
+    TCPSocketConnection mysock; 
+    
+};
+
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MQTT_mbed.h	Tue May 20 15:03:29 2014 +0000
@@ -0,0 +1,49 @@
+#if !defined(MQTT_MBED_H)
+#define MQTT_MBED_H
+
+#include "mbed.h"
+
+class Countdown
+{
+public:
+    Countdown()
+    {
+        t = Timer();   
+    }
+    
+    Countdown(int ms)
+    {
+        t = Timer();
+        countdown_ms(ms);   
+    }
+    
+    
+    bool expired()
+    {
+        return t.read_ms() >= interval_end_ms;
+    }
+    
+    void countdown_ms(int ms)  
+    {
+        t.stop();
+        interval_end_ms = ms;
+        t.reset();
+        t.start();
+    }
+    
+    void countdown(int seconds)
+    {
+        countdown_ms(seconds * 1000);
+    }
+    
+    int left_ms()
+    {
+        return interval_end_ms - t.read_ms();
+    }
+    
+private:
+    Timer t;
+    int interval_end_ms; 
+};
+
+#endif
\ No newline at end of file