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

Replace WEBSERVER by AVR_WEBSERVER

Browse source
This commit is contained in:
David Kopf 2011-07-24 11:43:17 -04:00
parent 506eced1bc
commit 0bb585fd60
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/avr/dev/clock.c
View file

@ -12,7 +12,7 @@ volatile unsigned long seconds;
long sleepseconds; long sleepseconds;
/* Set RADIOSTATS to monitor radio on time (must also be set in the radio driver) */ /* Set RADIOSTATS to monitor radio on time (must also be set in the radio driver) */
#if RF230BB && WEBSERVER #if RF230BB && AVR_WEBSERVER
#define RADIOSTATS 1 #define RADIOSTATS 1
#endif #endif

2
cpu/avr/radio/rf230bb/rf230bb.c
View file

@ -142,7 +142,7 @@ struct timestamp {
#endif #endif
/* See clock.c and httpd-cgi.c for RADIOSTATS code */ /* See clock.c and httpd-cgi.c for RADIOSTATS code */
#if WEBSERVER #if AVR_WEBSERVER
#define RADIOSTATS 1 #define RADIOSTATS 1
#endif #endif
#if RADIOSTATS #if RADIOSTATS

8
platform/avr-atmega128rfa1/contiki-main.c
View file

@ -74,7 +74,7 @@
#include "raven-lcd.h" #include "raven-lcd.h"
#endif #endif
#if WEBSERVER #if AVR_WEBSERVER
#include "httpd-fs.h" #include "httpd-fs.h"
#include "httpd-cgi.h" #include "httpd-cgi.h"
#endif #endif
@ -125,7 +125,7 @@ FUSES ={.low = 0xe2, .high = 0x99, .extended = 0xff,};
/* Use existing EEPROM if it passes the integrity test, else reinitialize with build values */ /* Use existing EEPROM if it passes the integrity test, else reinitialize with build values */
/* Put default MAC address in EEPROM */ /* Put default MAC address in EEPROM */
#if WEBSERVER #if AVR_WEBSERVER
extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via makefsdata.h extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via makefsdata.h
extern uint8_t server_name[16]; extern uint8_t server_name[16];
extern uint8_t domain_name[30]; extern uint8_t domain_name[30];
@ -354,7 +354,7 @@ uint8_t i;
/*--------------------------Announce the configuration---------------------*/ /*--------------------------Announce the configuration---------------------*/
#if ANNOUNCE_BOOT #if ANNOUNCE_BOOT
#if WEBSERVER #if AVR_WEBSERVER
uint8_t i; uint8_t i;
char buf[80]; char buf[80];
unsigned int size; unsigned int size;
@ -385,7 +385,7 @@ uint8_t i;
#else #else
PRINTA("Online\n"); PRINTA("Online\n");
#endif /* WEBSERVER */ #endif /* AVR_WEBSERVER */
#endif /* ANNOUNCE_BOOT */ #endif /* ANNOUNCE_BOOT */
} }

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

@ -66,7 +66,7 @@
#include "contiki-lib.h" #include "contiki-lib.h"
#include "contiki-net.h" #include "contiki-net.h"
#if WEBSERVER #if AVR_WEBSERVER
#include "webserver-nogui.h" #include "webserver-nogui.h"
#include "httpd-cgi.h" #include "httpd-cgi.h"
#endif #endif
@ -306,13 +306,13 @@ 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 #if AVR_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 #endif
break; break;
case SEND_ADC2: case SEND_ADC2:
#if WEBSERVER #if AVR_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 #endif
@ -449,7 +449,7 @@ raven_lcd_show_text(char *text) {
send_frame(REPORT_TEXT_MSG, textlen, (uint8_t *) text); send_frame(REPORT_TEXT_MSG, textlen, (uint8_t *) text);
} }
#if WEBSERVER #if AVR_WEBSERVER
static void static void
lcd_show_servername(void) { lcd_show_servername(void) {
@ -469,7 +469,7 @@ PROCESS_THREAD(raven_lcd_process, ev, data)
PROCESS_BEGIN(); PROCESS_BEGIN();
#if WEBSERVER #if AVR_WEBSERVER
lcd_show_servername(); lcd_show_servername();
#endif #endif

2
platform/avr-raven/apps/raven-webserver/Makefile.raven-webserver
View file

@ -4,7 +4,7 @@ raven-webserver_src = webserver-nogui.c httpd.c http-strings.c psock.c memb.c \
raven-webserver_dsc = webserver-dsc.c raven-webserver_dsc = webserver-dsc.c
#Tell platform main routine webserver is present, for parameter display at startup #Tell platform main routine webserver is present, for parameter display at startup
CFLAGS += -DWEBSERVER CFLAGS += -DAVR_WEBSERVER
#$(CONTIKI)/apps/webserver/http-strings.c: $(CONTIKI)/apps/webserver/http-strings #$(CONTIKI)/apps/webserver/http-strings.c: $(CONTIKI)/apps/webserver/http-strings
# cd $(CONTIKI)/apps/webserver/; $(CONTIKI)/tools/makestrings $< # cd $(CONTIKI)/apps/webserver/; $(CONTIKI)/tools/makestrings $<

8
platform/avr-raven/contiki-raven-main.c
View file

@ -76,7 +76,7 @@
#include "raven-lcd.h" #include "raven-lcd.h"
#endif #endif
#if WEBSERVER #if AVR_WEBSERVER
#include "httpd-fs.h" #include "httpd-fs.h"
#include "httpd-cgi.h" #include "httpd-cgi.h"
#endif #endif
@ -125,7 +125,7 @@ FUSES ={.low = 0xe2, .high = 0x99, .extended = 0xff,};
/* Use existing EEPROM if it passes the integrity test, else reinitialize with build values */ /* Use existing EEPROM if it passes the integrity test, else reinitialize with build values */
/* Put default MAC address in EEPROM */ /* Put default MAC address in EEPROM */
#if WEBSERVER #if AVR_WEBSERVER
extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via makefsdata.h extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via makefsdata.h
extern uint8_t server_name[16]; extern uint8_t server_name[16];
extern uint8_t domain_name[30]; extern uint8_t domain_name[30];
@ -340,7 +340,7 @@ uint8_t i;
/*--------------------------Announce the configuration---------------------*/ /*--------------------------Announce the configuration---------------------*/
#if ANNOUNCE_BOOT #if ANNOUNCE_BOOT
#if WEBSERVER #if AVR_WEBSERVER
uint8_t i; uint8_t i;
char buf[80]; char buf[80];
unsigned int size; unsigned int size;
@ -371,7 +371,7 @@ uint8_t i;
#else #else
PRINTF("Online\n"); PRINTF("Online\n");
#endif /* WEBSERVER */ #endif /* AVR_WEBSERVER */
#endif /* ANNOUNCE_BOOT */ #endif /* ANNOUNCE_BOOT */
} }