Skip to content

Commit 5bcebba

Browse files
sg-sg-
authored
Merge pull request #3023 from jeromecoutant/PR_digital_loop_tests
digital_loop tests update for STM32
2 parents 64c527e + e0ddd59 commit 5bcebba

File tree

4 files changed

+45
-82
lines changed

4 files changed

+45
-82
lines changed

‎features/unsupported/tests/mbed/digitalin_digitalout/main.cpp‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,21 @@ DigitalIn in(dp2);
99
// port pin), D1 is used as USBTX
1010
DigitalOut out(D7);
1111
DigitalIn in(D2);
12+
#elif defined(TARGET_STM) && defined(TARGET_FF_ARDUINO)
13+
// TARGET_FF_ARDUINO cannot be used
14+
// D0 is used as USBRX for some NUCLEO64
15+
// D7 is not used for some NUCLEO32
16+
DigitalOut out(D9);
17+
DigitalIn in(D2);
18+
19+
#elif defined(TARGET_DISCO_L053C8) || \
20+
defined(TARGET_DISCO_F334C8)
21+
DigitalOut out(PA_15);
22+
DigitalIn in(PA_8);
1223

13-
#elif defined(TARGET_DISCO_F469NI)
14-
DigitalOut out(PB_1);
15-
DigitalIn in(PG_9);
16-
17-
#elif defined(TARGET_NUCLEO_F030R8) || \
18-
defined(TARGET_NUCLEO_F070RB) || \
19-
defined(TARGET_NUCLEO_F072RB) || \
20-
defined(TARGET_NUCLEO_F091RC) || \
21-
defined(TARGET_NUCLEO_F103RB) || \
22-
defined(TARGET_NUCLEO_F302R8) || \
23-
defined(TARGET_NUCLEO_F303RE) || \
24-
defined(TARGET_NUCLEO_F334R8) || \
25-
defined(TARGET_NUCLEO_F401RE) || \
26-
defined(TARGET_NUCLEO_F410RB) || \
27-
defined(TARGET_NUCLEO_F411RE) || \
28-
defined(TARGET_NUCLEO_F429ZI) || \
29-
defined(TARGET_NUCLEO_F446RE) || \
30-
defined(TARGET_NUCLEO_F446ZE) || \
31-
defined(TARGET_NUCLEO_L053R8) || \
32-
defined(TARGET_NUCLEO_L073RZ) || \
33-
defined(TARGET_NUCLEO_L152RE)
34-
DigitalOut out(PC_7);
35-
DigitalIn in(PB_8);
36-
37-
#elif defined(TARGET_NUCLEO_F031K6) || \
38-
defined(TARGET_NUCLEO_F042K6) || \
39-
defined(TARGET_NUCLEO_L011K4) || \
40-
defined(TARGET_NUCLEO_L031K6)
41-
DigitalOut out(A4);
42-
DigitalIn in(A5);
24+
#elif defined(TARGET_DISCO_L476VG)
25+
DigitalOut out(PA_1);
26+
DigitalIn in(PA_2);
4327

4428
#elif defined(TARGET_ARCH_MAX) || \
4529
defined(TARGET_DISCO_F407VG) || \

‎features/unsupported/tests/mbed/digitalinout/main.cpp‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,21 @@ DigitalInOut d2(dp2);
1010
DigitalInOut d1(D2);
1111
DigitalInOut d2(D7);
1212

13-
#elif defined(TARGET_NUCLEO_F030R8) || \
14-
defined(TARGET_NUCLEO_F070RB) || \
15-
defined(TARGET_NUCLEO_F072RB) || \
16-
defined(TARGET_NUCLEO_F091RC) || \
17-
defined(TARGET_NUCLEO_F103RB) || \
18-
defined(TARGET_NUCLEO_F302R8) || \
19-
defined(TARGET_NUCLEO_F303RE) || \
20-
defined(TARGET_NUCLEO_F334R8) || \
21-
defined(TARGET_NUCLEO_F401RE) || \
22-
defined(TARGET_NUCLEO_F410RB) || \
23-
defined(TARGET_NUCLEO_F411RE) || \
24-
defined(TARGET_NUCLEO_F446RE) || \
25-
defined(TARGET_NUCLEO_F446ZE) || \
26-
defined(TARGET_NUCLEO_L053R8) || \
27-
defined(TARGET_NUCLEO_L073RZ) || \
28-
defined(TARGET_NUCLEO_L152RE)
29-
DigitalInOut d1(PC_7);
30-
DigitalInOut d2(PB_8);
31-
32-
#elif defined(TARGET_NUCLEO_F031K6) || \
33-
defined(TARGET_NUCLEO_F042K6) || \
34-
defined(TARGET_NUCLEO_L011K4) || \
35-
defined(TARGET_NUCLEO_L031K6)
36-
DigitalInOut d1(A4);
37-
DigitalInOut d2(A5);
13+
#elif defined(TARGET_STM) && defined(TARGET_FF_ARDUINO)
14+
// TARGET_FF_ARDUINO cannot be used
15+
// D0 is used as USBRX for some NUCLEO64
16+
// D7 is not used for some NUCLEO32
17+
DigitalInOut d1(D9);
18+
DigitalInOut d2(D2);
19+
20+
#elif defined(TARGET_DISCO_L053C8) || \
21+
defined(TARGET_DISCO_F334C8)
22+
DigitalInOut d1(PA_15);
23+
DigitalInOut d2(PA_8);
24+
25+
#elif defined(TARGET_DISCO_L476VG)
26+
DigitalInOut d1(PA_1);
27+
DigitalInOut d2(PA_2);
3828

3929
#elif defined(TARGET_ARCH_MAX) || \
4030
defined(TARGET_DISCO_F407VG) || \

‎features/unsupported/tests/mbed/interruptin/main.cpp‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,32 +39,21 @@ void in_handler() {
3939
#define PIN_IN (p11)
4040
#define PIN_OUT (p12)
4141

42-
#elif defined(TARGET_NUCLEO_F030R8) || \
43-
defined(TARGET_NUCLEO_F070RB) || \
44-
defined(TARGET_NUCLEO_F072RB) || \
45-
defined(TARGET_NUCLEO_F091RC) || \
46-
defined(TARGET_NUCLEO_F103RB) || \
47-
defined(TARGET_NUCLEO_F302R8) || \
48-
defined(TARGET_NUCLEO_F303RE) || \
49-
defined(TARGET_NUCLEO_F334R8) || \
50-
defined(TARGET_NUCLEO_F401RE) || \
51-
defined(TARGET_NUCLEO_F410RB) || \
52-
defined(TARGET_NUCLEO_F411RE) || \
53-
defined(TARGET_NUCLEO_F429ZI) || \
54-
defined(TARGET_NUCLEO_F446RE) || \
55-
defined(TARGET_NUCLEO_F446ZE) || \
56-
defined(TARGET_NUCLEO_L053R8) || \
57-
defined(TARGET_NUCLEO_L073RZ) || \
58-
defined(TARGET_NUCLEO_L152RE)
59-
#define PIN_IN PB_8
60-
#define PIN_OUT PC_7
61-
62-
#elif defined(TARGET_NUCLEO_F031K6) || \
63-
defined(TARGET_NUCLEO_F042K6) || \
64-
defined(TARGET_NUCLEO_L011K4) || \
65-
defined(TARGET_NUCLEO_L031K6)
66-
#define PIN_IN A4
67-
#define PIN_OUT A5
42+
#elif defined(TARGET_STM) && defined(TARGET_FF_ARDUINO)
43+
// TARGET_FF_ARDUINO cannot be used
44+
// D0 is used as USBRX for some NUCLEO64
45+
// D7 is not used for some NUCLEO32
46+
#define PIN_OUT D2
47+
#define PIN_IN D9
48+
49+
#elif defined(TARGET_DISCO_L053C8) || \
50+
defined(TARGET_DISCO_F334C8)
51+
#define PIN_OUT PA_15
52+
#define PIN_IN PA_8
53+
54+
#elif defined(TARGET_DISCO_L476VG)
55+
#define PIN_OUT PA_1
56+
#define PIN_IN PA_2
6857

6958
#elif defined(TARGET_ARCH_MAX) || \
7059
defined(TARGET_DISCO_F407VG) || \

‎tools/tests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
5252
* digital_loop (Digital(In|Out|InOut), InterruptIn):
5353
* Arduino headers: (D0 <-> D7)
54+
* NUCLEO_*: (D2 <-> D9)
5455
* LPC1549: (D2 <-> D7)
5556
* LPC1*: (p5 <-> p25 )
5657
* KL25Z: (PTA5<-> PTC6)
57-
* NUCLEO_F103RB: (PC_6 <-> PB_8)
5858
* MAXWSNENV: (TP3 <-> TP4)
5959
* MAX32600MBED: (P1_0 <-> P4_7)
6060
* VK_RZ_A1H: (P3_2 <-> P5_6)

0 commit comments

Comments
 (0)