Nanostack Border Router is a generic mbed border router implementation that provides the 6LoWPAN ND or Thread border router initialization logic.

Files at this revision

API Documentation at this revision

Comitter:
mbed_official
Date:
Wed Sep 26 15:45:46 2018 +0100
Parent:
76:35bfdfdb6024
Child:
78:c434f72beedd
Commit message:
Merge pull request #138 from ARMmbed/mbed-os-5.10-merge

Merging Mbed OS 5.10 to master
.
Commit copied from https://github.com/ARMmbed/nanostack-border-router

Changed in this revision

Jenkinsfile Show annotated file Show diff for this revision Revisions of this file
mbed-os.lib Show annotated file Show diff for this revision Revisions of this file
--- a/Jenkinsfile	Mon Sep 10 12:15:34 2018 +0100
+++ b/Jenkinsfile	Wed Sep 26 15:45:46 2018 +0100
@@ -1,5 +1,5 @@
 properties ([[$class: 'ParametersDefinitionProperty', parameterDefinitions: [
-  [$class: 'StringParameterDefinition', name: 'mbed_os_revision', defaultValue: '', description: 'Revision of mbed-os to build. To access mbed-os PR use format "pull/PR number/head"']
+  [$class: 'StringParameterDefinition', name: 'mbed_os_revision', defaultValue: '', description: 'Revision of mbed-os to build. By default mbed-os.lib is used. To access mbed-os PR use format "pull/PR number/head"']
   ]]])
 
 if (params.mbed_os_revision == '') {
@@ -21,7 +21,7 @@
 // Map toolchains to CI labels
 def toolchains = [
   ARM: "armcc",
-  ARMC6: "armc6",
+//  ARMC6: "armc6",
   GCC_ARM: "arm-none-eabi-gcc",
   IAR: "iar_arm"
   ]
@@ -66,8 +66,6 @@
         dir("nanostack-border-router") {
           checkout scm
           execute("mbed deploy --protocol ssh")
-          execute ("mbed add mcr20a-rf-driver")
-          execute ("mbed add atmel-rf-driver")
           // Update mbed-os revision if requested
           if (params.mbed_os_revision != '') {
             dir ("mbed-os") {
--- a/mbed-os.lib	Mon Sep 10 12:15:34 2018 +0100
+++ b/mbed-os.lib	Wed Sep 26 15:45:46 2018 +0100
@@ -1,1 +1,1 @@
-https://github.com/ARMmbed/mbed-os/#949cb49ab0a144da0e3b04b6af46db0cd2a20d75
+https://github.com/ARMmbed/mbed-os/#610e35ddc6d59f153173c1e7b2748cf96d6c9bcd