apps-conf.h / uip-conf.h / udpapp.h / stack.c

- Minor cleanup
- Can now set most uip-conf.h settings from apps-conf.h.  Users only need modify one file for most common stack setting changes
- Socket (TCP) and UDP app can now be configured simultaneously (allows for DNS/DHCP + TCP app scenarios)

WiShield::init() / WiShield.cpp/h
- now returns boolean for success/fail
- now takes seconds parameter to timeout connection attempt after seconds amount of time
- default init now an overload which calls real version with 60 seconds timeout

Author: GregEigsti

WiShield.cpp

@@ -46,8 +46,9 @@ extern "C" {
 #include "WProgram.h"
 #include "WiShield.h"
 
-void WiShield::init()
+boolean WiShield::init(U8 seconds)
 {
+	boolean retVal = false;
 	zg_init();
 
 #ifdef USE_DIG0_INTR
@@ -61,11 +62,21 @@ void WiShield::init()
 	PCMSK0 |= (1<<PCINT0);
 #endif
 
-	while(zg_get_conn_state() != 1) {
-		zg_drv_process();
+    // TODO: potential for rollover bug after ~58 days...
+	unsigned long time = millis();
+	while(time + (seconds * 1000) > millis()) {
+		if(1 != zg_get_conn_state()) {
+			zg_drv_process();
+		}
+		else {
+			retVal = true;
+			break;
+		}
 	}
-
+	
 	stack_init();
+	
+	return retVal;
 }
 
 void WiShield::run()

WiShield.h

@@ -44,7 +44,8 @@ extern "C" {
 
 class WiShield {
 	public:
-		void init();
+		boolean init() {return init(60);}
+		boolean init(U8 seconds);
 		void run();
 };
 

apps-conf.h

@@ -35,13 +35,26 @@
 #ifndef __APPS_CONF_H__
 #define __APPS_CONF_H__
 
+// ----------------------------------------------------------------------------
+// -- Begin uIP/WiShield stack configuration settings
+
 //Here we include the header file for the application(s) we use in our project.
 #define APP_WEBSERVER
 //#define APP_WEBCLIENT
 //#define APP_SOCKAPP
 //#define APP_UDPAPP
 //#define APP_WISERVER
 
+#define MAX_TCP_CONNS       1 // Max TCP connections desired
+#define MAX_TCP_LISTENPORTS 1 // Max TCP listening ports
+#define MAX_UDP_CONNS       1 // Max UDP connections desired
+// Don't play with UIP_CLOCK_DIV unless you know what you are doing!
+#define UIP_CLOCK_DIV       2 // Referenced in stack.c; default 2
+
+// -- End uIP/WiShield stack configuration settings
+// ----------------------------------------------------------------------------
+
+
 #ifdef APP_WEBSERVER
 #include "webserver.h"
 #endif
@@ -56,6 +69,9 @@
 
 #ifdef APP_UDPAPP
 #include "udpapp.h"
+#define UIP_UDP_ENABLED 1
+#else
+#define UIP_UDP_ENABLED 0
 #endif
 
 #ifdef APP_WISERVER

stack.c

@@ -65,7 +65,7 @@ void stack_init(void)
 	mac.addr[4] = mac_addr[4];
 	mac.addr[5] = mac_addr[5];
 
-	timer_set(&periodic_timer, CLOCK_SECOND / 2);
+	timer_set(&periodic_timer, CLOCK_SECOND / UIP_CLOCK_DIV);
 	timer_set(&arp_timer, CLOCK_SECOND * 10);
 	timer_set(&self_arp_timer, CLOCK_SECOND * 30);
 
@@ -81,14 +81,14 @@ void stack_init(void)
 	webclient_init();
 #endif
 
-#ifdef APP_SOCKAPP
-	socket_app_init();
-#endif
-
 #ifdef APP_UDPAPP
 	udpapp_init();
 #endif
 
+#ifdef APP_SOCKAPP
+	socket_app_init();
+#endif
+
 	uip_ipaddr(ipaddr, local_ip[0], local_ip[1], local_ip[2], local_ip[3]);
 	uip_sethostaddr(ipaddr);
 	uip_ipaddr(ipaddr, gateway_ip[0],gateway_ip[1],gateway_ip[2],gateway_ip[3]);

udpapp.h

@@ -37,9 +37,11 @@
 
 #include "pt.h"
 
+#if !defined(APP_SOCKAPP) && !defined(APP_WISERVER)
 typedef struct socket_app_state {
   char name;
 } uip_tcp_appstate_t;
+#endif // !defined(APP_SOCKAPP) && !defined(APP_WISERVER)
 
 void dummy_app_appcall(void);
 #ifndef UIP_APPCALL

uip-conf.h

@@ -38,7 +38,6 @@
 #include <inttypes.h>
 #include <avr/io.h>
 #include <stdio.h>
-//#include <stdbool.h>
 
 /**
  * 8 bit datatype
@@ -68,19 +67,22 @@ typedef uint16_t u16_t;
  */
 typedef unsigned short uip_stats_t;
 
+//Include app configuration
+#include "apps-conf.h"
+
 /**
  * Maximum number of TCP connections.
  *
  * \hideinitializer
  */
-#define UIP_CONF_MAX_CONNECTIONS 1
+#define UIP_CONF_MAX_CONNECTIONS MAX_TCP_CONNS
 
 /**
  * Maximum number of listening TCP ports.
  *
  * \hideinitializer
  */
-#define UIP_CONF_MAX_LISTENPORTS 1
+#define UIP_CONF_MAX_LISTENPORTS MAX_TCP_LISTENPORTS
 
 /**
  * uIP buffer size.
@@ -107,14 +109,14 @@ typedef unsigned short uip_stats_t;
  *
  * \hideinitializer
  */
-#define UIP_CONF_UDP             0
+#define UIP_CONF_UDP             UIP_UDP_ENABLED
 
 /**
  * UDP checksums on or off
  *
  * \hideinitializer
  */
-#define UIP_CONF_UDP_CHECKSUMS   0
+#define UIP_CONF_UDP_CHECKSUMS   UIP_UDP_ENABLED
 
 /**
  * uIP statistics on or off
@@ -128,17 +130,14 @@ typedef unsigned short uip_stats_t;
  *
  * \hideinitializer
  */
-#define UIP_CONF_BROADCAST		0
+#define UIP_CONF_BROADCAST		 UIP_UDP_ENABLED
 
 /**
  * The maximum amount of concurrent UDP connections.
  *
  * \hideinitializer
  */
-#define UIP_CONF_UDP_CONNS		1
-
-//Include app configuration
-#include "apps-conf.h"
+#define UIP_CONF_UDP_CONNS		 MAX_UDP_CONNS
 
 #endif /* __UIP_CONF_H__ */