Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
arduino-nRF5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
arduino-nRF5
Commits
ff441d3d
Commit
ff441d3d
authored
Apr 20, 2016
by
Sandeep Mistry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use TWI1 to avoid conflict with SPI0
parent
9375fec3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
libraries/Wire/Wire_nRF51.cpp
libraries/Wire/Wire_nRF51.cpp
+2
-2
libraries/Wire/Wire_nRF52.cpp
libraries/Wire/Wire_nRF52.cpp
+2
-2
No files found.
libraries/Wire/Wire_nRF51.cpp
View file @
ff441d3d
...
...
@@ -271,11 +271,11 @@ void TwoWire::onService(void)
{
}
TwoWire
Wire
(
NRF_TWI
0
,
SPI0_TWI0
_IRQn
,
PIN_WIRE_SDA
,
PIN_WIRE_SCL
);
TwoWire
Wire
(
NRF_TWI
1
,
SPI1_TWI1
_IRQn
,
PIN_WIRE_SDA
,
PIN_WIRE_SCL
);
extern
"C"
{
void
SPI
0_TWI0
_IRQHandler
(
void
)
void
SPI
1_TWI1
_IRQHandler
(
void
)
{
Wire
.
onService
();
}
...
...
libraries/Wire/Wire_nRF52.cpp
View file @
ff441d3d
...
...
@@ -345,11 +345,11 @@ void TwoWire::onService(void)
}
}
TwoWire
Wire
(
NRF_TWIM
0
,
NRF_TWIS0
,
SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0
_IRQn
,
PIN_WIRE_SDA
,
PIN_WIRE_SCL
);
TwoWire
Wire
(
NRF_TWIM
1
,
NRF_TWIS1
,
SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1
_IRQn
,
PIN_WIRE_SDA
,
PIN_WIRE_SCL
);
extern
"C"
{
void
SPIM
0_SPIS0_TWIM0_TWIS0_SPI0_TWI0
_IRQHandler
(
void
)
void
SPIM
1_SPIS1_TWIM1_TWIS1_SPI1_TWI1
_IRQHandler
(
void
)
{
Wire
.
onService
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment