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

drivers/nrf24l01p: rename CMD_NOP -> CMD_NOOP

Browse Source 
This prevents a conflict with an unrelated Atmel header file.
This commit is contained in:
Benjamin Valentin 2019-10-15 18:04:27 +02:00
parent 6cf6dcb946
commit d92e2b25ac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/nrf24l01p/include/nrf24l01p_settings.h
View File

@ -69,7 +69,7 @@ extern "C" {
#define CMD_R_RX_PL_WID 0x60
#define CMD_W_ACK_PAYLOAD 0xa8
#define CMD_W_TX_PAYLOAD_NOACK 0xb0
#define CMD_NOP 0xff
#define CMD_NOOP 0xff
#define REGISTER_MASK 0x1F
/** @} */

4
drivers/nrf24l01p/nrf24l01p.c
View File

@ -40,7 +40,7 @@ int nrf24l01p_read_reg(const nrf24l01p_t *dev, char reg, char *answer)
spi_acquire(dev->spi, dev->cs, SPI_MODE, SPI_CLK);
*answer = (char)spi_transfer_reg(dev->spi, dev->cs,
(CMD_R_REGISTER | (REGISTER_MASK & reg)),
CMD_NOP);
CMD_NOOP);
/* Release the bus for other threads. */
spi_release(dev->spi);
@ -581,7 +581,7 @@ int nrf24l01p_get_status(const nrf24l01p_t *dev)
/* Acquire exclusive access to the bus. */
spi_acquire(dev->spi, dev->cs, SPI_MODE, SPI_CLK);
status = spi_transfer_byte(dev->spi, dev->cs, false, CMD_NOP);
status = spi_transfer_byte(dev->spi, dev->cs, false, CMD_NOOP);
/* Release the bus for other threads. */
spi_release(dev->spi);