deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix unresolved references when built without webserver and/or tcp. Changes suggested by Harald Pichler.

Browse source
This commit is contained in:
dak664 2011-03-10 10:47:56 -05:00 committed by David Kopf
parent ad67c573de
commit 69da4c8cfa
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c
View file

@ -65,8 +65,12 @@
#include "contiki.h" #include "contiki.h"
#include "contiki-lib.h" #include "contiki-lib.h"
#include "contiki-net.h" #include "contiki-net.h"
#if WEBSERVER
#include "webserver-nogui.h" #include "webserver-nogui.h"
#include "httpd-cgi.h" #include "httpd-cgi.h"
#endif
#include "raven-lcd.h" #include "raven-lcd.h"
#include <string.h> #include <string.h>
@ -302,12 +306,16 @@ raven_gui_loop(process_event_t ev, process_data_t data)
raven_ping6(); raven_ping6();
break; break;
case SEND_TEMP: case SEND_TEMP:
#if WEBSERVER
/* Set temperature string in web server */ /* Set temperature string in web server */
web_set_temp((char *)cmd.frame); web_set_temp((char *)cmd.frame);
#endif
break; break;
case SEND_ADC2: case SEND_ADC2:
#if WEBSERVER
/* Set ext voltage string in web server */ /* Set ext voltage string in web server */
web_set_voltage((char *)cmd.frame); web_set_voltage((char *)cmd.frame);
#endif
break; break;
case SEND_SLEEP: case SEND_SLEEP:
/* Sleep radio and 1284p. */ /* Sleep radio and 1284p. */
@ -316,7 +324,8 @@ raven_gui_loop(process_event_t ev, process_data_t data)
} else { } else {
/* Sleep specified number of seconds (3290p "DOZE" mode) */ /* Sleep specified number of seconds (3290p "DOZE" mode) */
/* It sleeps a bit longer so we will be always be awake for the next sleep command. */ /* It sleeps a bit longer so we will be always be awake for the next sleep command. */
/* Only sleep this cycle if no active TCP/IP connections */ #if UIP_CONF_TCP
/* Only sleep this cycle if no active TCP/IP connections, for fast browser responsed */
activeconnections=0; activeconnections=0;
for(i = 0; i < UIP_CONNS; ++i) { for(i = 0; i < UIP_CONNS; ++i) {
if((uip_conns[i].tcpstateflags & UIP_TS_MASK) != UIP_CLOSED) activeconnections++; if((uip_conns[i].tcpstateflags & UIP_TS_MASK) != UIP_CLOSED) activeconnections++;
@ -325,6 +334,7 @@ raven_gui_loop(process_event_t ev, process_data_t data)
PRINTF("\nWaiting for %d connections",activeconnections); PRINTF("\nWaiting for %d connections",activeconnections);
break; break;
} }
#endif
} }
radio_state = NETSTACK_RADIO.off(); radio_state = NETSTACK_RADIO.off();
PRINTF ("\nsleep %d radio state %d...",cmd.frame[0],radio_state); PRINTF ("\nsleep %d radio state %d...",cmd.frame[0],radio_state);