Skip to content

Commit 6d10632

Browse files
committed
fix pin mapping in example for feather nrf52840
1 parent fbfb784 commit 6d10632

File tree

7 files changed

+24
-11
lines changed

7 files changed

+24
-11
lines changed

cores/nRF5/HardwarePWM.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ bool HardwarePWM::addPin(uint8_t pin)
109109
if ( enabled() )
110110
{
111111
_pwm->ENABLE = 0;
112-
_pwm->PSEL.OUT[_count++] = pin;
112+
_pwm->PSEL.OUT[_count++] = g_ADigitalPinMap[pin];
113113
_pwm->ENABLE = 1;
114114
_start();
115115
}else
116116
{
117-
_pwm->PSEL.OUT[_count++] = pin;
117+
_pwm->PSEL.OUT[_count++] = g_ADigitalPinMap[pin];
118118
}
119119

120120
return true;

libraries/Bluefruit52Lib/examples/Hardware/digital_interrupt_deferred/digital_interrupt_deferred.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*********************************************************************/
1414

1515
/*
16-
* This sketch demotrate how to pass ISR_DEFFERED as additional parameter
16+
* This sketch demonstrate how to pass ISR_DEFFERED as additional parameter
1717
* to defer callback from ISR context with attachInterrupt
1818
*/
1919
#include <Arduino.h>

libraries/Bluefruit52Lib/examples/Peripheral/adv_advanced/adv_advanced.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
#include <bluefruit.h>
2222

23-
#define PIN_ADV 11
23+
#define PIN_ADV A0
2424
#define ADV_TIMEOUT 60 // seconds
2525

2626
void setup()

libraries/Bluefruit52Lib/examples/Peripheral/ancs_oled/ancs_oled.ino

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,24 @@
2727
#include <bluefruit.h>
2828

2929
/*------------- OLED and Buttons -------------*/
30+
#if defined ARDUINO_NRF52_FEATHER
31+
// Feather nRF52832
3032
#define BUTTON_A 31
3133
#define BUTTON_B 30
3234
#define BUTTON_C 27
3335

34-
#define OLED_RESET 4
36+
#elif defined ARDUINO_NRF52840_FEATHER
37+
// Feather nRF52840
38+
#define BUTTON_A 9
39+
#define BUTTON_B 6
40+
#define BUTTON_C 5
41+
42+
#else
43+
#error board not supported
44+
#endif
45+
46+
47+
#define OLED_RESET 4 // TODO remove ?
3548
Adafruit_SSD1306 oled(OLED_RESET);
3649

3750

libraries/Bluefruit52Lib/examples/Peripheral/hid_camerashutter/hid_camerashutter.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
BLEDis bledis;
2323
BLEHidAdafruit blehid;
2424

25-
#define PIN_SHUTTER 11
25+
#define PIN_SHUTTER A0
2626

2727
void setup()
2828
{

libraries/Bluefruit52Lib/examples/Peripheral/hid_keyscan/hid_keyscan.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ void startAdv(void)
117117

118118
void loop()
119119
{
120-
/*-------------- San Pin Array and send report ---------------------*/
120+
/*-------------- Scan Pin Array and send report ---------------------*/
121121
bool anyKeyPressed = false;
122122

123123
uint8_t modifier = 0;
124124
uint8_t count=0;
125125
uint8_t keycode[6] = { 0 };
126126

127-
// scan mofidier key (only SHIFT), user implement ATL, CTRL, CMD if needed
127+
// scan modifier key (only SHIFT), user implement ATL, CTRL, CMD if needed
128128
if ( 0 == digitalRead(shiftPin) )
129129
{
130130
modifier |= KEYBOARD_MODIFIER_LEFTSHIFT;

libraries/RotaryEncoder/RotaryEncoder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ void HwRotaryEncoder::begin(uint8_t pina, uint8_t pinb, int8_t pinled)
5454
pinMode(pina, INPUT_PULLUP);
5555
pinMode(pinb, INPUT_PULLUP);
5656

57-
NRF_QDEC->PSEL.A = pina;
58-
NRF_QDEC->PSEL.B = pinb;
57+
NRF_QDEC->PSEL.A = g_ADigitalPinMap[pina];
58+
NRF_QDEC->PSEL.B = g_ADigitalPinMap[pinb];
5959

6060
if ( pinled >= 0 )
6161
{
6262
pinMode(pinled, INPUT);
6363

64-
NRF_QDEC->PSEL.LED = pinled;
64+
NRF_QDEC->PSEL.LED = g_ADigitalPinMap[pinled];
6565
}
6666

6767
// Disable debounce by default

0 commit comments

Comments
 (0)