Skip to content
This repository has been archived by the owner on Jan 29, 2023. It is now read-only.

Commit

Permalink
Variant update for Adafruit nRF52 NINA_B302_UBLOX
Browse files Browse the repository at this point in the history
  • Loading branch information
@khoih-prog
khoih-prog authored Apr 16, 2021
1 parent 394a71c commit 0022894
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 234 deletions.
84 changes: 31 additions & 53 deletions Packages_Patches/adafruit/hardware/nrf52/0.19.0/variants/NINA_B302_ublox/variant.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,74 +27,53 @@

const uint32_t g_ADigitalPinMap[] =
{
// D0 .. D13
// D0 .. D13
29, // D0 is P0.29 (UART TX)
45, // D1 is P1.13 (UART RX
44, // D2 is P1.12 (NFC2)
31, // D3 is P0.31 (LED1)
13, // D4 is P0.13 (LED2)
11, // D5 is P0.11
9, // D6 is P0.09
9, // D6 is P0.09
10, // D7 is P0.10 (Button)
41, // D8 is P1.09 (NeoPixel)
41, // D8 is P1.09
12, // D9 is P0.12
14, // D10 is P0.14
15, // D11 is P0.15
32, // D12 is P1.00
7, // D13 is P0.07
7, // D13 is P0.07

// D14 .. D21 (aka A0 .. A7)
4, // D14 is P0.04 (A0)
// D14 .. D21 (aka A0 .. A5)
4, // D14 is P0.04 (A0)
30, // D15 is P0.30 (A1)
5, // D16 is P0.05 (A2)
2, // D17 is P0.02 (A3)
5, // D16 is P0.05 (A2)
2, // D17 is P0.02 (A3)
28, // D18 is P0.28 (A4)
3, // D19 is P0.03 (A5)
29, // D20 is P0.29 (A6, Battery) ????
31, // D21 is P0.31 (A7, ARef) ????

// D22 .. D23 (aka I2C pins)
16, // D22 is P0.16 (SDA)
24, // D23 is P0.24 (SCL)

// D24 .. D26 (aka SPI pins)
32, // D24 is P1.00 (SPI MISO)
15, // D25 is P0.15 (SPI MOSI)
7, // D26 is P0.07 (SPI SCK )
3, // D19 is P0.03 (A5)

// D20 .. D21 (aka I2C pins)
16, // D20 is P0.16 (SDA)
24, // D21 is P0.24 (SCL)

// QSPI pins (not exposed via any header / test point)
19, // D27 is P0.19 (QSPI CLK)
17, // D28 is P0.17 (QSPI CS)
20, // D29 is P0.20 (QSPI Data 0)
21, // D30 is P0.21 (QSPI Data 1)
22, // D31 is P0.22 (QSPI Data 2)
23, // D32 is P0.23 (QSPI Data 3)

// The remaining NFC pin
9, // D33 is P0.09 (NFC1, exposed only via test point on bottom of board)

// Thus, there are 34 defined pins

// The remaining pins are not usable:
//
//
// The following pins were never listed as they were considered unusable
// 0, // P0.00 is XL1 (attached to 32.768kHz crystal)
// 1, // P0.01 is XL2 (attached to 32.768kHz crystal)
// 18, // P0.18 is RESET (attached to switch)
// 32, // P1.00 is SWO (attached to debug header)
//
// The remaining pins are not connected (per schematic)
// 33, // P1.01 is not connected per schematic
// 35, // P1.03 is not connected per schematic
// 36, // P1.04 is not connected per schematic
// 37, // P1.05 is not connected per schematic
// 38, // P1.06 is not connected per schematic
// 39, // P1.07 is not connected per schematic
// 43, // P1.11 is not connected per schematic
// 44, // P1.12 is not connected per schematic
// 45, // P1.13 is not connected per schematic
// 46, // P1.14 is not connected per schematic
19, // D22 is P0.19 (QSPI CLK)
17, // D23 is P0.17 (QSPI CS)
20, // D24 is P0.20 (QSPI Data 0)
21, // D25 is P0.21 (QSPI Data 1)
22, // D26 is P0.22 (QSPI Data 2)
26, // D27 is P0.23 (QSPI Data 3)

40, // D28 is P1.08 - IO34
41, // D29 is P1.01 - IO35
44, // D30 is P1.02 - IO36
45, // D31 is P1.03 - IO37
42, // D32 is P1.10 - IO38
43, // D33 is P1.11 - IO39
47, // D34 is P1.15 - IO40
46, // D35 is P1.14 - IO41
26, // D36 is P0.26 - IO42
6, // D37 is P0.6 - IO43
27, // D38 is P0.27 - IO44
};

void initVariant()
Expand All @@ -106,4 +85,3 @@ void initVariant()
pinMode(PIN_LED2, OUTPUT);
ledOff(PIN_LED2);
}

40 changes: 15 additions & 25 deletions Packages_Patches/adafruit/hardware/nrf52/0.19.0/variants/NINA_B302_ublox/variant.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,15 @@
extern "C"
{
#endif // __cplusplus
// (XX) = TABLE INDEX
// Number of pins defined in PinDescription array
#define PINS_COUNT (34)
#define PINS_COUNT (40)
#define NUM_DIGITAL_PINS (34)
#define NUM_ANALOG_INPUTS (6) // A6 is used for battery, A7 is analog reference
#define NUM_ANALOG_INPUTS (6)
#define NUM_ANALOG_OUTPUTS (0)

// LEDs
#define PIN_LED1 (3)
#define PIN_LED2 (4)
#define PIN_NEOPIXEL (8)

#define LED_BUILTIN PIN_LED1
#define LED_CONN PIN_LED2
Expand All @@ -72,8 +70,6 @@ extern "C"
#define PIN_A3 (17)
#define PIN_A4 (18)
#define PIN_A5 (19)
#define PIN_A6 (20)
#define PIN_A7 (21)

#define D0 (0)
#define D1 (1)
Expand All @@ -96,18 +92,12 @@ static const uint8_t A2 = PIN_A2 ;
static const uint8_t A3 = PIN_A3 ;
static const uint8_t A4 = PIN_A4 ;
static const uint8_t A5 = PIN_A5 ;
static const uint8_t A6 = PIN_A6 ;
static const uint8_t A7 = PIN_A7 ;

#define ADC_RESOLUTION 14

// Other pins
#define PIN_AREF PIN_A7
#define PIN_VBAT PIN_A6
#define PIN_NFC1 (33)
#define PIN_NFC1 (31)
#define PIN_NFC2 (2)

static const uint8_t AREF = PIN_AREF;

/*
* Serial interfaces
*/
Expand All @@ -119,9 +109,9 @@ static const uint8_t AREF = PIN_AREF;
*/
#define SPI_INTERFACES_COUNT 1

#define PIN_SPI_MISO (24) //24 original
#define PIN_SPI_MOSI (25) //25 original
#define PIN_SPI_SCK (26) //26 original
#define PIN_SPI_MISO (22) //24 original
#define PIN_SPI_MOSI (23) //25 original
#define PIN_SPI_SCK (24) //26 original

static const uint8_t SS = (13);
static const uint8_t MOSI = PIN_SPI_MOSI;
Expand All @@ -133,16 +123,16 @@ static const uint8_t SCK = PIN_SPI_SCK;
*/
#define WIRE_INTERFACES_COUNT 1

#define PIN_WIRE_SDA (22)
#define PIN_WIRE_SCL (23)
#define PIN_WIRE_SDA (20)
#define PIN_WIRE_SCL (21)

// QSPI Pins
#define PIN_QSPI_SCK 27
#define PIN_QSPI_CS 28
#define PIN_QSPI_IO0 29
#define PIN_QSPI_IO1 30
#define PIN_QSPI_IO2 31
#define PIN_QSPI_IO3 32
#define PIN_QSPI_SCK 22
#define PIN_QSPI_CS 23
#define PIN_QSPI_IO0 24
#define PIN_QSPI_IO1 25
#define PIN_QSPI_IO2 26
#define PIN_QSPI_IO3 27

// On-board QSPI Flash
#define EXTERNAL_FLASH_DEVICES GD25Q16C
Expand Down
84 changes: 31 additions & 53 deletions Packages_Patches/adafruit/hardware/nrf52/0.20.1/variants/NINA_B302_ublox/variant.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,74 +27,53 @@

const uint32_t g_ADigitalPinMap[] =
{
// D0 .. D13
// D0 .. D13
29, // D0 is P0.29 (UART TX)
45, // D1 is P1.13 (UART RX
44, // D2 is P1.12 (NFC2)
31, // D3 is P0.31 (LED1)
13, // D4 is P0.13 (LED2)
11, // D5 is P0.11
9, // D6 is P0.09
9, // D6 is P0.09
10, // D7 is P0.10 (Button)
41, // D8 is P1.09 (NeoPixel)
41, // D8 is P1.09
12, // D9 is P0.12
14, // D10 is P0.14
15, // D11 is P0.15
32, // D12 is P1.00
7, // D13 is P0.07
7, // D13 is P0.07

// D14 .. D21 (aka A0 .. A7)
4, // D14 is P0.04 (A0)
// D14 .. D21 (aka A0 .. A5)
4, // D14 is P0.04 (A0)
30, // D15 is P0.30 (A1)
5, // D16 is P0.05 (A2)
2, // D17 is P0.02 (A3)
5, // D16 is P0.05 (A2)
2, // D17 is P0.02 (A3)
28, // D18 is P0.28 (A4)
3, // D19 is P0.03 (A5)
29, // D20 is P0.29 (A6, Battery) ????
31, // D21 is P0.31 (A7, ARef) ????

// D22 .. D23 (aka I2C pins)
16, // D22 is P0.16 (SDA)
24, // D23 is P0.24 (SCL)

// D24 .. D26 (aka SPI pins)
32, // D24 is P1.00 (SPI MISO)
15, // D25 is P0.15 (SPI MOSI)
7, // D26 is P0.07 (SPI SCK )
3, // D19 is P0.03 (A5)

// D20 .. D21 (aka I2C pins)
16, // D20 is P0.16 (SDA)
24, // D21 is P0.24 (SCL)

// QSPI pins (not exposed via any header / test point)
19, // D27 is P0.19 (QSPI CLK)
17, // D28 is P0.17 (QSPI CS)
20, // D29 is P0.20 (QSPI Data 0)
21, // D30 is P0.21 (QSPI Data 1)
22, // D31 is P0.22 (QSPI Data 2)
23, // D32 is P0.23 (QSPI Data 3)

// The remaining NFC pin
9, // D33 is P0.09 (NFC1, exposed only via test point on bottom of board)

// Thus, there are 34 defined pins

// The remaining pins are not usable:
//
//
// The following pins were never listed as they were considered unusable
// 0, // P0.00 is XL1 (attached to 32.768kHz crystal)
// 1, // P0.01 is XL2 (attached to 32.768kHz crystal)
// 18, // P0.18 is RESET (attached to switch)
// 32, // P1.00 is SWO (attached to debug header)
//
// The remaining pins are not connected (per schematic)
// 33, // P1.01 is not connected per schematic
// 35, // P1.03 is not connected per schematic
// 36, // P1.04 is not connected per schematic
// 37, // P1.05 is not connected per schematic
// 38, // P1.06 is not connected per schematic
// 39, // P1.07 is not connected per schematic
// 43, // P1.11 is not connected per schematic
// 44, // P1.12 is not connected per schematic
// 45, // P1.13 is not connected per schematic
// 46, // P1.14 is not connected per schematic
19, // D22 is P0.19 (QSPI CLK)
17, // D23 is P0.17 (QSPI CS)
20, // D24 is P0.20 (QSPI Data 0)
21, // D25 is P0.21 (QSPI Data 1)
22, // D26 is P0.22 (QSPI Data 2)
26, // D27 is P0.23 (QSPI Data 3)

40, // D28 is P1.08 - IO34
41, // D29 is P1.01 - IO35
44, // D30 is P1.02 - IO36
45, // D31 is P1.03 - IO37
42, // D32 is P1.10 - IO38
43, // D33 is P1.11 - IO39
47, // D34 is P1.15 - IO40
46, // D35 is P1.14 - IO41
26, // D36 is P0.26 - IO42
6, // D37 is P0.6 - IO43
27, // D38 is P0.27 - IO44
};

void initVariant()
Expand All @@ -106,4 +85,3 @@ void initVariant()
pinMode(PIN_LED2, OUTPUT);
ledOff(PIN_LED2);
}

40 changes: 15 additions & 25 deletions Packages_Patches/adafruit/hardware/nrf52/0.20.1/variants/NINA_B302_ublox/variant.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,15 @@
extern "C"
{
#endif // __cplusplus
// (XX) = TABLE INDEX
// Number of pins defined in PinDescription array
#define PINS_COUNT (34)
#define PINS_COUNT (40)
#define NUM_DIGITAL_PINS (34)
#define NUM_ANALOG_INPUTS (6) // A6 is used for battery, A7 is analog reference
#define NUM_ANALOG_INPUTS (6)
#define NUM_ANALOG_OUTPUTS (0)

// LEDs
#define PIN_LED1 (3)
#define PIN_LED2 (4)
#define PIN_NEOPIXEL (8)

#define LED_BUILTIN PIN_LED1
#define LED_CONN PIN_LED2
Expand All @@ -72,8 +70,6 @@ extern "C"
#define PIN_A3 (17)
#define PIN_A4 (18)
#define PIN_A5 (19)
#define PIN_A6 (20)
#define PIN_A7 (21)

#define D0 (0)
#define D1 (1)
Expand All @@ -96,18 +92,12 @@ static const uint8_t A2 = PIN_A2 ;
static const uint8_t A3 = PIN_A3 ;
static const uint8_t A4 = PIN_A4 ;
static const uint8_t A5 = PIN_A5 ;
static const uint8_t A6 = PIN_A6 ;
static const uint8_t A7 = PIN_A7 ;

#define ADC_RESOLUTION 14

// Other pins
#define PIN_AREF PIN_A7
#define PIN_VBAT PIN_A6
#define PIN_NFC1 (33)
#define PIN_NFC1 (31)
#define PIN_NFC2 (2)

static const uint8_t AREF = PIN_AREF;

/*
* Serial interfaces
*/
Expand All @@ -119,9 +109,9 @@ static const uint8_t AREF = PIN_AREF;
*/
#define SPI_INTERFACES_COUNT 1

#define PIN_SPI_MISO (24) //24 original
#define PIN_SPI_MOSI (25) //25 original
#define PIN_SPI_SCK (26) //26 original
#define PIN_SPI_MISO (22) //24 original
#define PIN_SPI_MOSI (23) //25 original
#define PIN_SPI_SCK (24) //26 original

static const uint8_t SS = (13);
static const uint8_t MOSI = PIN_SPI_MOSI;
Expand All @@ -133,16 +123,16 @@ static const uint8_t SCK = PIN_SPI_SCK;
*/
#define WIRE_INTERFACES_COUNT 1

#define PIN_WIRE_SDA (22)
#define PIN_WIRE_SCL (23)
#define PIN_WIRE_SDA (20)
#define PIN_WIRE_SCL (21)

// QSPI Pins
#define PIN_QSPI_SCK 27
#define PIN_QSPI_CS 28
#define PIN_QSPI_IO0 29
#define PIN_QSPI_IO1 30
#define PIN_QSPI_IO2 31
#define PIN_QSPI_IO3 32
#define PIN_QSPI_SCK 22
#define PIN_QSPI_CS 23
#define PIN_QSPI_IO0 24
#define PIN_QSPI_IO1 25
#define PIN_QSPI_IO2 26
#define PIN_QSPI_IO3 27

// On-board QSPI Flash
#define EXTERNAL_FLASH_DEVICES GD25Q16C
Expand Down
Loading

0 comments on commit 0022894

Please sign in to comment.