Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
8499a2c0
Commit
8499a2c0
authored
10 years ago
by
Hauke Petersen
Browse files
Options
Downloads
Patches
Plain Diff
board/pca1000x: small fixes to periph_conf.h files
parent
c9c7bfad
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
boards/pca10000/include/periph_conf.h
+4
-0
4 additions, 0 deletions
boards/pca10000/include/periph_conf.h
boards/pca10005/include/periph_conf.h
+19
-3
19 additions, 3 deletions
boards/pca10005/include/periph_conf.h
with
23 additions
and
3 deletions
boards/pca10000/include/periph_conf.h
+
4
−
0
View file @
8499a2c0
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#define TIMER_0_DEV NRF_TIMER0
#define TIMER_0_DEV NRF_TIMER0
#define TIMER_0_CHANNELS 3
#define TIMER_0_CHANNELS 3
#define TIMER_0_MAX_VALUE (0xffffffff)
#define TIMER_0_MAX_VALUE (0xffffffff)
#define TIMER_0_BITMODE TIMER_BITMODE_BITMODE_32Bit
#define TIMER_0_ISR isr_timer0
#define TIMER_0_ISR isr_timer0
#define TIMER_0_IRQ TIMER0_IRQn
#define TIMER_0_IRQ TIMER0_IRQn
...
@@ -42,6 +43,7 @@
...
@@ -42,6 +43,7 @@
#define TIMER_1_DEV NRF_TIMER1
#define TIMER_1_DEV NRF_TIMER1
#define TIMER_1_CHANNELS 3
#define TIMER_1_CHANNELS 3
#define TIMER_1_MAX_VALUE (0xffff)
#define TIMER_1_MAX_VALUE (0xffff)
#define TIEMR_1_BITMODE TIMER_BITMODE_BITMODE_16Bit
#define TIMER_1_ISR isr_timer1
#define TIMER_1_ISR isr_timer1
#define TIMER_1_IRQ TIMER1_IRQn
#define TIMER_1_IRQ TIMER1_IRQn
...
@@ -49,6 +51,7 @@
...
@@ -49,6 +51,7 @@
#define TIMER_2_DEV NRF_TIMER2
#define TIMER_2_DEV NRF_TIMER2
#define TIMER_2_CHANNELS 3
#define TIMER_2_CHANNELS 3
#define TIMER_2_MAX_VALUE (0xffff)
#define TIMER_2_MAX_VALUE (0xffff)
#define TIMER_2_BITMODE TIMER_BITMODE_BITMODE_16Bit
#define TIMER_2_ISR isr_timer2
#define TIMER_2_ISR isr_timer2
#define TIMER_2_IRQ TIMER2_IRQn
#define TIMER_2_IRQ TIMER2_IRQn
/** @} */
/** @} */
...
@@ -115,6 +118,7 @@
...
@@ -115,6 +118,7 @@
#define GPIO_15_EN 1
#define GPIO_15_EN 1
#define GPIO_IRQ_PRIO 1
#define GPIO_IRQ_PRIO 1
/* GPIO pin configuration */
#define GPIO_0_PIN 0
#define GPIO_0_PIN 0
#define GPIO_1_PIN 1
#define GPIO_1_PIN 1
#define GPIO_2_PIN 2
#define GPIO_2_PIN 2
...
...
This diff is collapsed.
Click to expand it.
boards/pca10005/include/periph_conf.h
+
19
−
3
View file @
8499a2c0
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
*
*
* @author Christian Kühling <kuehling@zedat.fu-berlin.de>
* @author Christian Kühling <kuehling@zedat.fu-berlin.de>
* @author Timo Ziegler <timo.ziegler@fu-berlin.de>
* @author Timo Ziegler <timo.ziegler@fu-berlin.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/
*/
#ifndef __PERIPH_CONF_H
#ifndef __PERIPH_CONF_H
...
@@ -26,7 +27,6 @@
...
@@ -26,7 +27,6 @@
*/
*/
#define TIMER_NUMOF (1U)
#define TIMER_NUMOF (1U)
#define TIMER_0_EN 1
#define TIMER_0_EN 1
/* timers 1 and 2 are not supported yet */
#define TIMER_1_EN 0
#define TIMER_1_EN 0
#define TIMER_2_EN 0
#define TIMER_2_EN 0
#define TIMER_IRQ_PRIO 1
#define TIMER_IRQ_PRIO 1
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#define TIMER_0_DEV NRF_TIMER0
#define TIMER_0_DEV NRF_TIMER0
#define TIMER_0_CHANNELS 3
#define TIMER_0_CHANNELS 3
#define TIMER_0_MAX_VALUE (0xffffffff)
#define TIMER_0_MAX_VALUE (0xffffffff)
#define TIMER_0_BITMODE TIMER_BITMODE_BITMODE_32Bit
#define TIMER_0_ISR isr_timer0
#define TIMER_0_ISR isr_timer0
#define TIMER_0_IRQ TIMER0_IRQn
#define TIMER_0_IRQ TIMER0_IRQn
...
@@ -42,6 +43,7 @@
...
@@ -42,6 +43,7 @@
#define TIMER_1_DEV NRF_TIMER1
#define TIMER_1_DEV NRF_TIMER1
#define TIMER_1_CHANNELS 3
#define TIMER_1_CHANNELS 3
#define TIMER_1_MAX_VALUE (0xffff)
#define TIMER_1_MAX_VALUE (0xffff)
#define TIEMR_1_BITMODE TIMER_BITMODE_BITMODE_16Bit
#define TIMER_1_ISR isr_timer1
#define TIMER_1_ISR isr_timer1
#define TIMER_1_IRQ TIMER1_IRQn
#define TIMER_1_IRQ TIMER1_IRQn
...
@@ -49,11 +51,11 @@
...
@@ -49,11 +51,11 @@
#define TIMER_2_DEV NRF_TIMER2
#define TIMER_2_DEV NRF_TIMER2
#define TIMER_2_CHANNELS 3
#define TIMER_2_CHANNELS 3
#define TIMER_2_MAX_VALUE (0xffff)
#define TIMER_2_MAX_VALUE (0xffff)
#define TIMER_2_BITMODE TIMER_BITMODE_BITMODE_16Bit
#define TIMER_2_ISR isr_timer2
#define TIMER_2_ISR isr_timer2
#define TIMER_2_IRQ TIMER2_IRQn
#define TIMER_2_IRQ TIMER2_IRQn
/** @} */
/** @} */
/**
/**
* @name UART configuration
* @name UART configuration
* @{
* @{
...
@@ -70,6 +72,21 @@
...
@@ -70,6 +72,21 @@
#define UART_0_PIN_TX 9
#define UART_0_PIN_TX 9
/** @} */
/** @} */
/**
* @name Real time counter configuration
* @{
*/
#define RTT_NUMOF (1U)
#define RTT_IRQ_PRIO 1
#define RTT_DEV NRF_RTC0
#define RTT_IRQ RTC0_IRQn
#define RTT_ISR isr_rtc0
#define RTT_MAX_VALUE (0xffffff)
#define RTT_FREQUENCY (10)
/* in Hz */
#define RTT_PRESCALER (3275U)
/* run with 10 Hz */
/** @} */
/**
/**
* @name Random Number Generator configuration
* @name Random Number Generator configuration
* @{
* @{
...
@@ -77,7 +94,6 @@
...
@@ -77,7 +94,6 @@
#define RANDOM_NUMOF (1U)
#define RANDOM_NUMOF (1U)
/** @} */
/** @} */
/**
/**
* @name GPIO configuration
* @name GPIO configuration
* @{
* @{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment