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
f8c28f4c
Commit
f8c28f4c
authored
7 years ago
by
Semjon Kerner
Browse files
Options
Downloads
Patches
Plain Diff
boards/calliope: adapted pins for rev 1.0
parent
89340154
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/calliope-mini/include/board.h
+1
-1
1 addition, 1 deletion
boards/calliope-mini/include/board.h
boards/calliope-mini/include/periph_conf.h
+4
-3
4 additions, 3 deletions
boards/calliope-mini/include/periph_conf.h
with
5 additions
and
4 deletions
boards/calliope-mini/include/board.h
+
1
−
1
View file @
f8c28f4c
...
...
@@ -61,7 +61,7 @@ extern "C" {
*/
#define BTN0_PIN GPIO_PIN(0, 17)
#define BTN0_MODE GPIO_IN
#define BTN1_PIN GPIO_PIN(0,
2
6)
#define BTN1_PIN GPIO_PIN(0,
1
6)
#define BTN1_MODE GPIO_IN
/** @} */
...
...
This diff is collapsed.
Click to expand it.
boards/calliope-mini/include/periph_conf.h
+
4
−
3
View file @
f8c28f4c
/*
* Copyright (C) 2016 Freie Universität Berlin
* Copyright (C) 2016
-2017
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
...
...
@@ -14,6 +14,7 @@
* @brief Peripheral configuration for the Calliope mini
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Semjon Kerner <semjon.kerner@fu-berlin.de>
*/
#ifndef PERIPH_CONF_H
...
...
@@ -100,8 +101,8 @@ static const timer_conf_t timer_config[] = {
static
const
i2c_conf_t
i2c_config
[]
=
{
{
.
dev
=
NRF_TWI0
,
.
pin_scl
=
0
,
.
pin_sda
=
3
0
,
.
pin_scl
=
19
,
.
pin_sda
=
2
0
,
.
ppi
=
0
}
};
...
...
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