diff --git a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PeripheralAliases.h b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PeripheralAliases.h deleted file mode 100644 index 0fdf2267e3..0000000000 --- a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PeripheralAliases.h +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2015 Maxim Integrated Products, Inc., All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL MAXIM INTEGRATED BE LIABLE FOR ANY CLAIM, DAMAGES - * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of Maxim Integrated - * Products, Inc. shall not be used except as stated in the Maxim Integrated - * Products, Inc. Branding Policy. - * - * The mere transfer of this software does not imply any licenses - * of trade secrets, proprietary technology, copyrights, patents, - * trademarks, maskwork rights, or any other form of intellectual - * property whatsoever. Maxim Integrated Products, Inc. retains all - * ownership rights. - ******************************************************************************* - */ - -#ifndef _PERIPHERAL_ALIASES_H -#define _PERIPHERAL_ALIASES_H - -#define STDIO_UART UART_1 -#define STDIO_UART_TX USBTX -#define STDIO_UART_RX USBRX - -#endif /* _PERIPHERAL_ALIASES_H */ diff --git a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PeripheralNames.h b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PeripheralNames.h similarity index 97% rename from libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PeripheralNames.h rename to libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PeripheralNames.h index 5000bc6451..150331bae2 100644 --- a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PeripheralNames.h +++ b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PeripheralNames.h @@ -42,7 +42,8 @@ extern "C" { typedef enum { UART_0 = MXC_BASE_UART0, - UART_1 = MXC_BASE_UART1 + UART_1 = MXC_BASE_UART1, + STDIO_UART = UART_1 } UARTName; typedef enum { @@ -78,8 +79,6 @@ typedef enum { DAC3 = MXC_BASE_DAC3, } DACName; -#include "PeripheralAliases.h" - #ifdef __cplusplus } #endif diff --git a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinAliases.h b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinAliases.h deleted file mode 100644 index 95ebfa14d4..0000000000 --- a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinAliases.h +++ /dev/null @@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2015 Maxim Integrated Products, Inc., All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL MAXIM INTEGRATED BE LIABLE FOR ANY CLAIM, DAMAGES - * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of Maxim Integrated - * Products, Inc. shall not be used except as stated in the Maxim Integrated - * Products, Inc. Branding Policy. - * - * The mere transfer of this software does not imply any licenses - * of trade secrets, proprietary technology, copyrights, patents, - * trademarks, maskwork rights, or any other form of intellectual - * property whatsoever. Maxim Integrated Products, Inc. retains all - * ownership rights. - ******************************************************************************* - */ - -#ifndef _PIN_ALIASES_H -#define _PIN_ALIASES_H - -#define LED_RED P1_7 -#define LED_GREEN P1_6 -#define LED_BLUE P1_4 - -// mbed original LED naming -#define LED1 LED_RED -#define LED2 LED_GREEN -#define LED3 LED_BLUE -#define LED4 LED_BLUE - -#define LED_OFF 1 -#define LED_ON !LED_OFF - -// Push button -#define SW1 P1_5 - -// USB Pins -#define USBTX P1_3 -#define USBRX P1_2 - -#define I2C_SCL P0_5 -#define I2C_SDA P0_4 - -#define HCI_SCK P2_0 -#define HCI_MOSI P2_1 -#define HCI_MISO P2_2 -#define HCI_CSN P2_3 -#define HCI_IRQ P2_4 -#define HCI_RST P2_5 - -#define TP1 P1_1 -#define TP2 P1_0 -#define TP3 P0_1 -#define TP4 P0_0 -#define TP5 P0_5 -#define TP6 P0_4 - -#endif /* _PIN_ALIASES_H */ diff --git a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PinNames.h b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h similarity index 86% rename from libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PinNames.h rename to libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h index b172fc608b..5dab3cc304 100644 --- a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PinNames.h +++ b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h @@ -115,7 +115,45 @@ typedef enum { AOUT_BO = (0xF << PORT_SHIFT) | 1, AOUT_CO = (0xF << PORT_SHIFT) | 2, AOUT_DO = (0xF << PORT_SHIFT) | 3, - + + LED_RED = P1_7, + LED_GREEN = P1_6, + LED_BLUE = P1_4, + + // mbed original LED naming + LED1 = LED_RED, + LED2 = LED_GREEN, + LED3 = LED_BLUE, + LED4 = LED_BLUE, + + // Push button + SW1 = P1_5, + + // UART Pins + USBTX = P1_3, + USBRX = P1_2, + STDIO_UART_TX = USBTX, + STDIO_UART_RX = USBRX, + + I2C_SCL = P0_5, + I2C_SDA = P0_4, + + // BTLE Radio HCI + HCI_SCK = P2_0, + HCI_MOSI = P2_1, + HCI_MISO = P2_2, + HCI_CSN = P2_3, + HCI_IRQ = P2_4, + HCI_RST = P2_5, + + // Test points + TP1 = P1_1, + TP2 = P1_0, + TP3 = P0_1, + TP4 = P0_0, + TP5 = P0_5, + TP6 = P0_4, + // Not connected NC = (int)0xFFFFFFFF } PinName; @@ -127,7 +165,10 @@ typedef enum { PullDefault = PullUp } PinMode; -#include "PinAliases.h" +typedef enum { + LED_ON = 0, + LED_OFF = 1 +} LedStates; #ifdef __cplusplus }