Skip to content

Commit e99de29

Browse files
committed
Remove pins that aren't connected in the Raytac Dongle from the pin map.
1 parent 8483346 commit e99de29

File tree

2 files changed

+12
-139
lines changed

2 files changed

+12
-139
lines changed

variants/MDBT50Q_RX/variant.cpp

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -26,73 +26,9 @@
2626
const uint32_t g_ADigitalPinMap[] =
2727
{
2828
// D0 .. D13
29-
25, // D0 is P0.25 (UART TX)
30-
24, // D1 is P0.24 (UART RX
31-
10, // D2 is P0.10 (NFC2)
3229
45, // D3 is P1.13 (LED1)
33-
42, // D4 is P1.11 (LED2)
34-
40, // D5 is P1.08
35-
7, // D6 is P0.07
30+
43, // D4 is P1.11 (LED2)
3631
15, // D7 is P0.15 (Button)
37-
16, // D8 is P0.16 (NeoPixel)
38-
26, // D9 is P0.26
39-
27, // D10 is P0.27
40-
6, // D11 is P0.06
41-
8, // D12 is P0.08
42-
41, // D13 is P1.09
43-
44-
// D14 .. D21 (aka A0 .. A7)
45-
4, // D14 is P0.04 (A0)
46-
5, // D15 is P0.05 (A1)
47-
30, // D16 is P0.30 (A2)
48-
28, // D17 is P0.28 (A3)
49-
2, // D18 is P0.02 (A4)
50-
3, // D19 is P0.03 (A5)
51-
29, // D20 is P0.29 (A6, Battery)
52-
31, // D21 is P0.31 (A7, ARef)
53-
54-
// D22 .. D23 (aka I2C pins)
55-
12, // D22 is P0.12 (SDA)
56-
11, // D23 is P0.11 (SCL)
57-
58-
// D24 .. D26 (aka SPI pins)
59-
15, // D24 is P0.15 (SPI MISO)
60-
13, // D25 is P0.13 (SPI MOSI)
61-
14, // D26 is P0.14 (SPI SCK )
62-
63-
// QSPI pins (not exposed via any header / test point)
64-
19, // D27 is P0.19 (QSPI CLK)
65-
20, // D28 is P0.20 (QSPI CS)
66-
17, // D29 is P0.17 (QSPI Data 0)
67-
22, // D30 is P0.22 (QSPI Data 1)
68-
23, // D31 is P0.23 (QSPI Data 2)
69-
21, // D32 is P0.21 (QSPI Data 3)
70-
71-
// The remaining NFC pin
72-
9, // D33 is P0.09 (NFC1, exposed only via test point on bottom of board)
73-
74-
// Thus, there are 34 defined pins
75-
76-
// The remaining pins are not usable:
77-
//
78-
//
79-
// The following pins were never listed as they were considered unusable
80-
// 0, // P0.00 is XL1 (attached to 32.768kHz crystal)
81-
// 1, // P0.01 is XL2 (attached to 32.768kHz crystal)
82-
// 18, // P0.18 is RESET (attached to switch)
83-
// 32, // P1.00 is SWO (attached to debug header)
84-
//
85-
// The remaining pins are not connected (per schematic)
86-
// 33, // P1.01 is not connected per schematic
87-
// 35, // P1.03 is not connected per schematic
88-
// 36, // P1.04 is not connected per schematic
89-
// 37, // P1.05 is not connected per schematic
90-
// 38, // P1.06 is not connected per schematic
91-
// 39, // P1.07 is not connected per schematic
92-
// 43, // P1.11 is not connected per schematic
93-
// 44, // P1.12 is not connected per schematic
94-
// 45, // P1.13 is not connected per schematic
95-
// 46, // P1.14 is not connected per schematic
9632
};
9733

9834
void initVariant()

variants/MDBT50Q_RX/variant.h

Lines changed: 11 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@ extern "C"
3737
#endif // __cplusplus
3838

3939
// Number of pins defined in PinDescription array
40-
#define PINS_COUNT (34)
41-
#define NUM_DIGITAL_PINS (34)
42-
#define NUM_ANALOG_INPUTS (6) // A6 is used for battery, A7 is analog reference
40+
#define PINS_COUNT (3)
41+
#define NUM_DIGITAL_PINS (3)
42+
#define NUM_ANALOG_INPUTS (0) // A6 is used for battery, A7 is analog reference
4343
#define NUM_ANALOG_OUTPUTS (0)
4444

4545
// LEDs
46-
#define PIN_LED1 (3)
47-
#define PIN_LED2 (4)
48-
#define PIN_NEOPIXEL (8)
46+
#define PIN_LED1 (0)
47+
#define PIN_LED2 (1)
4948

5049
#define LED_BUILTIN PIN_LED1
5150
#define LED_CONN PIN_LED2
@@ -55,6 +54,8 @@ extern "C"
5554

5655
#define LED_STATE_ON 0 // State when LED is litted
5756

57+
#define PIN_DFU 2
58+
5859
// Buttons
5960
/*
6061
#define PIN_BUTTON1 (2)
@@ -63,78 +64,14 @@ extern "C"
6364
#define PIN_BUTTON4 (5)
6465
*/
6566

66-
/*
67-
* Analog pins
68-
*/
69-
#define PIN_A0 (14)
70-
#define PIN_A1 (15)
71-
#define PIN_A2 (16)
72-
#define PIN_A3 (17)
73-
#define PIN_A4 (18)
74-
#define PIN_A5 (19)
75-
#define PIN_A6 (20)
76-
#define PIN_A7 (21)
77-
78-
static const uint8_t A0 = PIN_A0 ;
79-
static const uint8_t A1 = PIN_A1 ;
80-
static const uint8_t A2 = PIN_A2 ;
81-
static const uint8_t A3 = PIN_A3 ;
82-
static const uint8_t A4 = PIN_A4 ;
83-
static const uint8_t A5 = PIN_A5 ;
84-
static const uint8_t A6 = PIN_A6 ;
85-
static const uint8_t A7 = PIN_A7 ;
8667
#define ADC_RESOLUTION 14
8768

88-
// Other pins
89-
#define PIN_AREF PIN_A7
90-
#define PIN_VBAT PIN_A6
91-
#define PIN_NFC1 (33)
92-
#define PIN_NFC2 (2)
93-
94-
static const uint8_t AREF = PIN_AREF;
95-
96-
/*
97-
* Serial interfaces
98-
*/
69+
// Bad things happen if the serial pins aren't defined. Instead
70+
// define them with an invalid pin number
9971
// Serial
100-
#define PIN_SERIAL_RX (1)
101-
#define PIN_SERIAL_TX (0)
72+
#define PIN_SERIAL_RX (3)
73+
#define PIN_SERIAL_TX (3)
10274

103-
/*
104-
* SPI Interfaces
105-
*/
106-
#define SPI_INTERFACES_COUNT 1
107-
108-
#define PIN_SPI_MISO (24)
109-
#define PIN_SPI_MOSI (25)
110-
#define PIN_SPI_SCK (26)
111-
112-
static const uint8_t SS = (5);
113-
static const uint8_t MOSI = PIN_SPI_MOSI ;
114-
static const uint8_t MISO = PIN_SPI_MISO ;
115-
static const uint8_t SCK = PIN_SPI_SCK ;
116-
117-
/*
118-
* Wire Interfaces
119-
*/
120-
#define WIRE_INTERFACES_COUNT 1
121-
122-
#define PIN_WIRE_SDA (22)
123-
#define PIN_WIRE_SCL (23)
124-
125-
// QSPI Pins
126-
#define PIN_QSPI_SCK 27
127-
#define PIN_QSPI_CS 28
128-
#define PIN_QSPI_IO0 29
129-
#define PIN_QSPI_IO1 30
130-
#define PIN_QSPI_IO2 31
131-
#define PIN_QSPI_IO3 32
132-
133-
// On-board QSPI Flash
134-
#define EXTERNAL_FLASH_DEVICES GD25Q16C
135-
136-
#define USB_MSC_BLOCK_SIZE 512
137-
#define USB_MSC_BLOCK_COUNT ((2*1024*1024) / USB_MSC_BLOCK_SIZE)
13875

13976
#ifdef __cplusplus
14077
}

0 commit comments

Comments
 (0)