mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-10 14:54:46 +00:00
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
This commit is contained in:
commit
5a054c82d2
@ -82,10 +82,10 @@ int neighbor_info_subscribe(neighbor_info_subscriber_t);
|
||||
|
||||
|
||||
/**
|
||||
* Get link ETX value for a specific neighbor.
|
||||
* Get link metric value for a specific neighbor.
|
||||
*
|
||||
* \return Returns ETX if the neighbor exists, and 0 if not.
|
||||
* \return Returns link metric if the neighbor exists, and 0 if not.
|
||||
*/
|
||||
link_metric_t neighbor_info_get_etx(const rimeaddr_t *addr);
|
||||
link_metric_t neighbor_info_get_metric(const rimeaddr_t *addr);
|
||||
|
||||
#endif /* NEIGHBOR_INFO_H */
|
||||
|
@ -136,7 +136,7 @@ collect_common_send(void)
|
||||
nbr = uip_ds6_nbr_lookup(&preferred_parent->addr);
|
||||
if(nbr != NULL) {
|
||||
rimeaddr_copy(&parent, (rimeaddr_t *)&nbr->ipaddr.u8[8]);
|
||||
parent_etx = neighbor_info_get_etx((rimeaddr_t *) &nbr->lladdr) / 2;
|
||||
parent_etx = neighbor_info_get_metric((rimeaddr_t *) &nbr->lladdr) / 2;
|
||||
}
|
||||
}
|
||||
rtmetric = dag->rank;
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include "lib/sensors.h"
|
||||
#include "dev/irq.h"
|
||||
#include "dev/lpm.h"
|
||||
#include <io.h>
|
||||
#include <signal.h>
|
||||
|
||||
#define ADC12MCTL_NO(adcno) ((unsigned char *) ADC12MCTL0_)[adcno]
|
||||
|
@ -34,6 +34,7 @@
|
||||
#include "dev/radio-sensor.h"
|
||||
#include "dev/irq.h"
|
||||
#include "dev/tr1001.h"
|
||||
#include <io.h>
|
||||
|
||||
const struct sensors_sensor radio_sensor;
|
||||
|
||||
|
@ -30,9 +30,10 @@
|
||||
*
|
||||
* @(#)$Id: sound-sensor.c,v 1.5 2010/02/08 00:00:45 nifi Exp $
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
#include "dev/sound-sensor.h"
|
||||
#include "dev/irq.h"
|
||||
#include <stdlib.h>
|
||||
#include <io.h>
|
||||
|
||||
#define MIC_MIN_SENS 150
|
||||
#define SAMPLE 1
|
||||
|
Loading…
Reference in New Issue
Block a user