Skip to content

Commit 044b513

Browse files
committed
Added NUCLEO_F103RB, NUCLEO_L152RE, NUCLEO_F302R8, NUCLEO_F030R8, NUCLEO_F401RE defines to timer tests. Fixed bug related to Nucleo not responding to singletest.py test execution
1 parent 60b6b2c commit 044b513

File tree

7 files changed

+55
-22
lines changed

7 files changed

+55
-22
lines changed

libraries/tests/mbed/i2c_eeprom/main.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ I2C i2c(P0_10, P0_11);
3333
#elif defined(TARGET_LPC1549)
3434
I2C i2c(P0_23, P0_22);
3535

36-
#elif defined(TARGET_NUCLEO_F103RB) || defined(TARGET_NUCLEO_L152RE)
36+
#elif defined(TARGET_NUCLEO_F103RB) || \
37+
defined(TARGET_NUCLEO_L152RE) || \
38+
defined(TARGET_NUCLEO_F302R8) || \
39+
defined(TARGET_NUCLEO_F030R8) || \
40+
defined(TARGET_NUCLEO_F401RE)
3741
I2C i2c(I2C_SDA, I2C_SCL);
3842

3943
#elif defined(TARGET_K64F)

libraries/tests/mbed/i2c_eeprom_line/main.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ I2C i2c(P0_10, P0_11);
4242
#elif defined(TARGET_LPC1549)
4343
I2C i2c(P0_23, P0_22);
4444

45-
#elif defined(TARGET_NUCLEO_F103RB)
45+
#elif defined(TARGET_NUCLEO_F103RB) || \
46+
defined(TARGET_NUCLEO_L152RE) || \
47+
defined(TARGET_NUCLEO_F302R8) || \
48+
defined(TARGET_NUCLEO_F030R8) || \
49+
defined(TARGET_NUCLEO_F401RE)
4650
I2C i2c(I2C_SDA, I2C_SCL);
4751

4852
#elif defined(TARGET_K64F)

libraries/tests/mbed/ticker_2/main.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ DigitalOut out(PTA1);
1717
#elif defined(TARGET_K64F)
1818
DigitalOut out(PTA1);
1919

20-
#elif defined(TARGET_NUCLEO_L152RE)
20+
#elif defined(TARGET_NUCLEO_F103RB) || \
21+
defined(TARGET_NUCLEO_L152RE) || \
22+
defined(TARGET_NUCLEO_F302R8) || \
23+
defined(TARGET_NUCLEO_F030R8) || \
24+
defined(TARGET_NUCLEO_F401RE)
2125
DigitalOut out(PA_3);
2226

2327
#else
@@ -34,8 +38,10 @@ void print_char(char c = '*')
3438
fflush(stdout);
3539
}
3640

37-
void togglePin (void) {
41+
void togglePin(void)
42+
{
3843
static int ticker_count = 0;
44+
3945
if (ticker_count == MS_INTERVALS) {
4046
print_char();
4147
ticker_count = 0;
@@ -45,9 +51,9 @@ void togglePin (void) {
4551
ticker_count++;
4652
}
4753

48-
int main() {
54+
int main()
55+
{
4956
tick.attach_us(togglePin, 1000);
50-
while (true) {
57+
while (true)
5158
wait(1);
52-
}
5359
}

libraries/tests/mbed/time_us/main.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ DigitalOut out(PTA1);
1515
#elif defined(TARGET_LPC812)
1616
DigitalOut out(D10);
1717

18-
#elif defined(TARGET_NUCLEO_L152RE)
18+
#elif defined(TARGET_NUCLEO_F103RB) || \
19+
defined(TARGET_NUCLEO_L152RE) || \
20+
defined(TARGET_NUCLEO_F302R8) || \
21+
defined(TARGET_NUCLEO_F030R8) || \
22+
defined(TARGET_NUCLEO_F401RE)
1923
DigitalOut out(LED1);
2024

2125
#else
@@ -32,10 +36,10 @@ void print_char(char c = '*')
3236
fflush(stdout);
3337
}
3438

35-
int main() {
39+
int main()
40+
{
3641
while (true) {
37-
for (int i = 0; i < MS_INTERVALS; i++)
38-
{
42+
for (int i = 0; i < MS_INTERVALS; i++) {
3943
wait_us(1000);
4044
out = !out;
4145
}

libraries/tests/mbed/timeout/main.cpp

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ DigitalOut out(LED2);
2020
#elif defined(TARGET_K64F)
2121
DigitalOut out(LED1);
2222

23-
#elif defined(TARGET_NUCLEO_L152RE)
23+
#elif defined(TARGET_NUCLEO_F103RB) || \
24+
defined(TARGET_NUCLEO_L152RE) || \
25+
defined(TARGET_NUCLEO_F302R8) || \
26+
defined(TARGET_NUCLEO_F030R8) || \
27+
defined(TARGET_NUCLEO_F401RE)
2428
DigitalOut out(LED1);
2529

2630
#else
@@ -37,10 +41,12 @@ void print_char(char c = '*')
3741
fflush(stdout);
3842
}
3943

40-
void toggleOff (void);
44+
void toggleOff(void);
4145

42-
void toggleOn (void) {
46+
void toggleOn(void)
47+
{
4348
static int toggle_counter = 0;
49+
4450
out = 1;
4551
led = 1;
4652
if (toggle_counter == MS_INTERVALS) {
@@ -51,13 +57,15 @@ void toggleOn (void) {
5157
timer.attach_us(toggleOff, 500);
5258
}
5359

54-
void toggleOff(void) {
60+
void toggleOff(void)
61+
{
5562
out = 0;
5663
led = 0;
5764
timer.attach_us(toggleOn, 500);
5865
}
5966

60-
int main() {
67+
int main()
68+
{
6169
toggleOn();
62-
while(1);
70+
while (1) ;
6371
}

libraries/tests/net/echo/udp_link_layer/main.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ volatile int max_queue_len = 0;
3434

3535
void udp_server_task(void const *argument)
3636
{
37+
DigitalOut indicator(LED1);
3738
UDPSocket server;
3839

3940
server.bind(ECHO_SERVER_PORT);
@@ -61,6 +62,7 @@ void udp_server_task(void const *argument)
6162
max_queue_len = datagram_queue.size() > max_queue_len ? datagram_queue.size() : max_queue_len;
6263
received_packets++;
6364
cli_serv_mutex.unlock(); // LOCK
65+
indicator = !indicator;
6466
}
6567
}
6668
}
@@ -71,6 +73,7 @@ void udp_client_task(void const *argument)
7173
// Waiting for HOST port notification
7274
}
7375

76+
DigitalOut indicator(LED2);
7477
UDPSocket socket;
7578
socket.init();
7679

@@ -93,6 +96,7 @@ void udp_client_task(void const *argument)
9396
//printf("[udp_client_task] Forwarded datagram: %s\r\n", datagram.c_str());
9497
socket.sendTo(echo_server, (char *)datagram.c_str(), datagram.length());
9598
forwarded_packets++;
99+
indicator = !indicator;
96100
}
97101
}
98102
}

workspace_tools/singletest.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
from prettytable import PrettyTable
7777
from serial import Serial
7878

79-
from os.path import join, abspath, dirname, exists
79+
from os.path import join, abspath, dirname, exists, basename
8080
from shutil import copy
8181
from subprocess import call
8282
from time import sleep, time
@@ -100,7 +100,7 @@
100100
sys.path.insert(0, ROOT)
101101

102102
# Imports related to mbed build pi
103-
from workspace_tools.utils import delete_dir_files
103+
from workspace_tools.utils import delete_dir_files, copy_file
104104
from workspace_tools.settings import MUTs
105105

106106

@@ -227,11 +227,14 @@ def handle(self, test_spec, target_name, toolchain_name):
227227
return (test_result, target_name, toolchain_name,
228228
test_id, test_description, round(elapsed_time, 2), duration)
229229

230-
if not target_by_mcu.is_disk_virtual:
231-
delete_dir_files(disk)
230+
#if not target_by_mcu.is_disk_virtual:
231+
# delete_dir_files(disk)
232232

233233
# Program MUT with proper image file
234-
copy(image_path, disk)
234+
cmd = ["cp", image_path.encode('ascii','ignore'), disk.encode('ascii','ignore') + basename(image_path).encode('ascii','ignore')]
235+
# print cmd
236+
call(cmd)
237+
# copy(image_path, disk)
235238

236239
# Copy Extra Files
237240
if not target_by_mcu.is_disk_virtual and test.extra_files:

0 commit comments

Comments
 (0)