giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Harmonise platform configuration files (nrf52dk)

This commit is contained in:
George Oikonomou 2017-12-08 16:31:50 +00:00
parent 4bdc2f7513
commit abe583ed75
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/cpu/nrf52832/dev/clock.c
View File

@ -53,7 +53,6 @@
#include "nrf_delay.h" #include "nrf_delay.h"
#include "app_error.h" #include "app_error.h"
#include "contiki.h" #include "contiki.h"
#include "platform-conf.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const nrf_drv_rtc_t rtc = NRF_DRV_RTC_INSTANCE(PLATFORM_RTC_INSTANCE_ID); /**< RTC instance used for platform clock */ const nrf_drv_rtc_t rtc = NRF_DRV_RTC_INSTANCE(PLATFORM_RTC_INSTANCE_ID); /**< RTC instance used for platform clock */

1
arch/cpu/nrf52832/rtimer-arch.c
View File

@ -44,7 +44,6 @@
#include "nrf_drv_timer.h" #include "nrf_drv_timer.h"
#include "app_error.h" #include "app_error.h"
#include "contiki.h" #include "contiki.h"
#include "platform-conf.h"
static const nrf_drv_timer_t timer = NRF_DRV_TIMER_INSTANCE(PLATFORM_TIMER_INSTANCE_ID); /**< Timer instance used for rtimer */ static const nrf_drv_timer_t timer = NRF_DRV_TIMER_INSTANCE(PLATFORM_TIMER_INSTANCE_ID); /**< Timer instance used for rtimer */

2
arch/platform/nrf52dk/contiki-conf.h
View File

@ -48,7 +48,7 @@
#endif /* PROJECT_CONF_PATH */ #endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Include platform peripherals configuration */ /* Include platform peripherals configuration */
#include "platform-conf.h" #include "nrf52dk-def.h"
#include "nrf52832-def.h" #include "nrf52832-def.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**

6
arch/platform/nrf52dk/platform-conf.h → arch/platform/nrf52dk/nrf52dk-def.h
View File

@ -43,8 +43,8 @@
* Wojciech Bober <wojciech.bober@nordicsemi.no> * Wojciech Bober <wojciech.bober@nordicsemi.no>
* *
*/ */
#ifndef PLATFORM_CONF_H_ #ifndef NRF52DK_DEF_H_
#define PLATFORM_CONF_H_ #define NRF52DK_DEF_H_
#include "boards.h" #include "boards.h"
@ -113,4 +113,4 @@
* @} * @}
* @} * @}
*/ */
#endif /* PLATFORM_CONF_H_ */ #endif /* NRF52DK_DEF_H_ */