RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #1675 from thomaseichinger/rf231_channel_setting

Browse Source 
drivers/at86rf231: handle channel out of range more conveniently
This commit is contained in:
Oleg Hahm 2014-09-16 10:55:09 +02:00
commit 22bf40e85e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/at86rf231/at86rf231.c
View File

@ -173,14 +173,17 @@ uint16_t at86rf231_get_pan(void)
return radio_pan;
}
uint8_t at86rf231_set_channel(uint8_t channel)
int8_t at86rf231_set_channel(uint8_t channel)
{
uint8_t cca_state;
radio_channel = channel;
if (channel < RF86RF231_MIN_CHANNEL ||
channel > RF86RF231_MAX_CHANNEL) {
radio_channel = RF86RF231_MAX_CHANNEL;
#if DEVELHELP
puts("[at86rf231] channel out of range!");
#endif
return -1;
}
cca_state = at86rf231_reg_read(AT86RF231_REG__PHY_CC_CCA) & ~AT86RF231_PHY_CC_CCA_MASK__CHANNEL;

10
drivers/include/at86rf231.h
View File

@ -1,3 +1,11 @@
/*
* Copyright (C) 2014 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
#ifndef AT86RF231_H_
#define AT86RF231_H_
@ -52,7 +60,7 @@ void at86rf231_rx_irq(void);
int16_t at86rf231_send(at86rf231_packet_t *packet);
uint8_t at86rf231_set_channel(uint8_t channel);
int8_t at86rf231_set_channel(uint8_t channel);
uint8_t at86rf231_get_channel(void);
uint16_t at86rf231_set_pan(uint16_t pan);