From 25e885eafc45b3d4631dd278659dae134cebb1ad Mon Sep 17 00:00:00 2001 From: bcostm Date: Mon, 9 Jan 2017 14:53:41 +0100 Subject: [PATCH 1/4] Add NUCLEO_F412ZG in main.cpp files used for the tests --- features/unsupported/tests/mbed/can/main.cpp | 2 ++ features/unsupported/tests/mbed/can_interrupt/main.cpp | 2 ++ features/unsupported/tests/mbed/can_loopback/main.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/features/unsupported/tests/mbed/can/main.cpp b/features/unsupported/tests/mbed/can/main.cpp index 2140523a3a1..505c03e6919 100644 --- a/features/unsupported/tests/mbed/can/main.cpp +++ b/features/unsupported/tests/mbed/can/main.cpp @@ -20,6 +20,7 @@ CAN can1(PD_0, PD_1); defined(TARGET_NUCLEO_F302R8) || defined(TARGET_NUCLEO_F446RE) || \ defined(TARGET_DISCO_F429ZI) || defined(TARGET_NUCLEO_F103RB) || \ defined(TARGET_NUCLEO_F746ZG) || defined(TARGET_NUCLEO_L476RG) || \ + defined(TARGET_NUCLEO_F412ZG) || \ defined(TARGET_NUCLEO_L432KC) || defined(TARGET_DISCO_F303VC) CAN can1(PA_11, PA_12); #elif defined(TARGET_DISCO_F469NI) ||defined(TARGET_DISCO_F746NG) @@ -34,6 +35,7 @@ CAN can2(p34, p33); CAN can2(p30, p29); #elif defined(TARGET_NUCLEO_F446RE) || defined(TARGET_DISCO_F469NI) || \ defined(TARGET_DISCO_F429ZI) || defined(TARGET_NUCLEO_F746ZG) || \ + defined(TARGET_NUCLEO_F412ZG) || \ defined(TARGET_DISCO_F746NG) CAN can2(PB_5, PB_6); #endif diff --git a/features/unsupported/tests/mbed/can_interrupt/main.cpp b/features/unsupported/tests/mbed/can_interrupt/main.cpp index 7d40d095492..dff63831257 100644 --- a/features/unsupported/tests/mbed/can_interrupt/main.cpp +++ b/features/unsupported/tests/mbed/can_interrupt/main.cpp @@ -20,6 +20,7 @@ CAN can1(PD_0, PD_1); defined(TARGET_NUCLEO_F302R8) || defined(TARGET_NUCLEO_F446RE) || \ defined(TARGET_DISCO_F429ZI) || defined(TARGET_NUCLEO_F103RB) || \ defined(TARGET_NUCLEO_F746ZG) || defined(TARGET_NUCLEO_L476RG) || \ + defined(TARGET_NUCLEO_F412ZG) || \ defined(TARGET_NUCLEO_L432KC) || defined(TARGET_DISCO_F303VC) CAN can1(PA_11, PA_12); #elif defined(TARGET_DISCO_F469NI) || defined(TARGET_DISCO_F746NG) @@ -34,6 +35,7 @@ CAN can2(p34, p33); CAN can2(p30, p29); #elif defined(TARGET_NUCLEO_F446RE) || defined(TARGET_DISCO_F469NI) || \ defined(TARGET_DISCO_F429ZI) || defined(TARGET_NUCLEO_F746ZG) || \ + defined(TARGET_NUCLEO_F412ZG) || \ defined(TARGET_DISCO_F746NG) CAN can2(PB_5, PB_6); #endif diff --git a/features/unsupported/tests/mbed/can_loopback/main.cpp b/features/unsupported/tests/mbed/can_loopback/main.cpp index e388451f8a7..e3969ac89fe 100644 --- a/features/unsupported/tests/mbed/can_loopback/main.cpp +++ b/features/unsupported/tests/mbed/can_loopback/main.cpp @@ -19,12 +19,14 @@ CAN can1(P5_9, P5_10); defined(TARGET_NUCLEO_F302R8) || defined(TARGET_NUCLEO_F446RE) || \ defined(TARGET_DISCO_F429ZI) || \ defined(TARGET_NUCLEO_F746ZG) || defined(TARGET_DISCO_L476VG) || \ + defined(TARGET_NUCLEO_F412ZG) || \ defined(TARGET_NUCLEO_L476RG) || defined(TARGET_NUCLEO_L432KC) CAN can1(PA_11, PA_12); #elif defined(TARGET_DISCO_F469NI) || defined(TARGET_DISCO_F746NG) || \ defined(TARGET_NUCLEO_F446ZE) || defined(TARGET_NUCLEO_F103RB) || \ defined(TARGET_NUCLEO_F207ZG) || defined(TARGET_NUCLEO_F303ZE) || \ defined(TARGET_DISCO_F769NI) || defined(TARGET_NUCLEO_F767ZI) || \ + defined(TARGET_NUCLEO_F412ZG) || \ defined(TARGET_DISCO_F303VC) CAN can1(PB_8, PB_9); #endif From 31e6e5c1828dd5dfd08e1077aa90a39966a7ac02 Mon Sep 17 00:00:00 2001 From: bcostm Date: Mon, 9 Jan 2017 14:54:27 +0100 Subject: [PATCH 2/4] Add CAN object structure --- .../TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F412ZG/objects.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F412ZG/objects.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F412ZG/objects.h index 3ebf6a1f660..b5e120a17e6 100644 --- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F412ZG/objects.h +++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F412ZG/objects.h @@ -46,6 +46,11 @@ struct analogin_s { uint8_t channel; }; +struct can_s { + CANName can; + int index; +}; + struct trng_s { RNG_HandleTypeDef handle; }; From ead72934efdb257c0002bc406d369f638144281a Mon Sep 17 00:00:00 2001 From: bcostm Date: Mon, 9 Jan 2017 14:55:14 +0100 Subject: [PATCH 3/4] Add CAN feature and activate CAN tests for this platform --- targets/targets.json | 2 +- tools/tests.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/targets/targets.json b/targets/targets.json index cdaac0342f9..e01c1672ce1 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -856,7 +856,7 @@ "inherits": ["Target"], "detect_code": ["0826"], "macros": ["TRANSACTION_QUEUE_SIZE_SPI=2"], - "device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"], + "device_has": ["ANALOGIN", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"], "release_versions": ["2", "5"], "device_name": "STM32F412ZG" }, diff --git a/tools/tests.py b/tools/tests.py index 829e8ae66ac..a668dd0afdf 100644 --- a/tools/tests.py +++ b/tools/tests.py @@ -120,6 +120,7 @@ * NUCLEO_L476RG: (RX=PA_11, TX=PA_12) * NUCLEO_L432KC: (RX=PA_11, TX=PA_12) * DISCO_F303VC: (RX=PA_11, TX=PA_12) + * NUCLEO_F412ZG: (RX=PA_11, TX=PA_12) """ TESTS = [ @@ -324,7 +325,7 @@ "NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F446RE","NUCLEO_F446ZE", "DISCO_F469NI", "DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG", "DISCO_F746NG", "DISCO_L476VG", "NUCLEO_L476RG", "NUCLEO_L432KC", - "DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC"] + "DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC", "NUCLEO_F412ZG"] }, { "id": "MBED_A28", "description": "CAN loopback test", @@ -336,7 +337,7 @@ "NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F446RE","NUCLEO_F446ZE", "DISCO_F469NI", "DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG", "DISCO_F746NG", "DISCO_L476VG", "NUCLEO_L476RG", "NUCLEO_L432KC", - "DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC"] + "DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC", "NUCLEO_F412ZG"] }, { "id": "MBED_A29", "description": "i2c_master_slave_asynch", @@ -602,21 +603,23 @@ "id": "MBED_29", "description": "CAN network test", "source_dir": join(TEST_DIR, "mbed", "can"), "dependencies": [MBED_LIBRARIES], + "automated": True, "mcu": ["LPC1768", "LPC4088", "LPC1549", "RZ_A1H", "B96B_F446VE", "NUCLEO_F091RC", "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F446RE","NUCLEO_F446ZE", "DISCO_F469NI", "NUCLEO_F207ZG", "DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG", "DISCO_F746NG", - "NUCLEO_L476RG", "NUCLEO_L432KC", "DISCO_F303VC"] + "NUCLEO_L476RG", "NUCLEO_L432KC", "DISCO_F303VC", "NUCLEO_F412ZG"] }, { "id": "MBED_30", "description": "CAN network test using interrupts", "source_dir": join(TEST_DIR, "mbed", "can_interrupt"), "dependencies": [MBED_LIBRARIES], + "automated": True, "mcu": ["LPC1768", "LPC4088", "LPC1549", "RZ_A1H", "B96B_F446VE", "NUCLEO_F091RC", "NUCLEO_F207ZG", "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F446RE", "NUCLEO_F446ZE", "DISCO_F469NI", "DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG", "DISCO_F746NG", - "NUCLEO_L476RG", "NUCLEO_L432KC", "DISCO_F303VC"] + "NUCLEO_L476RG", "NUCLEO_L432KC", "DISCO_F303VC", "NUCLEO_F412ZG"] }, { "id": "MBED_31", "description": "PWM LED test", From f6c93d3241c4343ceabbef7857002ea2df17df07 Mon Sep 17 00:00:00 2001 From: bcostm Date: Mon, 9 Jan 2017 15:34:16 +0100 Subject: [PATCH 4/4] Remove automated flag for MBED_29/30 tests --- tools/tests.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/tests.py b/tools/tests.py index a668dd0afdf..61782f21a4c 100644 --- a/tools/tests.py +++ b/tools/tests.py @@ -603,7 +603,6 @@ "id": "MBED_29", "description": "CAN network test", "source_dir": join(TEST_DIR, "mbed", "can"), "dependencies": [MBED_LIBRARIES], - "automated": True, "mcu": ["LPC1768", "LPC4088", "LPC1549", "RZ_A1H", "B96B_F446VE", "NUCLEO_F091RC", "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F446RE","NUCLEO_F446ZE", "DISCO_F469NI", "NUCLEO_F207ZG", @@ -614,7 +613,6 @@ "id": "MBED_30", "description": "CAN network test using interrupts", "source_dir": join(TEST_DIR, "mbed", "can_interrupt"), "dependencies": [MBED_LIBRARIES], - "automated": True, "mcu": ["LPC1768", "LPC4088", "LPC1549", "RZ_A1H", "B96B_F446VE", "NUCLEO_F091RC", "NUCLEO_F207ZG", "NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F446RE", "NUCLEO_F446ZE", "DISCO_F469NI",