Merge branch 'timer' into Arduino_1.5.5

Author: ntruchsess

UIPEthernet/src/UIPClient.cpp

@@ -226,6 +226,9 @@ UIPClient::_write(uip_userdata_t* u, const uint8_t *buf, size_t size)
           goto newpacket;
         }
 ready:
+#if UIP_CLIENT_TIMER >= 0
+      u->timer = millis()+UIP_CLIENT_TIMER;
+#endif
       return size-remain;
     }
   return -1;

UIPEthernet/src/UIPClient.h

@@ -55,6 +55,9 @@ typedef struct {
   memhandle packets_in[UIP_SOCKET_NUMPACKETS];
   memhandle packets_out[UIP_SOCKET_NUMPACKETS];
   memaddress out_pos;
+#if UIP_CLIENT_TIMER >= 0
+  unsigned long timer;
+#endif
 } uip_userdata_t;
 
 class UIPClient : public Client {

UIPEthernet/src/UIPEthernet.cpp

@@ -45,7 +45,7 @@ uint8_t UIPEthernetClass::packetstate(0);
 IPAddress UIPEthernetClass::_dnsServerAddress;
 DhcpClass* UIPEthernetClass::_dhcp(NULL);
 
-struct uip_timer UIPEthernetClass::periodic_timer;
+unsigned long UIPEthernetClass::periodic_timer;
 
 // Because uIP isn't encapsulated within a class we have to use global
 // variables, so we can only have one TCP/IP stack per program.
@@ -220,22 +220,50 @@ UIPEthernetClass::tick()
         }
     }
 
-  if (uip_timer_expired(&periodic_timer))
+unsigned long now = millis();
+
+#if UIP_CLIENT_TIMER >= 0
+  boolean periodic = (long)( now - periodic_timer ) >= 0;
+  for (int i = 0; i < UIP_CONNS; i++)
+    {
+#else
+  if ((long)( now - periodic_timer ) >= 0)
     {
-      uip_timer_restart(&periodic_timer);
+      periodic_timer = now + UIP_PERIODIC_TIMER;
+
       for (int i = 0; i < UIP_CONNS; i++)
         {
-          uip_periodic(i);
-          // If the above function invocation resulted in data that
-          // should be sent out on the Enc28J60Network, the global variable
-          // uip_len is set to a value > 0.
-          if (uip_len > 0)
-            {
-              uip_arp_out();
-              network_send();
-            }
+#endif
+      uip_conn = &uip_conns[i];
+#if UIP_CLIENT_TIMER >= 0
+      if (periodic)
+        {
+#endif
+          uip_process(UIP_TIMER);
+#if UIP_CLIENT_TIMER >= 0
         }
-
+      else
+        {
+          if ((long)( now - ((uip_userdata_t*)uip_conn->appstate)->timer) >= 0)
+            uip_process(UIP_POLL_REQUEST);
+          else
+            continue;
+        }
+#endif
+        // If the above function invocation resulted in data that
+        // should be sent out on the Enc28J60Network, the global variable
+        // uip_len is set to a value > 0.
+      if (uip_len > 0)
+        {
+          uip_arp_out();
+          network_send();
+        }
+    }
+#if UIP_CLIENT_TIMER >= 0
+  if (periodic)
+    {
+      periodic_timer = now + UIP_PERIODIC_TIMER;
+#endif
 #if UIP_UDP
       for (int i = 0; i < UIP_UDP_CONNS; i++)
         {
@@ -286,7 +314,7 @@ boolean UIPEthernetClass::network_send()
 }
 
 void UIPEthernetClass::init(const uint8_t* mac) {
-  uip_timer_set(&periodic_timer, CLOCK_SECOND / 4);
+  periodic_timer = millis() + UIP_PERIODIC_TIMER;
 
   Enc28J60Network::init((uint8_t*)mac);
   uip_seteth_addr(mac);

UIPEthernet/src/UIPEthernet.h

@@ -90,7 +90,7 @@ class UIPEthernetClass
   static IPAddress _dnsServerAddress;
   static DhcpClass* _dhcp;
 
-  static struct uip_timer periodic_timer;
+  static unsigned long periodic_timer;
 
   static void init(const uint8_t* mac);
   static void configure(IPAddress ip, IPAddress dns, IPAddress gateway, IPAddress subnet);

UIPEthernet/src/utility/uipethernet-conf.h

@@ -5,7 +5,8 @@
 #define UIP_SOCKET_NUMPACKETS    5
 #define UIP_CONF_MAX_CONNECTIONS 4
 
-/* for UDP */
+/* for UDP
+ * set UIP_CONF_UDP to 0 to disable UDP (saves aprox. 5kb flash) */
 #define UIP_CONF_UDP             1
 #define UIP_CONF_BROADCAST       1
 #define UIP_CONF_UDP_CONNS       4
@@ -18,4 +19,11 @@
  * if set to a number <= 0 connect will timeout when uIP does (which might be longer than you expect...) */
 #define UIP_CONNECT_TIMEOUT      -1
 
+/* periodic timer for uip (in ms) */
+#define UIP_PERIODIC_TIMER       250
+
+/* timer to poll client for data after last write (in ms)
+ * set to -1 to disable fast polling and rely on periodic only (saves 100 bytes flash) */
+#define UIP_CLIENT_TIMER         10
+
 #endif