Skip to content

Commit b6f76cb

Browse files
authored
Merge pull request #5 from ARMmbed/master
Up to date
2 parents e127bb2 + 4ef38f9 commit b6f76cb

File tree

1,644 files changed

+177238
-10089
lines changed

Some content is hidden

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

1,644 files changed

+177238
-10089
lines changed

.astyleignore renamed to .codecheckignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
^connectivity/libraries/mbed-coap
66
^connectivity/libraries/ppp
77
^connectivity/drivers/emac
8-
^features/cryptocell
9-
^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
10-
^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM
8+
^connectivity/drivers/mbedtls
9+
^connectivity/mbedtls
1110
^features/frameworks
1211
^connectivity/lwipstack/lwip
1312
^connectivity/lwipstack/lwip-sys
14-
^features/mbedtls
1513
^connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet
1614
^connectivity/nanostack/sal-stack-nanostack-eventloop
1715
^storage/filesystem/fat/ChaN
@@ -20,6 +18,8 @@
2018
^features/unsupported/
2119
^hal/storage_abstraction
2220
^platform/cxxsupport
21+
^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
22+
^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM
2323
^platform/tests/UNITTESTS
2424
^events/tests/UNITTESTS
2525
^rtos/source/TARGET_CORTEX/rtx4

.travis.yml

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ cache:
2828
pip: true
2929
directories:
3030
- ${HOME}/.cache/deps
31+
- ${HOME}/.ccache
3132

3233

3334
before_install:
@@ -43,7 +44,7 @@ after_failure:
4344

4445
matrix:
4546
include:
46-
47+
4748
### Basic Tests ###
4849
- &basic-vm
4950
stage: "Basic"
@@ -125,21 +126,22 @@ matrix:
125126
- >-
126127
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
127128
| ( grep '.*\.\(c\|cpp\|h\|hpp\)$' || true ) \
128-
| ( grep -v -f .astyleignore || true ) \
129+
| ( grep -v -f .codecheckignore || true ) \
129130
| while read file; do astyle -n --options=.astylerc "${file}"; done
130131
- git diff --exit-code --diff-filter=d --color
131-
132+
132133
- <<: *docs-vm
133134
name: "spellcheck"
134135
env: NAME=doxy-spellcheck
135136
install:
136137
- source_pkg aspell
137138
script:
138-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh drivers
139-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh platform
140-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh events
141-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh rtos
142-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh connectivity/netsocket
139+
# TODO: run checks on all directories once all mispellings are fixed
140+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh drivers .codecheckignore
141+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh platform .codecheckignore
142+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh events .codecheckignore
143+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh rtos .codecheckignore
144+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh connectivity/netsocket .codecheckignore
143145

144146
- <<: *docs-vm
145147
name: "doxygen"
@@ -155,6 +157,7 @@ matrix:
155157
make;
156158
sudo make install)
157159
# Create BUILD directory for tests
160+
- ccache -s
158161
- mkdir BUILD
159162
script:
160163
# Assert that the Doxygen build produced no warnings.
@@ -170,13 +173,41 @@ matrix:
170173
find "(" -name "*.a" -or -name "*.ar" ")" -and -not -name "lib*" |
171174
tee BUILD/badlibs |
172175
sed -e "s/^/Bad library name found: /" && [ ! -s BUILD/badlibs ]
173-
# Assert that all assebler files are named correctly
176+
# Assert that all assembler files are named correctly
174177
# The strange command below asserts that there are exactly 0 libraries
175178
# that do end with .s
176179
- >
177180
find -name "*.s" | tee BUILD/badasm |
178181
sed -e "s/^/Bad Assembler file name found: /" && [ ! -s BUILD/badasm ]
179182
183+
- <<: *docs-vm
184+
name: "Frozen tools check"
185+
env: NAME=frozen_tools_check
186+
script:
187+
# Reject any changes to tools that would require a re-release of the
188+
# tools for the online compiler.
189+
- >-
190+
frozen_files=`\
191+
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
192+
| egrep \
193+
-e "^tools/build_api*" \
194+
-e "^tools/config*" \
195+
-e "^tools/export*" \
196+
-e "^tools/notifier*" \
197+
-e "^tools/paths*" \
198+
-e "^tools/resources*" \
199+
-e "^tools/targets*" \
200+
-e "^tools/toolchains*" \
201+
-e "^tools/utils*" \
202+
-e "^$"`
203+
if [ -z "$frozen_files" ]; then
204+
echo "Success!";
205+
else
206+
echo -e "Failure: Frozen files were modified\n$frozen_files";
207+
echo -e "Please see https://os.mbed.com/blog/entry/Introducing-the-new-Mbed-Tools/" \
208+
"\nfor why we've frozen the legacy tools.";
209+
false;
210+
fi
180211
181212
### Python Tests ###
182213
- &pytools-vm
@@ -225,7 +256,7 @@ matrix:
225256
env: NAME=tools-py3.7
226257
python: 3.7
227258

228-
259+
229260
### Extended Tests ###
230261
- &extended-vm
231262
stage: "Extended"
@@ -255,6 +286,7 @@ matrix:
255286
- python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
256287
# Run profiling tests
257288
- make -C ${EVENTS}/tests/unit prof | tee prof
289+
- ccache -s
258290
after_success:
259291
# Update status, comparing with master if possible.
260292
- |
@@ -328,6 +360,7 @@ matrix:
328360
OBJ="$(ls lfs*.o | tr '\n' ' ')"
329361
CFLAGS+="-DLFS_NO_ASSERT -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR"
330362
| tee sizes
363+
- ccache -s
331364
after_success:
332365
# Update status, comparing with master if possible.
333366
- |

DOXYGEN_FRONTPAGE.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# mbed OS code base
1+
# Mbed OS code base
22

3-
This is the code documentation for mbed OS.
3+
This is the code documentation for Mbed OS.
44

5-
For more information, please see:
6-
7-
* [The mbed OS API References](https://docs.mbed.com/docs/mbed-os-api-reference/)
8-
* [The mbed OS Handbook](https://docs.mbed.com/docs/mbed-os-handbook/)
5+
For more information, please see [the Mbed OS API references](https://os.mbed.com/docs/mbed-os/latest/apis/index.html) and [the full list of tutorials and examples](https://os.mbed.com/docs/mbed-os/latest/tutorials/index.html).

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Folders containing files under different permissive license than Apache 2.0 are
1212
- [features/FEATURE_PSA/FEATURE_TFM](./features/FEATURE_PSA/FEATURE_TFM) - BSD-3-Clause
1313
- [features/FEATURE_PSA/FEATURE_MBED_PSA_SRV/services/attestation](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation) - BSD-3-Clause
1414
- [features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor) - BSD-3-Clause
15-
- [features/lorawan](./features/lorawan) - Revised BSD
15+
- [connectivity/lorawan](./connectivity/lorawan) - Revised BSD
1616
- [connectivity/lwipstack](./connectivity/lwipstack) - BSD-style, MIT-style
1717
- [connectivity/nanostack/sal-stack-nanostack](./connectivity/nanostack/sal-stack-nanostack) - BSD-3-Clause
1818
- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT

TESTS/configs/baremetal.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"psa",
88
"psa-services",
99
"mbedtls",
10+
"mbedtls-stm",
11+
"mbedtls-nuvoton",
1012
"psa-compliance-framework",
1113
"filesystem",
1214
"littlefs",

UNITTESTS/CMakeLists.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,14 @@ set(unittest-includes-base
146146
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/device"
147147
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework"
148148
"${PROJECT_SOURCE_DIR}/../connectivity/cellular/include/cellular/framework/common"
149-
"${PROJECT_SOURCE_DIR}/../features/lorawan"
150-
"${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack"
151-
"${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/mac"
152-
"${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/phy"
153-
"${PROJECT_SOURCE_DIR}/../features/lorawan/system"
154-
"${PROJECT_SOURCE_DIR}/../features/mbedtls"
155-
"${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
149+
"${PROJECT_SOURCE_DIR}/../connectivity"
150+
"${PROJECT_SOURCE_DIR}/../connectivity/lorawan/include/lorawan"
151+
"${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack"
152+
"${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/mac"
153+
"${PROJECT_SOURCE_DIR}/../connectivity/lorawan/lorastack/phy"
154+
"${PROJECT_SOURCE_DIR}/../connectivity/lorawan"
155+
"${PROJECT_SOURCE_DIR}/../connectivity/mbedtls"
156+
"${PROJECT_SOURCE_DIR}/../connectivity/mbedtls/include"
156157
)
157158

158159
# Create a list for test suites.

UNITTESTS/empty_baseline/unittest.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
set(unittest-includes ${unittest-includes}
77
.
88
..
9-
../features/mbedtls/inc/mbedtls/
10-
../features/mbedtls/platform/inc/
9+
../connectivity/mbedtls/include/mbedtls/
10+
../connectivity/mbedtls/platform/inc/
1111
../features/frameworks/mbed-trace/mbed-trace/
1212
)
1313

UNITTESTS/stubs/LoRaMac_stub.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <cstddef>
2121

2222
#include "lorawan_types.h"
23-
#include "lorawan_data_structures.h"
23+
#include "system/lorawan_data_structures.h"
2424

2525
namespace LoRaMac_stub {
2626
extern bool bool_value;

UNITTESTS/stubs/LoRaWANTimer_stub.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
#include "mbed_assert.h"
19-
#include "LoRaWANTimer.h"
19+
#include "system/LoRaWANTimer.h"
2020

2121
#include "LoRaWANTimer_stub.h"
2222

UNITTESTS/stubs/LoRaWANTimer_stub.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include "LoRaWANTimer.h"
18+
#include "system/LoRaWANTimer.h"
1919

2020
namespace LoRaWANTimer_stub {
2121
extern lorawan_time_t time_value;

0 commit comments

Comments
 (0)