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

remove link status and bugfix params.c

Browse source
This commit is contained in:
harald 2014-03-04 14:42:36 +01:00
parent 11b7022ce6
commit d8d0a507e1
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/osd/rpl-border-router/border-router.c
View file

@ -51,6 +51,8 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "dev/leds.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/uip-debug.h"
@ -79,7 +81,7 @@ AUTOSTART_PROCESSES(&border_router_process,&webserver_nogui_process);
*/ */
#define WEBSERVER_CONF_LOADTIME 0 #define WEBSERVER_CONF_LOADTIME 0
#define WEBSERVER_CONF_FILESTATS 0 #define WEBSERVER_CONF_FILESTATS 0
#define WEBSERVER_CONF_NEIGHBOR_STATUS 1 #define WEBSERVER_CONF_NEIGHBOR_STATUS 0
/* Adding links requires a larger RAM buffer. To avoid static allocation /* Adding links requires a larger RAM buffer. To avoid static allocation
* the stack can be used for formatting; however tcp retransmissions * the stack can be used for formatting; however tcp retransmissions
* and multiple connections can result in garbled segments. * and multiple connections can result in garbled segments.
@ -334,7 +336,7 @@ PROCESS_THREAD(border_router_process, ev, data)
rpl_dag_t *dag; rpl_dag_t *dag;
PROCESS_BEGIN(); PROCESS_BEGIN();
leds_off(LEDS_RED);
/* While waiting for the prefix to be sent through the SLIP connection, the future /* While waiting for the prefix to be sent through the SLIP connection, the future
* border router can join an existing DAG as a parent or child, or acquire a default * border router can join an existing DAG as a parent or child, or acquire a default
* router that will later take precedence over the SLIP fallback interface. * router that will later take precedence over the SLIP fallback interface.

4
platform/osd-merkur/params.c
View file

@ -120,7 +120,7 @@ uint8_t eemem_domain_name[] EEMEM = PARAMS_DOMAINNAME;
uint16_t eemem_nodeid EEMEM = PARAMS_NODEID; uint16_t eemem_nodeid EEMEM = PARAMS_NODEID;
uint8_t eemem_channel[2] EEMEM = {CHANNEL_802_15_4, ~CHANNEL_802_15_4}; uint8_t eemem_channel[2] EEMEM = {CHANNEL_802_15_4, ~CHANNEL_802_15_4};
uint16_t eemem_panid EEMEM = IEEE802154_PANID; uint16_t eemem_panid EEMEM = IEEE802154_CONF_PANID;
uint16_t eemem_panaddr EEMEM = PARAMS_PANADDR; uint16_t eemem_panaddr EEMEM = PARAMS_PANADDR;
uint8_t eemem_txpower EEMEM = PARAMS_TXPOWER; uint8_t eemem_txpower EEMEM = PARAMS_TXPOWER;
@ -153,7 +153,7 @@ params_get_channel(void) {
eeprom_write_block(&buffer, &eemem_server_name, sizeof(eemem_server_name)); eeprom_write_block(&buffer, &eemem_server_name, sizeof(eemem_server_name));
for (i=0;i<sizeof(default_domain_name);i++) buffer[i] = pgm_read_byte_near(default_domain_name+i); for (i=0;i<sizeof(default_domain_name);i++) buffer[i] = pgm_read_byte_near(default_domain_name+i);
eeprom_write_block(&buffer, &eemem_domain_name, sizeof(eemem_domain_name)); eeprom_write_block(&buffer, &eemem_domain_name, sizeof(eemem_domain_name));
eeprom_write_word(&eemem_panid , IEEE802154_PANID); eeprom_write_word(&eemem_panid , IEEE802154_CONF_PANID);
eeprom_write_word(&eemem_panaddr, PARAMS_PANADDR); eeprom_write_word(&eemem_panaddr, PARAMS_PANADDR);
eeprom_write_byte(&eemem_txpower, PARAMS_TXPOWER); eeprom_write_byte(&eemem_txpower, PARAMS_TXPOWER);
eeprom_write_word(&eemem_nodeid, PARAMS_NODEID); eeprom_write_word(&eemem_nodeid, PARAMS_NODEID);