Skip to content

Commit e35050d

Browse files
committed
restructure - Reverted move of requirements.txt
- Reverted requirements.txt for external dependency in mbed CLI - Fixed MBED_CONFIG_FILE in paths.py - Fixed MBED_LIBRARIES in paths.py - Decreased include namespace for rtos.h
1 parent 03bbc86 commit e35050d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

mbed.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define MBED_LIBRARY_VERSION 123
2020

2121
#if MBED_CONF_RTOS_PRESENT
22-
#include "rtos/rtos.h"
22+
#include "rtos.h"
2323
#endif
2424

2525
#if MBED_CONF_NSAPI_PRESENT
File renamed without changes.

tools/paths.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
BUILD_DIR = getenv("MBED_BUILD_DIR") or BUILD_DIR
2525

2626
# Embedded Libraries Sources
27-
LIB_DIR = join(ROOT, "libraries")
27+
LIB_DIR = join(ROOT, "features/unsupported")
2828

2929
TOOLS = join(ROOT, "tools")
3030
TOOLS_DATA = join(TOOLS, "data")
@@ -40,7 +40,7 @@
4040

4141
MBED_LIBRARIES = join(BUILD_DIR, "mbed")
4242

43-
MBED_CONFIG_FILE = join(ROOT, "mbed_lib.json")
43+
MBED_CONFIG_FILE = join(ROOT, "platform/mbed_lib.json")
4444

4545
# Tests
4646
TEST_DIR = join(LIB_DIR, "tests")
@@ -54,7 +54,7 @@
5454
# mbed RTOS
5555
RTOS = join(ROOT, "rtos")
5656
MBED_RTX = join(RTOS, "rtx")
57-
RTOS_ABSTRACTION = join(RTOS, "rtos")
57+
RTOS_ABSTRACTION = RTOS
5858

5959
RTOS_LIBRARIES = join(BUILD_DIR, "rtos")
6060

0 commit comments

Comments
 (0)