ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Squashed 'connectivity/drivers/802.15.4_RF/atmel-rf-driver/' changes from 293edc63b8..ae4ef1b197 

ae4ef1b197 Merge pull request #101 from ARMmbed/sync_with_mbed_os_master
dd57078cf8 (via Mbed OS)resolved astyle - coding format.
f62ac25b09 (via Mbed OS)fixed the preprocessor guards
63cc85e983 Follow Mbed OS coding style

git-subtree-dir: connectivity/drivers/802.15.4_RF/atmel-rf-driver
git-subtree-split: ae4ef1b197698749ce030c39d84e222ac4b4cd0e
pull/13473/head^2
Arto Kinnunen 2020-08-24 15:36:54 +03:00
parent e1376bf778
commit 6e89573be1
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atmel-rf-driver/NanostackRfPhyAtmel.h
View File

@ -20,7 +20,7 @@
#include "at24mac.h"
#include "PinNames.h"
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && defined(MBED_CONF_RTOS_PRESENT)
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
#include "NanostackRfPhy.h"

2
source/NanostackRfPhyAT86RF215.cpp
View File

@ -16,7 +16,7 @@
#include <string.h>
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
#if defined(MBED_CONF_NANOSTACK_CONFIGURATION) && DEVICE_SPI && DEVICE_I2C && DEVICE_INTERRUPTIN && defined(MBED_CONF_RTOS_PRESENT)
#include "ns_types.h"
#include "platform/arm_hal_interrupt.h"

16
source/NanostackRfPhyAtmel.cpp
View File

@ -39,15 +39,15 @@
#if (MBED_VERSION > MBED_ENCODE_VERSION(6, 0, 0))
/* Mbed OS 6.0 introduces support for chrono time management */
using namespace std::chrono;
#define ATMEL_RF_TIME_50US 50us
#define ATMEL_RF_TIME_2MS 2ms
#define ATMEL_RF_TIME_10MS 10ms
#define ATMEL_RF_ATTACH(timer_ref, signal_ref, timeout_ref) timer_ref.attach(signal_ref, timeout_ref)
#define ATMEL_RF_TIME_50US 50us
#define ATMEL_RF_TIME_2MS 2ms
#define ATMEL_RF_TIME_10MS 10ms
#define ATMEL_RF_ATTACH(timer_ref, signal_ref, timeout_ref) timer_ref.attach(signal_ref, timeout_ref)
#else
#define ATMEL_RF_TIME_50US 50
#define ATMEL_RF_TIME_2MS 2
#define ATMEL_RF_TIME_10MS 10
#define ATMEL_RF_ATTACH(timer_ref, signal_ref, timeout_ref) timer_ref.attach_us(signal_ref, timeout_ref)
#define ATMEL_RF_TIME_50US 50
#define ATMEL_RF_TIME_2MS 2
#define ATMEL_RF_TIME_10MS 10
#define ATMEL_RF_ATTACH(timer_ref, signal_ref, timeout_ref) timer_ref.attach_us(signal_ref, timeout_ref)
#endif
#define TRACE_GROUP "AtRF"

3
source/rfbits.h
View File

@ -17,6 +17,8 @@
#ifndef RFBITS_H_
#define RFBITS_H_
#if DEVICE_SPI
#include "DigitalIn.h"
#include "DigitalOut.h"
#include "InterruptIn.h"
@ -78,4 +80,5 @@ public:
DigitalOut ANT_SEL;
};
#endif /* DEVICE_SPI */
#endif /* RFBITS_H_ */