Skip to content

Commit 638951a

Browse files
author
Offir Kochalsky
committed
Merge remote-tracking branch 'upstream/master' into offir-mbed-qspif
2 parents 908233a + c40d860 commit 638951a

File tree

692 files changed

+50668
-3886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

692 files changed

+50668
-3886
lines changed

.github/issue_template.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
### Description
2-
<!--
2+
3+
<!--
34
Required
45
Add detailed description of what you are reporting.
56
Good example: https://os.mbed.com/docs/latest/reference/workflow.html
@@ -13,19 +14,15 @@
1314

1415

1516
### Issue request type
16-
<!--
17-
Required
18-
Please add only one X to one of the following types. Do not fill multiple types. (Split the issue otherwise.)
19-
Please note this is not a GitHub task list; indenting the boxes or changing the format to add a '.' or '*' in front
20-
of them changes the meaning incorrectly. The only changes to make are to add a description under the
21-
description heading and to add an 'x' to the correct box.
2217

23-
[X] Question
24-
[ ] Enhancement
25-
[ ] Bug
18+
<!--
19+
Required
20+
Please add only one X to one of the following types. Do not fill multiple types (split the issue otherwise.)
21+
Please note this is not a GitHub task list, indenting the boxes or changing the format to add a '.' or '*' in front
22+
of them would change the meaning incorrectly. The only changes to be made are to add a description text under the
23+
description heading and to add a 'x' to the correct box.
2624
-->
27-
28-
[ ] Question
29-
[ ] Enhancement
30-
[ ] Bug
25+
[ ] Question
26+
[ ] Enhancement
27+
[ ] Bug
3128

.github/pull_request_template.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@
2020
[ ] Refactor
2121
[ ] Target update
2222
[ ] Functionality change
23+
[ ] Docs update
24+
[ ] Test update
2325
[ ] Breaking change
2426

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ matrix:
8686

8787
- arm-none-eabi-gcc --version
8888
- python --version
89+
- pip list --verbose
8990
script:
9091
# Run local testing on tools
9192
- PYTHONPATH=. coverage run -a -m pytest tools/test
@@ -132,10 +133,10 @@ matrix:
132133
# update status if we succeeded, compare with master if possible
133134
- |
134135
CURR=$(cat astyle-branch.out | grep Formatted | wc -l)
135-
PREV=$(curl https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
136+
PREV=$(curl -u "$MBED_BOT" https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
136137
| jq -re "select(.sha != \"$TRAVIS_COMMIT\")
137138
| .statuses[] | select(.context == \"travis-ci/$NAME\").description
138-
| capture(\", (?<files>[0-9]+) files\").warnings" \
139+
| capture(\", (?<files>[0-9]+) files\").files" \
139140
|| echo 0)
140141
141142
STATUSM="Passed, ${CURR} files"

TESTS/host_tests/rtc_reset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class RtcResetTest(BaseHostTest):
2929
"""
3030

3131
"""Start of the RTC"""
32-
START_TIME = 50000
32+
START_TIME = 1537789823 # GMT: Monday, 24 September 2018 11:50:23
3333
START_TIME_TOLERANCE = 10
3434
"""Time to delay after sending reset"""
3535
DELAY_TIME = 5.0

TESTS/lorawan/loraradio/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939

4040
using namespace utest::v1;
41+
using namespace mbed;
4142

4243
static LoRaRadio *radio = NULL;
4344
rtos::Semaphore event_sem(0);

TESTS/mbed_drivers/lp_ticker/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void test_multi_ticker(void)
7979
ticker[i].attach_us(callback(increment_multi_counter), MULTI_TICKER_TIME_MS * 1000);
8080
}
8181

82-
Thread::wait(MULTI_TICKER_TIME_MS + extra_wait);
82+
ThisThread::sleep_for(MULTI_TICKER_TIME_MS + extra_wait);
8383
TEST_ASSERT_EQUAL(TICKER_COUNT, multi_counter);
8484

8585
for (int i = 0; i < TICKER_COUNT; i++) {
@@ -95,7 +95,7 @@ void test_multi_ticker(void)
9595
ticker[i].attach_us(callback(increment_multi_counter), (MULTI_TICKER_TIME_MS + i) * 1000);
9696
}
9797

98-
Thread::wait(MULTI_TICKER_TIME_MS + TICKER_COUNT + extra_wait);
98+
ThisThread::sleep_for(MULTI_TICKER_TIME_MS + TICKER_COUNT + extra_wait);
9999
TEST_ASSERT_EQUAL(TICKER_COUNT, multi_counter);
100100

101101
for (int i = 0; i < TICKER_COUNT; i++) {

TESTS/mbed_drivers/mem_trace/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static void test_case_multithread_malloc_free()
391391
threads[i].start(callback(malloc_free, &threads_continue));
392392
}
393393

394-
Thread::wait(wait_time_us);
394+
ThisThread::sleep_for(wait_time_us);
395395
threads_continue = false;
396396

397397
for (int i = 0; i < NUM_TEST_THREADS; i++) {

TESTS/mbed_drivers/race_test/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ class TestClass {
3939
public:
4040
TestClass()
4141
{
42-
Thread::wait(500);
42+
ThisThread::sleep_for(500);
4343
instance_count++;
4444
}
4545

4646
void do_something()
4747
{
48-
Thread::wait(100);
48+
ThisThread::sleep_for(100);
4949
}
5050

5151
~TestClass()
@@ -83,7 +83,7 @@ void test_case_func_race()
8383
// Start start first thread
8484
t1.start(cb);
8585
// Start second thread while the first is inside the constructor
86-
Thread::wait(250);
86+
ThisThread::sleep_for(250);
8787
t2.start(cb);
8888

8989
// Wait for the threads to finish
@@ -105,7 +105,7 @@ void test_case_class_race()
105105
// Start start first thread
106106
t1.start(cb);
107107
// Start second thread while the first is inside the constructor
108-
Thread::wait(250);
108+
ThisThread::sleep_for(250);
109109
t2.start(cb);
110110

111111
// Wait for the threads to finish

TESTS/mbed_drivers/ticker/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void test_multi_ticker(void)
195195
ticker[i].attach_us(callback(increment_multi_counter), MULTI_TICKER_TIME_MS * 1000);
196196
}
197197

198-
Thread::wait(MULTI_TICKER_TIME_MS + extra_wait);
198+
ThisThread::sleep_for(MULTI_TICKER_TIME_MS + extra_wait);
199199
TEST_ASSERT_EQUAL(TICKER_COUNT, multi_counter);
200200

201201
for (int i = 0; i < TICKER_COUNT; i++) {
@@ -211,7 +211,7 @@ void test_multi_ticker(void)
211211
ticker[i].attach_us(callback(increment_multi_counter), (MULTI_TICKER_TIME_MS + i) * 1000);
212212
}
213213

214-
Thread::wait(MULTI_TICKER_TIME_MS + TICKER_COUNT + extra_wait);
214+
ThisThread::sleep_for(MULTI_TICKER_TIME_MS + TICKER_COUNT + extra_wait);
215215
TEST_ASSERT_EQUAL(TICKER_COUNT, multi_counter);
216216

217217
for (int i = 0; i < TICKER_COUNT; i++) {

TESTS/mbed_drivers/timeout/timeout_tests.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ void test_multiple(void)
177177
for (size_t i = 0; i < NUM_TIMEOUTS; i++) {
178178
timeouts[i].attach_callback(mbed::callback(cnt_callback, &callback_count), TEST_DELAY_US);
179179
}
180-
Thread::wait(TEST_DELAY_MS + 2);
180+
ThisThread::sleep_for(TEST_DELAY_MS + 2);
181181
TEST_ASSERT_EQUAL(NUM_TIMEOUTS, callback_count);
182182
}
183183

0 commit comments

Comments
 (0)