Skip to content
This repository was archived by the owner on Apr 24, 2019. It is now read-only.

mbed OS 5.5 preps, mbed OS to CMSIS branch & new PAL #254

Merged
merged 15 commits into from
Jun 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified GW_Binary/gateway6LoWPANDynamic.bin
100755 → 100644
Binary file not shown.
Binary file modified GW_Binary/gateway6LoWPANStatic.bin
100755 → 100644
Binary file not shown.
Binary file modified GW_Binary/gatewayThreadDynamic.bin
Binary file not shown.
Binary file modified GW_Binary/gatewayThreadStatic.bin
Binary file not shown.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ To do that, ping the Connector IPv6 address `2607:f0d0:2601:52::20` from your ne

#### Channel settings

The default 2.4GHz channel settings are already defined by the [mbed-mesh-api](https://github.com/ARMmbed/mbed-os/tree/master/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api) to match the mbed gateway settings. The application can override these settings by adding them to the `.json` file. For example:
The default 2.4GHz channel settings are already defined by the [mbed-mesh-api](https://github.com/ARMmbed/mbed-os/tree/master/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api) to match the Border Router settings. The application can override these settings by adding them to the `.json` file. For example:

```json
"target_overrides": {
Expand Down Expand Up @@ -138,11 +138,11 @@ There are two options for border router.

##### Nanostack-border-router

You can configure and build the [nanostack-border-router](https://github.com/ARMmbed/nanostack-border-router) for the 6LoWPAN ND or Thread mode.
You can configure and build the [nanostack-border-router](https://github.com/ARMmbed/nanostack-border-router) for the 6LoWPAN ND or Thread mode.

##### mbed gateway

The mbed gateway is a binary release only.
The mbed gateway is a binary release only. Please note, the mbed gateway will not be supported after the mbed-os 5.5 release.

To connect the example application in 6LoWPAN ND or Thread mode to mbed Device Connector, you need to set up an mbed 6LoWPAN gateway router as follows:

Expand Down
2 changes: 1 addition & 1 deletion easy-connect.lib
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/ARMmbed/easy-connect/#c8ede3d268665c0a0d207c89aff87ad96ceeaf7f
https://github.com/ARMmbed/easy-connect/#cc471beb7e26703b3a1ff77db365d284f1080505
2 changes: 1 addition & 1 deletion mbed-os.lib
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/ARMmbed/mbed-os/#fc1836545dcc2fc86f03b01292b62bf2089f67c3
https://github.com/ARMmbed/mbed-os/#3179b1cffddea0f0feed1dd551b0e7dc946c12f5
2 changes: 1 addition & 1 deletion pal.lib
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/ARMmbed/pal/#4e46c0ea870631bb5bec3e4aa9fd7eebf3db21f0
https://github.com/ARMmbed/pal/#240ac0b9b82ae2b8e62037164d926fece8f79e02