Skip to content

Commit 75cd4f0

Browse files
committed
Merge pull request #1022 from jeremybrodt/pinnames
MAXWSNENV - Removed pin alias macros
2 parents 158cbeb + 66c1945 commit 75cd4f0

File tree

4 files changed

+45
-120
lines changed

4 files changed

+45
-120
lines changed

libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PeripheralAliases.h

Lines changed: 0 additions & 41 deletions
This file was deleted.

libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PeripheralNames.h renamed to libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PeripheralNames.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ extern "C" {
4242

4343
typedef enum {
4444
UART_0 = MXC_BASE_UART0,
45-
UART_1 = MXC_BASE_UART1
45+
UART_1 = MXC_BASE_UART1,
46+
STDIO_UART = UART_1
4647
} UARTName;
4748

4849
typedef enum {
@@ -78,8 +79,6 @@ typedef enum {
7879
DAC3 = MXC_BASE_DAC3,
7980
} DACName;
8081

81-
#include "PeripheralAliases.h"
82-
8382
#ifdef __cplusplus
8483
}
8584
#endif

libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinAliases.h

Lines changed: 0 additions & 74 deletions
This file was deleted.

libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PinNames.h renamed to libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,45 @@ typedef enum {
115115
AOUT_BO = (0xF << PORT_SHIFT) | 1,
116116
AOUT_CO = (0xF << PORT_SHIFT) | 2,
117117
AOUT_DO = (0xF << PORT_SHIFT) | 3,
118-
118+
119+
LED_RED = P1_7,
120+
LED_GREEN = P1_6,
121+
LED_BLUE = P1_4,
122+
123+
// mbed original LED naming
124+
LED1 = LED_RED,
125+
LED2 = LED_GREEN,
126+
LED3 = LED_BLUE,
127+
LED4 = LED_BLUE,
128+
129+
// Push button
130+
SW1 = P1_5,
131+
132+
// UART Pins
133+
USBTX = P1_3,
134+
USBRX = P1_2,
135+
STDIO_UART_TX = USBTX,
136+
STDIO_UART_RX = USBRX,
137+
138+
I2C_SCL = P0_5,
139+
I2C_SDA = P0_4,
140+
141+
// BTLE Radio HCI
142+
HCI_SCK = P2_0,
143+
HCI_MOSI = P2_1,
144+
HCI_MISO = P2_2,
145+
HCI_CSN = P2_3,
146+
HCI_IRQ = P2_4,
147+
HCI_RST = P2_5,
148+
149+
// Test points
150+
TP1 = P1_1,
151+
TP2 = P1_0,
152+
TP3 = P0_1,
153+
TP4 = P0_0,
154+
TP5 = P0_5,
155+
TP6 = P0_4,
156+
119157
// Not connected
120158
NC = (int)0xFFFFFFFF
121159
} PinName;
@@ -127,7 +165,10 @@ typedef enum {
127165
PullDefault = PullUp
128166
} PinMode;
129167

130-
#include "PinAliases.h"
168+
typedef enum {
169+
LED_ON = 0,
170+
LED_OFF = 1
171+
} LedStates;
131172

132173
#ifdef __cplusplus
133174
}

0 commit comments

Comments
 (0)