From 3e9c9ce8dbc99a4d2d570dd1319b44818d9b7160 Mon Sep 17 00:00:00 2001 From: Alex Taradov Date: Sun, 7 May 2017 23:18:32 -0700 Subject: [PATCH] Added support for SWD USB STD board --- platform/samd11/dap_config.h | 17 ++++++++++++++--- platform/samd11/main.c | 20 ++++++++++++++++---- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/platform/samd11/dap_config.h b/platform/samd11/dap_config.h index dba80da..7589263 100644 --- a/platform/samd11/dap_config.h +++ b/platform/samd11/dap_config.h @@ -34,9 +34,20 @@ #include "hal_gpio.h" /*- Definitions -------------------------------------------------------------*/ -HAL_GPIO_PIN(SWCLK_TCK, A, 8) -HAL_GPIO_PIN(SWDIO_TMS, A, 5) -HAL_GPIO_PIN(nRESET, A, 9) +//#define BOARD_SWD_USB_MINI +#define BOARD_SWD_USB_STD + +#if defined(BOARD_SWD_USB_MINI) + HAL_GPIO_PIN(SWCLK_TCK, A, 8) + HAL_GPIO_PIN(SWDIO_TMS, A, 5) + HAL_GPIO_PIN(nRESET, A, 9) +#elif defined(BOARD_SWD_USB_STD) + HAL_GPIO_PIN(SWCLK_TCK, A, 14) + HAL_GPIO_PIN(SWDIO_TMS, A, 15) + HAL_GPIO_PIN(SWO_DTO, A, 9) + HAL_GPIO_PIN(TDI, A, 8) + HAL_GPIO_PIN(nRESET, A, 5) +#endif #define DAP_CONFIG_ENABLE_SWD //#define DAP_CONFIG_ENABLE_JTAG diff --git a/platform/samd11/main.c b/platform/samd11/main.c index 71cb44f..47e0d42 100644 --- a/platform/samd11/main.c +++ b/platform/samd11/main.c @@ -40,14 +40,26 @@ #include "dap_config.h" /*- Definitions -------------------------------------------------------------*/ -HAL_GPIO_PIN(LED, A, 14) +#if defined(BOARD_SWD_USB_MINI) + HAL_GPIO_PIN(LED, A, 14); +#elif defined(BOARD_SWD_USB_STD) + HAL_GPIO_PIN(LED, A, 4); +#else + #error Undefined board +#endif #define APP_EP_SEND 1 #define APP_EP_RECV 2 -#define APP_PWM_PER 0xffff -#define APP_PWM_DIM 0xf000 -#define APP_PWM_BRIGHT 0 +#if defined(BOARD_SWD_USB_MINI) + #define APP_PWM_PER 0xffff + #define APP_PWM_DIM 0xf000 + #define APP_PWM_BRIGHT 0 +#elif defined(BOARD_SWD_USB_STD) + #define APP_PWM_PER 0xffff + #define APP_PWM_DIM 0x1000 + #define APP_PWM_BRIGHT 0xf000 +#endif /*- Variables ---------------------------------------------------------------*/ alignas(4) uint8_t app_request_buffer[DAP_CONFIG_PACKET_SIZE];