ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[STD-PIN] Updates after review

pull/14381/head
jeromecoutant 2020-12-07 13:14:11 +01:00 committed by George Psimenos
parent d514b78bb3
commit 500ddf596a
3 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hal/include/hal/ArduinoUnoAliases.h
View File

@ -51,6 +51,8 @@
#ifdef TARGET_FF_ARDUINO #ifdef TARGET_FF_ARDUINO
#warning ARDUINO form factor should not be used any more => use ARDUINO_UNO
#define ARDUINO_UNO_A0 A0 #define ARDUINO_UNO_A0 A0
#define ARDUINO_UNO_A1 A1 #define ARDUINO_UNO_A1 A1
#define ARDUINO_UNO_A2 A2 #define ARDUINO_UNO_A2 A2

85
hal/tests/TESTS/pin_names/arduino_uno/main.cpp
View File

@ -20,7 +20,10 @@
#include "greentea-client/test_env.h" #include "greentea-client/test_env.h"
#include "mbed.h" #include "mbed.h"
// #if !TARGET_FF_ARDUINO_UNO /*
Requirements specified in docs/design-documents/hal/0005-pin-names-Arduino-Uno-standard.md
*/
#if !(defined (TARGET_FF_ARDUINO) || (TARGET_FF_ARDUINO_UNO)) #if !(defined (TARGET_FF_ARDUINO) || (TARGET_FF_ARDUINO_UNO))
#error [NOT_SUPPORTED] Test needs Arduino Uno form factor #error [NOT_SUPPORTED] Test needs Arduino Uno form factor
#else #else
@ -34,15 +37,13 @@ using namespace utest::v1;
template <PinName TestedPin> template <PinName TestedPin>
void GPIO_test() void GPIO_test()
{ {
printf("Pin 0x%x\n", TestedPin); utest_printf("GPIO Pin 0x%x\n", TestedPin);
TEST_SKIP_UNLESS_MESSAGE(TestedPin != (PinName)NC, "NC pin"); TEST_SKIP_UNLESS_MESSAGE(TestedPin != USBTX, "ARDUINO_UNO pin shared with USBTX");
TEST_SKIP_UNLESS_MESSAGE(TestedPin != USBTX, "USBTX pin"); TEST_SKIP_UNLESS_MESSAGE(TestedPin != USBRX, "ARDUINO_UNO pin shared with USBRX");
TEST_SKIP_UNLESS_MESSAGE(TestedPin != USBRX, "USBRX pin");
const PinMap *maps = gpio_pinmap(); // hal/source/mbed_gpio.c const PinMap *maps = gpio_pinmap(); // hal/source/mbed_gpio.c
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == TestedPin) { if (maps->pin == TestedPin) {
{ {
DigitalOut TEST1(maps->pin); DigitalOut TEST1(maps->pin);
@ -50,10 +51,12 @@ void GPIO_test()
} }
{ {
DigitalIn TEST1(maps->pin); DigitalIn TEST1(maps->pin);
// Basic API call
TEST1.read(); TEST1.read();
} }
{ {
DigitalInOut TEST1(maps->pin); DigitalInOut TEST1(maps->pin);
// Basic API call
TEST1.input(); TEST1.input();
TEST1.output(); TEST1.output();
} }
@ -63,6 +66,8 @@ void GPIO_test()
} }
maps++; maps++;
} }
// Pin is not part of gpio PinMap
TEST_ASSERT(false); TEST_ASSERT(false);
} }
@ -70,14 +75,14 @@ void GPIO_test()
template <PinName TestedPin> template <PinName TestedPin>
void AnalogIn_test() void AnalogIn_test()
{ {
printf("Pin 0x%x\n", TestedPin); utest_printf("ADC Pin 0x%x\n", TestedPin);
const PinMap *maps = analogin_pinmap(); const PinMap *maps = analogin_pinmap();
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == TestedPin) { if (maps->pin == TestedPin) {
AnalogIn TEST(TestedPin); AnalogIn TEST(TestedPin);
// Basic API call
TEST.read_u16(); TEST.read_u16();
TEST_ASSERT(true); TEST_ASSERT(true);
@ -85,6 +90,8 @@ void AnalogIn_test()
} }
maps++; maps++;
} }
// Pin is not part of analogin PinMap
TEST_ASSERT(false); TEST_ASSERT(false);
} }
@ -92,14 +99,14 @@ void AnalogIn_test()
template <PinName TestedPin> template <PinName TestedPin>
void PWM_test() void PWM_test()
{ {
printf("Pin 0x%x\n", TestedPin); utest_printf("PWM Pin 0x%x\n", TestedPin);
const PinMap *maps = pwmout_pinmap(); const PinMap *maps = pwmout_pinmap();
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == TestedPin) { if (maps->pin == TestedPin) {
PwmOut pwm(TestedPin); PwmOut pwm(TestedPin);
// Basic API call
pwm.period(1.0f); pwm.period(1.0f);
pwm.write(0.5f); pwm.write(0.5f);
@ -109,43 +116,47 @@ void PWM_test()
maps++; maps++;
} }
// PWM support is not mandatory // From docs/design-documents/hal/0005-pin-names-Arduino-Uno-standard.md
TEST_SKIP_UNLESS_MESSAGE(false, "ARDUINO_UNO WARNING: NO PWM "); // Although this is recomended as per the Arduino Uno standard,
// it's not a mandatory as requirement to be compliant with the Arduino Uno standard for Mbed boards.
TEST_SKIP_UNLESS_MESSAGE(false, "ARDUINO_UNO: this pin doesn’t support PWM");
} }
template <PinName TX_pin, PinName RX_pin> template <PinName TX_pin, PinName RX_pin>
void UART_test() void UART_test()
{ {
printf("TX Pin 0x%x RX Pin 0x%x\n", TX_pin, RX_pin); utest_printf("UART TX Pin 0x%x RX Pin 0x%x\n", TX_pin, RX_pin);
TEST_SKIP_UNLESS_MESSAGE(TX_pin != USBTX, "USBTX pin"); TEST_SKIP_UNLESS_MESSAGE(TX_pin != USBTX, "ARDUINO_UNO_UART pin shared with USBTX");
TEST_SKIP_UNLESS_MESSAGE(RX_pin != USBRX, "USBRX pin"); TEST_SKIP_UNLESS_MESSAGE(RX_pin != USBRX, "ARDUINO_UNO_UART pin shared with USBRX");
{ {
const PinMap *maps = serial_tx_pinmap(); const PinMap *maps = serial_tx_pinmap();
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == TX_pin) { if (maps->pin == TX_pin) {
break; break;
} }
maps++; maps++;
} }
// Pin is not part of serial_tx PinMap
TEST_ASSERT_NOT_EQUAL(NC, maps->pin); TEST_ASSERT_NOT_EQUAL(NC, maps->pin);
} }
{ {
const PinMap *maps = serial_rx_pinmap(); const PinMap *maps = serial_rx_pinmap();
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == RX_pin) { if (maps->pin == RX_pin) {
break; break;
} }
maps++; maps++;
} }
// Pin is not part of serial_rx PinMap
TEST_ASSERT_NOT_EQUAL(NC, maps->pin); TEST_ASSERT_NOT_EQUAL(NC, maps->pin);
} }
BufferedSerial TEST(TX_pin, RX_pin); BufferedSerial TEST(TX_pin, RX_pin);
// Basic API call
TEST.set_baud(115200); TEST.set_baud(115200);
} }
@ -153,32 +164,33 @@ void UART_test()
template <PinName SDA_pin, PinName SCL_pin> template <PinName SDA_pin, PinName SCL_pin>
void I2C_test() void I2C_test()
{ {
printf("SDA Pin 0x%x SCL Pin 0x%x\n", SDA_pin, SCL_pin); utest_printf("I2C SDA Pin 0x%x SCL Pin 0x%x\n", SDA_pin, SCL_pin);
{ {
const PinMap *maps = i2c_master_sda_pinmap(); const PinMap *maps = i2c_master_sda_pinmap();
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == SDA_pin) { if (maps->pin == SDA_pin) {
break; break;
} }
maps++; maps++;
} }
// Pin is not part of i2c_master_sda PinMap
TEST_ASSERT_NOT_EQUAL(NC, maps->pin); TEST_ASSERT_NOT_EQUAL(NC, maps->pin);
} }
{ {
const PinMap *maps = i2c_master_scl_pinmap(); const PinMap *maps = i2c_master_scl_pinmap();
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == SCL_pin) { if (maps->pin == SCL_pin) {
break; break;
} }
maps++; maps++;
} }
// Pin is not part of i2c_master_scl PinMap
TEST_ASSERT_NOT_EQUAL(NC, maps->pin); TEST_ASSERT_NOT_EQUAL(NC, maps->pin);
} }
I2C i2c(SDA_pin, SCL_pin); I2C i2c(SDA_pin, SCL_pin);
// Basic API call
i2c.read(0); i2c.read(0);
} }
@ -186,55 +198,56 @@ void I2C_test()
template <PinName MOSI_pin, PinName MISO_pin, PinName CLK_pin, PinName CS_pin> template <PinName MOSI_pin, PinName MISO_pin, PinName CLK_pin, PinName CS_pin>
void SPI_test() void SPI_test()
{ {
printf("MOSI Pin 0x%x MISO Pin 0x%x CLOCK Pin 0x%x CS Pin0x%x\n", MOSI_pin, MISO_pin, CLK_pin, CS_pin); utest_printf("SPI MOSI Pin 0x%x MISO Pin 0x%x CLOCK Pin 0x%x CS Pin0x%x\n", MOSI_pin, MISO_pin, CLK_pin, CS_pin);
{ {
const PinMap *maps = spi_master_mosi_pinmap(); const PinMap *maps = spi_master_mosi_pinmap();
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == MOSI_pin) { if (maps->pin == MOSI_pin) {
break; break;
} }
maps++; maps++;
} }
// Pin is not part of spi_master_mosi PinMap
TEST_ASSERT_NOT_EQUAL(NC, maps->pin); TEST_ASSERT_NOT_EQUAL(NC, maps->pin);
} }
{ {
const PinMap *maps = spi_master_miso_pinmap(); const PinMap *maps = spi_master_miso_pinmap();
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == MISO_pin) { if (maps->pin == MISO_pin) {
break; break;
} }
maps++; maps++;
} }
// Pin is not part of spi_master_miso PinMap
TEST_ASSERT_NOT_EQUAL(NC, maps->pin); TEST_ASSERT_NOT_EQUAL(NC, maps->pin);
} }
{ {
const PinMap *maps = spi_master_clk_pinmap(); const PinMap *maps = spi_master_clk_pinmap();
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == CLK_pin) { if (maps->pin == CLK_pin) {
break; break;
} }
maps++; maps++;
} }
// Pin is not part of spi_master_clk PinMap
TEST_ASSERT_NOT_EQUAL(NC, maps->pin); TEST_ASSERT_NOT_EQUAL(NC, maps->pin);
} }
{ {
const PinMap *maps = gpio_pinmap(); // CS pin could be a simple GPIO const PinMap *maps = gpio_pinmap(); // CS pin could be a simple GPIO
while (maps->pin != (PinName)NC) { while (maps->pin != (PinName)NC) { // check each pin from PinMap table till NC pin
// printf("map pin 0x%x\n", maps->pin);
if (maps->pin == CS_pin) { if (maps->pin == CS_pin) {
break; break;
} }
maps++; maps++;
} }
// Pin is not part of gpio PinMap
TEST_ASSERT_NOT_EQUAL(NC, maps->pin); TEST_ASSERT_NOT_EQUAL(NC, maps->pin);
} }
SPI device(MOSI_pin, MISO_pin, CLK_pin); SPI device(MOSI_pin, MISO_pin, CLK_pin);
DigitalOut cs(CS_pin); DigitalOut cs(CS_pin);
// Basic API call
device.frequency(10000000); device.frequency(10000000);
} }

12
hal/tests/TESTS/pin_names/generic/main.cpp
View File

@ -20,9 +20,13 @@
#include "greentea-client/test_env.h" #include "greentea-client/test_env.h"
#include "mbed.h" #include "mbed.h"
/*
Requirements specified in docs/design-documents/hal/0004-pin-names-general-guidelines.md
*/
#ifndef LED1 #ifndef LED1
// Set test as not supported, could be changed as error later #error [NOT_SUPPORTED] Target is not following mbed-os pin names standard // Test is set as Skipped
#error [NOT_SUPPORTED] check docs/design-documents/hal/0004-pin-names-general-guidelines.md // #error [NOT_SUPPORTED] Target is not following mbed-os pin names standard // Test is set as Error
#else #else
using namespace utest::v1; using namespace utest::v1;
@ -30,7 +34,7 @@ using namespace utest::v1;
template <int LedId, PinName LedPin> template <int LedId, PinName LedPin>
void LED_test() void LED_test()
{ {
printf("LED %u Pin 0x%x\n", LedId, LedPin); utest_printf("LED %u Pin 0x%x\n", LedId, LedPin);
DigitalOut TEST(LedPin); DigitalOut TEST(LedPin);
TEST = 1; TEST = 1;
ThisThread::sleep_for(1s); ThisThread::sleep_for(1s);
@ -41,7 +45,7 @@ void LED_test()
template <int ButtonId, PinName ButtonPin> template <int ButtonId, PinName ButtonPin>
void BUTTON_test() void BUTTON_test()
{ {
printf("BUTTON %u Pin 0x%x\n", ButtonId, ButtonPin); utest_printf("BUTTON %u Pin 0x%x\n", ButtonId, ButtonPin);
DigitalIn TEST(ButtonPin); DigitalIn TEST(ButtonPin);
} }