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
cfc10443
Commit
cfc10443
authored
Dec 02, 2020
by
Sandeep Mistry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update #ifdef NRF52 -> #if defined(NRF52_SERIES)
parent
85798d15
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
cores/nRF5/SDK/components/drivers_nrf/delay/nrf_delay.h
cores/nRF5/SDK/components/drivers_nrf/delay/nrf_delay.h
+3
-3
cores/nRF5/Uart.cpp
cores/nRF5/Uart.cpp
+1
-1
cores/nRF5/WInterrupts.c
cores/nRF5/WInterrupts.c
+1
-1
No files found.
cores/nRF5/SDK/components/drivers_nrf/delay/nrf_delay.h
View file @
cfc10443
...
@@ -61,7 +61,7 @@ loop
...
@@ -61,7 +61,7 @@ loop
NOP
NOP
NOP
NOP
NOP
NOP
#if
def NRF52
#if
defined(NRF52_SERIES)
NOP
NOP
NOP
NOP
NOP
NOP
...
@@ -130,7 +130,7 @@ __ASM (
...
@@ -130,7 +130,7 @@ __ASM (
" NOP
\n\t
"
" NOP
\n\t
"
" NOP
\n\t
"
" NOP
\n\t
"
" NOP
\n\t
"
" NOP
\n\t
"
#if
def NRF52
#if
defined(NRF52_SERIES)
" NOP
\n\t
"
" NOP
\n\t
"
" NOP
\n\t
"
" NOP
\n\t
"
" NOP
\n\t
"
" NOP
\n\t
"
...
@@ -213,7 +213,7 @@ __ASM volatile (
...
@@ -213,7 +213,7 @@ __ASM volatile (
" NOP
\n
"
" NOP
\n
"
" NOP
\n
"
" NOP
\n
"
" NOP
\n
"
" NOP
\n
"
#if
def NRF52
#if
defined(NRF52_SERIES)
" NOP
\n
"
" NOP
\n
"
" NOP
\n
"
" NOP
\n
"
" NOP
\n
"
" NOP
\n
"
...
...
cores/nRF5/Uart.cpp
View file @
cfc10443
...
@@ -78,7 +78,7 @@ void Uart::begin(unsigned long baudrate, uint16_t /*config*/)
...
@@ -78,7 +78,7 @@ void Uart::begin(unsigned long baudrate, uint16_t /*config*/)
uint32_t
nrfBaudRate
;
uint32_t
nrfBaudRate
;
#if
def NRF52
#if
defined(NRF52_SERIES)
if
(
baudrate
<=
1200
)
{
if
(
baudrate
<=
1200
)
{
nrfBaudRate
=
UARTE_BAUDRATE_BAUDRATE_Baud1200
;
nrfBaudRate
=
UARTE_BAUDRATE_BAUDRATE_Baud1200
;
}
else
if
(
baudrate
<=
2400
)
{
}
else
if
(
baudrate
<=
2400
)
{
...
...
cores/nRF5/WInterrupts.c
View file @
cfc10443
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
#include <string.h>
#include <string.h>
#if
def NRF52
#if
defined(NRF52_SERIES)
#define NUMBER_OF_GPIO_TE 8
#define NUMBER_OF_GPIO_TE 8
#else
#else
#define NUMBER_OF_GPIO_TE 4
#define NUMBER_OF_GPIO_TE 4
...
...
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