From 079b7cd6970d631fefe5520119e94ace85aee9cf Mon Sep 17 00:00:00 2001 From: akhilpanayam Date: Fri, 7 Aug 2015 17:37:53 +0530 Subject: [PATCH] * updated mbed SDK tests for SAMR21G18A --- libraries/tests/mbed/bus/main.cpp | 8 ++++++++ libraries/tests/mbed/digitalin_digitalout/main.cpp | 4 ++++ libraries/tests/mbed/digitalinout/main.cpp | 4 ++++ libraries/tests/mbed/echo_flow_control/main.cpp | 8 ++++++++ libraries/tests/mbed/interruptin/main.cpp | 4 ++++ libraries/tests/mbed/interruptin_2/main.cpp | 14 ++++++++++++++ libraries/tests/mbed/pin_toggling/main.cpp | 4 ++++ libraries/tests/mbed/portinout/main.cpp | 9 +++++++++ libraries/tests/mbed/portout/main.cpp | 6 ++++++ libraries/tests/mbed/portout_portin/main.cpp | 9 +++++++++ libraries/tests/mbed/serial_interrupt_2/main.cpp | 2 ++ libraries/tests/mbed/vtor_reloc/main.cpp | 7 +++++++ 12 files changed, 79 insertions(+) diff --git a/libraries/tests/mbed/bus/main.cpp b/libraries/tests/mbed/bus/main.cpp index 4ab61ac1f4..ebe2b024d8 100644 --- a/libraries/tests/mbed/bus/main.cpp +++ b/libraries/tests/mbed/bus/main.cpp @@ -1,8 +1,16 @@ #include "mbed.h" #include "test_env.h" +#if defined(TARGET_SAMR21G18A) +BusOut bus1(PA06, PA07, PA13, PA28, PA18, PA19, PA22, PA23, PA16, PA17, PA05, PA04); +BusOut bus2(PB03, PB22, PB02, PB23); + +#else BusOut bus1(D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, D13, D14, D15); BusOut bus2(A5, A4, A3, A2, A1, A0); + +#endif + int i; int main() diff --git a/libraries/tests/mbed/digitalin_digitalout/main.cpp b/libraries/tests/mbed/digitalin_digitalout/main.cpp index 31082c2319..8750c15188 100644 --- a/libraries/tests/mbed/digitalin_digitalout/main.cpp +++ b/libraries/tests/mbed/digitalin_digitalout/main.cpp @@ -58,6 +58,10 @@ DigitalIn in(PC1); DigitalOut out(PE10); DigitalIn in(PC1); +#elif defined(TARGET_SAMR21G18A) +DigitalOut out(PA06); +DigitalIn in(PA07); + #else DigitalOut out(p5); DigitalIn in(p25); diff --git a/libraries/tests/mbed/digitalinout/main.cpp b/libraries/tests/mbed/digitalinout/main.cpp index 3137a11f41..02a886f843 100644 --- a/libraries/tests/mbed/digitalinout/main.cpp +++ b/libraries/tests/mbed/digitalinout/main.cpp @@ -58,6 +58,10 @@ DigitalInOut d2(PC1); DigitalInOut d1(PE10); DigitalInOut d2(PC1); +#elif defined(TARGET_SAMR21G18A) +DigitalInOut d1(PA06); +DigitalInOut d2(PA07); + #else DigitalInOut d1(p5); DigitalInOut d2(p25); diff --git a/libraries/tests/mbed/echo_flow_control/main.cpp b/libraries/tests/mbed/echo_flow_control/main.cpp index 327bca62d4..3427d0348d 100644 --- a/libraries/tests/mbed/echo_flow_control/main.cpp +++ b/libraries/tests/mbed/echo_flow_control/main.cpp @@ -6,6 +6,14 @@ #define FLOW_CONTROL_RTS p30 #define FLOW_CONTROL_CTS p29 #define RTS_CHECK_PIN p8 + +#elif defined(TARGET_SAMR21G18A) +#define UART_TX PA04 +#define UART_RX PA05 +#define FLOW_CONTROL_RTS PA06 +#define FLOW_CONTROL_CTS PA07 +#define RTS_CHECK_PIN PB03 + #else #error This test is not supported on this target #endif diff --git a/libraries/tests/mbed/interruptin/main.cpp b/libraries/tests/mbed/interruptin/main.cpp index 14b287d8cb..5e68ec5328 100644 --- a/libraries/tests/mbed/interruptin/main.cpp +++ b/libraries/tests/mbed/interruptin/main.cpp @@ -87,6 +87,10 @@ void in_handler() { #define PIN_OUT PE10 #define PIN_IN PC1 +#elif defined(TARGET_SAMR21G18A) +#define PIN_OUT PA06 +#define PIN_IN PA07 + #else #define PIN_IN (p5) #define PIN_OUT (p25) diff --git a/libraries/tests/mbed/interruptin_2/main.cpp b/libraries/tests/mbed/interruptin_2/main.cpp index 0f12f6e976..cad9091b0e 100644 --- a/libraries/tests/mbed/interruptin_2/main.cpp +++ b/libraries/tests/mbed/interruptin_2/main.cpp @@ -28,6 +28,20 @@ InterruptIn button9(p15); DigitalOut led(LED1); DigitalOut flash(LED2); +#elif defined(TARGET_SAMR21G18A) +InterruptIn button (PA28); /*SW0*/ +InterruptIn button1(PA06); +InterruptIn button2(PA07); +InterruptIn button3(PB03); +InterruptIn button4(PA16); +InterruptIn button5(PA17); +InterruptIn button6(PA05); +InterruptIn button7(PA04); +InterruptIn button8(PA14); +InterruptIn button9(PA15); +DigitalOut led(LED1); +DigitalOut flash(PA22); /*1 LED Available*/ + #else InterruptIn button(p30); InterruptIn button1(p29); diff --git a/libraries/tests/mbed/pin_toggling/main.cpp b/libraries/tests/mbed/pin_toggling/main.cpp index 5eb809a2ff..d49d45622c 100644 --- a/libraries/tests/mbed/pin_toggling/main.cpp +++ b/libraries/tests/mbed/pin_toggling/main.cpp @@ -1,6 +1,10 @@ #include "mbed.h" +#if defined(TARGET_SAMR21G18A) +DigitalOut out(PA06); +#else DigitalOut out(p5); +#endif int main() { while (true) { diff --git a/libraries/tests/mbed/portinout/main.cpp b/libraries/tests/mbed/portinout/main.cpp index dbd9dcc7c0..6710e0ffd3 100644 --- a/libraries/tests/mbed/portinout/main.cpp +++ b/libraries/tests/mbed/portinout/main.cpp @@ -129,6 +129,15 @@ #define P2_2 (1 << 2) // PC2 #define PORT_2 PortC +#elif defined(TARGET_SAMR21G18A) +#define P1_1 (1 << 6) /*PA06*/ +#define P1_2 (1 << 7) /*PA07*/ +#define PORT_1 PortA + +#define P2_1 (1 << 2) /*PA02*/ +#define P2_2 (1 << 3) /*PA03*/ +#define PORT_2 PortB + #endif #define MASK_1 (P1_1 | P1_2) diff --git a/libraries/tests/mbed/portout/main.cpp b/libraries/tests/mbed/portout/main.cpp index c875dd0bbb..bc1977f782 100644 --- a/libraries/tests/mbed/portout/main.cpp +++ b/libraries/tests/mbed/portout/main.cpp @@ -24,6 +24,12 @@ # define LED2 (1 << 6) // P7.6 # define LED3 (1 << 4) // P7.4 # define LED4 0 +# elif defined(TARGET_SAMR21G18A) +# define LED_PORT PortA +# define LED1 (1 << 19) /*PA19*/ +# define LED2 0 +# define LED3 0 +# define LED4 0 # endif #define LED_MASK (LED1|LED2|LED3|LED4) diff --git a/libraries/tests/mbed/portout_portin/main.cpp b/libraries/tests/mbed/portout_portin/main.cpp index aa44bb09ae..90ab90c93c 100644 --- a/libraries/tests/mbed/portout_portin/main.cpp +++ b/libraries/tests/mbed/portout_portin/main.cpp @@ -129,6 +129,15 @@ #define P2_2 (1 << 2) // PC2 #define PORT_2 PortC +#elif defined(TARGET_SAMR21G18A) +#define P1_1 (1 << 6) /*PA06*/ +#define P1_2 (1 << 7) /*PA07*/ +#define PORT_1 PortA + +#define P2_1 (1 << 2) /*PA02*/ +#define P2_2 (1 << 3) /*PA03*/ +#define PORT_2 PortB + #endif #define MASK_1 (P1_1 | P1_2) diff --git a/libraries/tests/mbed/serial_interrupt_2/main.cpp b/libraries/tests/mbed/serial_interrupt_2/main.cpp index 8833c36da7..e74b9f0fe3 100644 --- a/libraries/tests/mbed/serial_interrupt_2/main.cpp +++ b/libraries/tests/mbed/serial_interrupt_2/main.cpp @@ -6,6 +6,8 @@ Serial pc(USBTX, USBRX); Serial uart(P4_22, P4_23); #elif defined(TARGET_MAXWSNENV) Serial uart(P0_1, P0_0); +#elif defined(TARGET_SAMR21G18A) +Serial uart(PA16, PA17); #else Serial uart(p9, p10); #endif diff --git a/libraries/tests/mbed/vtor_reloc/main.cpp b/libraries/tests/mbed/vtor_reloc/main.cpp index c7e654e8c0..e97de9d2b6 100644 --- a/libraries/tests/mbed/vtor_reloc/main.cpp +++ b/libraries/tests/mbed/vtor_reloc/main.cpp @@ -6,9 +6,16 @@ #include "cmsis_nvic.h" #include +#if defined(TARGET_SAMR21G18A) +#define PIN_IN (PA06) +#define PIN_OUT (PA07) +#define NUM_VECTORS (16+28) + +#else #define PIN_IN (p5) #define PIN_OUT (p25) #define NUM_VECTORS (16+33) +#endif DigitalOut out(PIN_OUT); DigitalOut myled(LED1);