Skip to content

Commit fbba1bc

Browse files
d00616d00616
committed
Fix pin definition handling and defines
1 parent 2152f91 commit fbba1bc

File tree

9 files changed

+147
-116
lines changed

9 files changed

+147
-116
lines changed

‎boards.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ MyBoard_nRF52832.build.board=GENERIC
4141
MyBoard_nRF52832.build.core=sandeepmistry:nRF5
4242
MyBoard_nRF52832.build.variant=MyBoardNRF5
4343
MyBoard_nRF52832.build.variant_system_lib=
44-
# -I{build.path} and -DMYNRF5BOARD is only required by MyBoardNRF5
45-
MyBoard_nRF52832.build.extra_flags=-DNRF52 -DMYNRF5BOARD -I{build.path}
44+
# -I{build.path} and -DMYBOARDNRF5 is only required by MyBoardNRF5
45+
MyBoard_nRF52832.build.extra_flags=-DNRF52 -DMYBOARDNRF5 -I{build.path}
4646
MyBoard_nRF52832.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
4747
MyBoard_nRF52832.build.ldscript=nrf52_xxaa.ld
4848

@@ -86,8 +86,8 @@ MyBoard_nRF51822.build.board=GENERIC
8686
MyBoard_nRF51822.build.core=sandeepmistry:nRF5
8787
MyBoard_nRF51822.build.variant=MyBoardNRF5
8888
MyBoard_nRF51822.build.variant_system_lib=
89-
# -I{build.path} and -DMYNRF5BOARD is only required by MyBoardNRF5
90-
MyBoard_nRF51822.build.extra_flags=-DNRF51 -DMYNRF5BOARD -I{build.path}
89+
# -I{build.path} and -DMYBOARDNRF5 is only required by MyBoardNRF5
90+
MyBoard_nRF51822.build.extra_flags=-DNRF51 -DMYBOARDNRF5 -I{build.path}
9191
MyBoard_nRF51822.build.float_flags=
9292
MyBoard_nRF51822.build.ldscript=nrf51_{build.chip}.ld
9393

‎libraries/MyBoardNRF5/examples/MyBoardNRF5/MyBoardNRF5.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262

6363

64-
#ifdef MYNRF5BOARD
64+
#ifdef MYBOARDNRF5
6565
#include <variant.h>
6666

6767
/*
@@ -104,4 +104,7 @@ const PinDescription g_APinDescription[]=
104104
{ PORT0, 31, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), ADC_A7, PWM0, NOT_ON_TIMER}
105105
};
106106

107+
// Don't remove this line
108+
#include <compat_pin_mapping.h>
109+
107110
#endif

‎libraries/MyBoardNRF5/examples/MyBoardNRF5/MyBoardNRF5.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4040
*/
4141

42-
#ifndef _MYNRF5BOARD_H_
43-
#define _MYNRF5BOARD_H_
42+
#ifndef _MYBOARDNRF5_H_
43+
#define _MYBOARDNRF5_H_
4444

4545
#ifdef __cplusplus
4646
extern "C"

‎libraries/MyBoardNRF5/examples/mass_erase/MyBoardNRF5.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262

6363

64-
#ifdef MYNRF5BOARD
64+
#ifdef MYBOARDNRF5
6565
#include <variant.h>
6666

6767
/*
@@ -104,4 +104,7 @@ const PinDescription g_APinDescription[]=
104104
{ PORT0, 31, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), ADC_A7, PWM0, NOT_ON_TIMER}
105105
};
106106

107+
// Don't remove this line
108+
#include <compat_pin_mapping.h>
109+
107110
#endif

‎libraries/MyBoardNRF5/examples/mass_erase/MyBoardNRF5.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4040
*/
4141

42-
#ifndef _MYNRF5BOARD_H_
43-
#define _MYNRF5BOARD_H_
42+
#ifndef _MYBOARDNRF5_H_
43+
#define _MYBOARDNRF5_H_
4444

4545
#ifdef __cplusplus
4646
extern "C"

‎platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1818

1919
name=MySensors nRF5 Boards
20-
version=0.2.1
20+
version=0.3.0
2121

2222
# Path calculation
2323
##################

‎variants/MyBoardNRF5/compat_pin_mapping.h

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
/*
2+
Copyright (c) 2014-2015 Arduino LLC. All right reserved.
3+
Copyright (c) 2016 Sandeep Mistry All right reserved.
4+
5+
This library is free software; you can redistribute it and/or
6+
modify it under the terms of the GNU Lesser General Public
7+
License as published by the Free Software Foundation; either
8+
version 2.1 of the License, or (at your option) any later version.
9+
10+
This library is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13+
See the GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public
16+
License along with this library; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18+
*/
19+
20+
#pragma once
21+
22+
#ifndef MY_ARDUINO_CORE_NRF5
23+
const uint32_t g_ADigitalPinMap[] = {
24+
#if PINS_COUNT>(0u)
25+
g_APinDescription[0].ulPin
26+
#endif
27+
#if PINS_COUNT>(1u)
28+
,g_APinDescription[1].ulPin
29+
#endif
30+
#if PINS_COUNT>(2u)
31+
,g_APinDescription[2].ulPin
32+
#endif
33+
#if PINS_COUNT>(3u)
34+
,g_APinDescription[3].ulPin
35+
#endif
36+
#if PINS_COUNT>(4u)
37+
,g_APinDescription[4].ulPin
38+
#endif
39+
#if PINS_COUNT>(5u)
40+
,g_APinDescription[5].ulPin
41+
#endif
42+
#if PINS_COUNT>(6u)
43+
,g_APinDescription[6].ulPin
44+
#endif
45+
#if PINS_COUNT>(7u)
46+
,g_APinDescription[7].ulPin
47+
#endif
48+
#if PINS_COUNT>(8u)
49+
,g_APinDescription[8].ulPin
50+
#endif
51+
#if PINS_COUNT>(9u)
52+
,g_APinDescription[9].ulPin
53+
#endif
54+
#if PINS_COUNT>(10u)
55+
,g_APinDescription[10].ulPin
56+
#endif
57+
#if PINS_COUNT>(11u)
58+
,g_APinDescription[11].ulPin
59+
#endif
60+
#if PINS_COUNT>(12u)
61+
,g_APinDescription[12].ulPin
62+
#endif
63+
#if PINS_COUNT>(13u)
64+
,g_APinDescription[13].ulPin
65+
#endif
66+
#if PINS_COUNT>(14u)
67+
,g_APinDescription[14].ulPin
68+
#endif
69+
#if PINS_COUNT>(15u)
70+
,g_APinDescription[15].ulPin
71+
#endif
72+
#if PINS_COUNT>(16u)
73+
,g_APinDescription[16].ulPin
74+
#endif
75+
#if PINS_COUNT>(17u)
76+
,g_APinDescription[17].ulPin
77+
#endif
78+
#if PINS_COUNT>(18u)
79+
,g_APinDescription[18].ulPin
80+
#endif
81+
#if PINS_COUNT>(19u)
82+
,g_APinDescription[19].ulPin
83+
#endif
84+
#if PINS_COUNT>(20u)
85+
,g_APinDescription[20].ulPin
86+
#endif
87+
#if PINS_COUNT>(21u)
88+
,g_APinDescription[21].ulPin
89+
#endif
90+
#if PINS_COUNT>(22u)
91+
,g_APinDescription[22].ulPin
92+
#endif
93+
#if PINS_COUNT>(23u)
94+
,g_APinDescription[23].ulPin
95+
#endif
96+
#if PINS_COUNT>(24u)
97+
,g_APinDescription[24].ulPin
98+
#endif
99+
#if PINS_COUNT>(25u)
100+
,g_APinDescription[25].ulPin
101+
#endif
102+
#if PINS_COUNT>(26u)
103+
,g_APinDescription[26].ulPin
104+
#endif
105+
#if PINS_COUNT>(27u)
106+
,g_APinDescription[27].ulPin
107+
#endif
108+
#if PINS_COUNT>(28u)
109+
,g_APinDescription[28].ulPin
110+
#endif
111+
#if PINS_COUNT>(29u)
112+
,g_APinDescription[29].ulPin
113+
#endif
114+
#if PINS_COUNT>(30u)
115+
,g_APinDescription[30].ulPin
116+
#endif
117+
#if PINS_COUNT>(31u)
118+
,g_APinDescription[31].ulPin
119+
#endif
120+
};
121+
#endif

‎variants/MyBoardNRF5/variant.cpp

Lines changed: 1 addition & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -18,107 +18,7 @@
1818
*/
1919

2020
#include "variant.h"
21-
22-
#ifndef MY_ARDUINO_CORE_NRF5
23-
const uint32_t g_ADigitalPinMap[] = {
24-
#if PINS_COUNT>(0u)
25-
g_APinDescription[0].ulPin
26-
#endif
27-
#if PINS_COUNT>(1u)
28-
,g_APinDescription[1].ulPin
29-
#endif
30-
#if PINS_COUNT>(2u)
31-
,g_APinDescription[2].ulPin
32-
#endif
33-
#if PINS_COUNT>(3u)
34-
,g_APinDescription[3].ulPin
35-
#endif
36-
#if PINS_COUNT>(4u)
37-
,g_APinDescription[4].ulPin
38-
#endif
39-
#if PINS_COUNT>(5u)
40-
,g_APinDescription[5].ulPin
41-
#endif
42-
#if PINS_COUNT>(6u)
43-
,g_APinDescription[6].ulPin
44-
#endif
45-
#if PINS_COUNT>(7u)
46-
,g_APinDescription[7].ulPin
47-
#endif
48-
#if PINS_COUNT>(8u)
49-
,g_APinDescription[8].ulPin
50-
#endif
51-
#if PINS_COUNT>(9u)
52-
,g_APinDescription[9].ulPin
53-
#endif
54-
#if PINS_COUNT>(10u)
55-
,g_APinDescription[10].ulPin
56-
#endif
57-
#if PINS_COUNT>(11u)
58-
,g_APinDescription[11].ulPin
59-
#endif
60-
#if PINS_COUNT>(12u)
61-
,g_APinDescription[12].ulPin
62-
#endif
63-
#if PINS_COUNT>(13u)
64-
,g_APinDescription[13].ulPin
65-
#endif
66-
#if PINS_COUNT>(14u)
67-
,g_APinDescription[14].ulPin
68-
#endif
69-
#if PINS_COUNT>(15u)
70-
,g_APinDescription[15].ulPin
71-
#endif
72-
#if PINS_COUNT>(16u)
73-
,g_APinDescription[16].ulPin
74-
#endif
75-
#if PINS_COUNT>(17u)
76-
,g_APinDescription[17].ulPin
77-
#endif
78-
#if PINS_COUNT>(18u)
79-
,g_APinDescription[18].ulPin
80-
#endif
81-
#if PINS_COUNT>(19u)
82-
,g_APinDescription[19].ulPin
83-
#endif
84-
#if PINS_COUNT>(20u)
85-
,g_APinDescription[20].ulPin
86-
#endif
87-
#if PINS_COUNT>(21u)
88-
,g_APinDescription[21].ulPin
89-
#endif
90-
#if PINS_COUNT>(22u)
91-
,g_APinDescription[22].ulPin
92-
#endif
93-
#if PINS_COUNT>(23u)
94-
,g_APinDescription[23].ulPin
95-
#endif
96-
#if PINS_COUNT>(24u)
97-
,g_APinDescription[24].ulPin
98-
#endif
99-
#if PINS_COUNT>(25u)
100-
,g_APinDescription[25].ulPin
101-
#endif
102-
#if PINS_COUNT>(26u)
103-
,g_APinDescription[26].ulPin
104-
#endif
105-
#if PINS_COUNT>(27u)
106-
,g_APinDescription[27].ulPin
107-
#endif
108-
#if PINS_COUNT>(28u)
109-
,g_APinDescription[28].ulPin
110-
#endif
111-
#if PINS_COUNT>(29u)
112-
,g_APinDescription[29].ulPin
113-
#endif
114-
#if PINS_COUNT>(30u)
115-
,g_APinDescription[30].ulPin
116-
#endif
117-
#if PINS_COUNT>(31u)
118-
,g_APinDescription[31].ulPin
119-
#endif
120-
};
121-
#endif
21+
#include <sketch/MyBoardNRF5.h>
12222

12323
#if defined(MY_ARDUINO_CORE_NRF5) && defined(PIN_SERIAL_RX) && defined(PIN_SERIAL_TX)
12424
Uart Serial(PIN_SERIAL_RX, PIN_SERIAL_TX);

‎variants/MyBoardNRF5/variant.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818

19-
#ifndef _VARIANT_MYNRF5BOARD_
20-
#define _VARIANT_MYNRF5BOARD_
19+
#ifndef _VARIANT_MYBOARDNRF5_
20+
#define _VARIANT_MYBOARDNRF5_
2121

2222
/*----------------------------------------------------------------------------
2323
* Headers
@@ -39,11 +39,15 @@ extern "C"
3939

4040
#ifdef MY_ARDUINO_CORE_NRF5
4141
/**
42-
* Libc porting layers
42+
* Libc porting layers for arduino core variant
4343
*/
4444
#if defined ( __GNUC__ )
45-
# include <syscalls.h> /** RedHat Newlib minimal stub */
45+
#include <syscalls.h> /** RedHat Newlib minimal stub */
4646
#endif
47+
#else
48+
/**
49+
* Compatibility for arduino-nrf5 variant
50+
*/
4751
#endif
4852

4953
/*----------------------------------------------------------------------------

0 commit comments

Comments
 (0)