From 3520cc0bae66015568536b9417de513e3b628ac3 Mon Sep 17 00:00:00 2001 From: David Kopf Date: Wed, 31 Aug 2011 12:13:31 -0400 Subject: [PATCH] flash led on tcp get, fix pingbacks on rpl build, patch web data for params --- .../apps/raven-lcd-interface/raven-lcd.c | 6 +++++- .../apps/raven-webserver/httpd-fsdata.c | 13 +++++++++---- .../avr-atmega128rfa1/apps/raven-webserver/httpd.c | 4 ++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c b/platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c index 2d686024c..0ce1e9c6a 100644 --- a/platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c +++ b/platform/avr-atmega128rfa1/apps/raven-lcd-interface/raven-lcd.c @@ -101,7 +101,11 @@ void rs232_send(uint8_t port, unsigned char c); void raven_ping6(void) { -#define PING_GOOGLE 0 +#if UIP_CONF_IPV6_RPL||1 +/* No default router, so pick on someone else */ +#define PING_GOOGLE 1 +seqno++; +#endif UIP_IP_BUF->vtc = 0x60; UIP_IP_BUF->tcflow = 1; diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.c b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.c index 47b714f6b..4480bb838 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.c +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.c @@ -2,10 +2,15 @@ #include -/* Link layer ipv6 address will become fe80::2 */ -uint8_t mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}; -uint8_t server_name[16] EEMEM = "huginn"; -uint8_t domain_name[30] EEMEM = "localhost"; + +/* Link layer ipv6 address will become fe80::ff:fe:1 */ +uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}; +uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1"; +uint8_t default_domain_name[30] PROGMEM = "localhost"; +uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}; +uint8_t eemem_server_name[16] EEMEM = "ATMEGA128rfa1"; +uint8_t eemem_domain_name[30] EEMEM = "localhost"; + const char data_404_html[140] PROGMEM = { /* /404.html */ diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.c b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.c index 17a1032ff..af2f1cd35 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.c +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd.c @@ -459,6 +459,10 @@ httpd_appcall(void *state) if (1) { #else struct httpd_state *s = (struct httpd_state *)state; +#if RF230BB_CONF_LEDONPORTE1 + extern uint16_t ledtimer; + PORTE|=(1<