Skip to content

Commit d5dc04d

Browse files
committed
correct pca10056 pins
1 parent 3e4e6f9 commit d5dc04d

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- ExternalFS use fatfs to manage external spi flash (nrf52840 only) for usb msc.
1515
- Replace cpritnf by std printf
1616
- Added HwPWM3 for nRF52840
17-
- Added ISR_DEFERRED for attachInterrupt() for deferring callback from ISR context
17+
- Added ISR_DEFERRED option for attachInterrupt() to defer callback from ISR context
1818
- Added digital_interrupt_deferred sketch for demo
1919

2020
## 0.8.6

cores/nRF5/HardwarePWM.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ HardwarePWM HwPWM0(NRF_PWM0);
4141
HardwarePWM HwPWM1(NRF_PWM1);
4242
HardwarePWM HwPWM2(NRF_PWM2);
4343

44-
#ifdef NRF52840_XXAA
44+
#ifdef NRF_PWM3
4545
HardwarePWM HwPWM3(NRF_PWM3);
4646
#endif
4747

4848
HardwarePWM* HwPWMx[] =
4949
{
5050
&HwPWM0, &HwPWM1, &HwPWM2
51-
#ifdef NRF52840_XXAA
51+
#ifdef NRF_PWM3
5252
,&HwPWM3
5353
#endif
5454
};

cores/nRF5/HardwarePWM.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ extern HardwarePWM HwPWM0;
100100
extern HardwarePWM HwPWM1;
101101
extern HardwarePWM HwPWM2;
102102

103-
#ifdef NRF52840_XXAA
103+
#ifdef NRF_PWM3
104104
extern HardwarePWM HwPWM3;
105105
#endif
106106

variants/pca10056/variant.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ extern "C"
6060
#define PIN_A3 (29)
6161
#define PIN_A4 (30)
6262
#define PIN_A5 (31)
63-
#define PIN_A6 (26)
64-
#define PIN_A7 (27)
63+
#define PIN_A6 (42)
64+
#define PIN_A7 (43)
6565

6666
static const uint8_t A0 = PIN_A0 ;
6767
static const uint8_t A1 = PIN_A1 ;
@@ -92,9 +92,9 @@ static const uint8_t AREF = PIN_AREF;
9292
*/
9393
#define SPI_INTERFACES_COUNT 1
9494

95-
#define PIN_SPI_MISO (47)
96-
#define PIN_SPI_MOSI (46)
97-
#define PIN_SPI_SCK (45)
95+
#define PIN_SPI_MISO (46)
96+
#define PIN_SPI_MOSI (45)
97+
#define PIN_SPI_SCK (47)
9898

9999
static const uint8_t SS = 44 ;
100100
static const uint8_t MOSI = PIN_SPI_MOSI ;
@@ -106,8 +106,8 @@ static const uint8_t SCK = PIN_SPI_SCK ;
106106
*/
107107
#define WIRE_INTERFACES_COUNT 1
108108

109-
#define PIN_WIRE_SDA (43)
110-
#define PIN_WIRE_SCL (42)
109+
#define PIN_WIRE_SDA (26)
110+
#define PIN_WIRE_SCL (27)
111111

112112
/*
113113
* QSPI interface for external flash

0 commit comments

Comments
 (0)