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

Add settings manager with program flash defaults, random routine, periodic prints with ENERGEST, node-id.

Browse source
This commit is contained in:
David Kopf 2011-08-28 16:22:39 -04:00
parent 4c4d9aa57c
commit d2aece89ef
6 changed files with 507 additions and 153 deletions
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

@ -452,12 +452,12 @@ raven_lcd_show_text(char *text) {
static void
lcd_show_servername(void) {
//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 domain_name[30];
char buf[sizeof(server_name)+1];
eeprom_read_block (buf,server_name, sizeof(server_name));
buf[sizeof(server_name)]=0;
//extern uint8_t eemem_mac_address[8]; //These are defined in httpd-fsdata.c via makefsdata.h
extern uint8_t eemem_server_name[16];
//extern uint8_t eemem_domain_name[30];
char buf[sizeof(eemem_server_name)+1];
eeprom_read_block (buf,eemem_server_name, sizeof(eemem_server_name));
buf[sizeof(eemem_server_name)]=0;
raven_lcd_show_text(buf); //must fit in all the buffers or it will be truncated!
}
#endif

9
platform/avr-raven/apps/raven-webserver/httpd-fs/makefsdata.h
View file

@ -1,7 +1,10 @@
#include <avr/eeprom.h>
/* Link layer ipv6 address will become fe80::11:22ff:fe33:4455 */
uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
uint8_t server_name[16] EEMEM = "Contiki-Raven";
uint8_t domain_name[30] EEMEM = "localhost";
uint8_t default_mac_address[8] PROGMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
uint8_t default_server_name[16] PROGMEM = "Contiki-Raven";
uint8_t default_domain_name[30] PROGMEM = "localhost";
uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
uint8_t eemem_server_name[16] EEMEM = "Contiki-Raven";
uint8_t eemem_domain_name[30] EEMEM = "localhost";