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

Several bugfixes

Browse source
This commit is contained in:
David Kopf 2012-02-21 11:14:52 -05:00
parent 59e459e0e9
commit deb75d3d97
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cpu/avr/radio/rf230bb/atmega128rfa1_registermap.h
View file

@ -81,6 +81,7 @@
#define SR_CCA_REQUEST 0x08, 0x80, 7 #define SR_CCA_REQUEST 0x08, 0x80, 7
#define SR_CCA_DONE 0x01, 0x80, 7 #define SR_CCA_DONE 0x01, 0x80, 7
#define SR_CCA_STATUS 0x01, 0x40, 6 #define SR_CCA_STATUS 0x01, 0x40, 6
#define SR_AACK_SET_PD 0x2e, 0x20, 5
/* RF230 register assignments, for reference */ /* RF230 register assignments, for reference */

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

@ -855,9 +855,6 @@ rf230_transmit(unsigned short payload_len)
/* This automatically does the PLL calibrations */ /* This automatically does the PLL calibrations */
if (hal_get_slptr()) { if (hal_get_slptr()) {
#if defined(__AVR_ATmega128RFA1__) #if defined(__AVR_ATmega128RFA1__)
if (radiowason) DEBUGFLOW('e');
radiowason=0;
// DEBUGFLOW('j');
ENERGEST_ON(ENERGEST_TYPE_LED_RED); ENERGEST_ON(ENERGEST_TYPE_LED_RED);
#if RF230BB_CONF_LEDONPORTE1 #if RF230BB_CONF_LEDONPORTE1
PORTE|=(1<<PE1); //ledon PORTE|=(1<<PE1); //ledon

2
platform/avr-ravenusb/contiki-conf.h
View file

@ -392,7 +392,7 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
#define RF230_MAX_TX_POWER 15 #define RF230_MAX_TX_POWER 15
#define RF230_MIN_RX_POWER 30 #define RF230_MIN_RX_POWER 30
*/ */
#define RPL_CONF_ADJUST_LLH_LEN 1
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_REACHABLE_TIME 600000