diff --git a/Jenkinsfile b/Jenkinsfile index c677a76..cb8d1f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,6 @@ def toolchains = [ def configurations = [ LOWPAN: "6lowpan_Atmel_RF.json", THREAD: "Thread_Atmel_RF.json", - THREAD_SLIP: "Thread_SLIP_Atmel_RF.json", WI_SUN: "Wisun_Stm_s2lp_RF.json" ] diff --git a/configs/6lowpan_Atmel_RF.json b/configs/6lowpan_Atmel_RF.json index 6830bea..72584dd 100644 --- a/configs/6lowpan_Atmel_RF.json +++ b/configs/6lowpan_Atmel_RF.json @@ -5,7 +5,7 @@ "value": "ATMEL" }, "backhaul-driver": { - "help": "options are ETH, SLIP, EMAC, CELL", + "help": "options are ETH, EMAC, CELL", "value": "EMAC" }, "mesh-mode": { diff --git a/configs/6lowpan_Spirit1_RF.json b/configs/6lowpan_Spirit1_RF.json index a97815a..fcacc3f 100644 --- a/configs/6lowpan_Spirit1_RF.json +++ b/configs/6lowpan_Spirit1_RF.json @@ -5,7 +5,7 @@ "value": "SPIRIT1" }, "backhaul-driver": { - "help": "options are ETH, SLIP, EMAC, CELL", + "help": "options are ETH, EMAC, CELL", "value": "EMAC" }, "mesh-mode": { diff --git a/configs/Thread_Atmel_RF.json b/configs/Thread_Atmel_RF.json index 42dd322..a154b25 100644 --- a/configs/Thread_Atmel_RF.json +++ b/configs/Thread_Atmel_RF.json @@ -5,7 +5,7 @@ "value": "ATMEL" }, "backhaul-driver": { - "help": "options are ETH, SLIP, EMAC, CELL", + "help": "options are ETH, EMAC, CELL", "value": "EMAC" }, "mesh-mode": { diff --git a/configs/Thread_SLIP_Atmel_RF.json b/configs/Thread_SLIP_Atmel_RF.json deleted file mode 100644 index 4b9f907..0000000 --- a/configs/Thread_SLIP_Atmel_RF.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "config": { - "radio-type":{ - "help": "options are ATMEL, MCR20", - "value": "ATMEL" - }, - "backhaul-driver": { - "help": "options are ETH, SLIP, EMAC, CELL", - "value": "SLIP" - }, - "mesh-mode": { - "help": "Mesh networking mode. Options are LOWPAN_ND and THREAD", - "value": "THREAD" - }, - "backhaul-mac-src": { - "help": "Where to get EUI48 address. Options are BOARD, CONFIG", - "value": "BOARD" - }, - "backhaul-mld": { - "help": "Enable proxying Multicast Listener Discovery messages to backhaul network", - "value": "false" - }, - "nanostack_extended_heap": { - "help": "Add additional memory region to nanostack heap. Valid only for selected platforms. Region size may vary depending of the toolchain.", - "value": false - }, - "backhaul-mac": "{0x02, 0x00, 0x00, 0x00, 0x00, 0x01}", - "slip_hw_flow_control": "true", - "slip_serial_baud_rate": "921600", - "rf-channel": 22, - "rf-channel-page": 0, - "rf-channel-mask": "0x07fff800", - "debug-trace": 1, - "backhaul-dynamic-bootstrap": true, - "backhaul-prefix": "\"fd00:300::\"", - "backhaul-next-hop": "\"fe80::1\"", - "backhaul-default-route": "\"::/0\"", - "commissioning-dataset-timestamp": "0x00010000", - "pan-id": "0x0700", - "extended-pan-id": "{0xf1, 0xb5, 0xa1, 0xb2,0xc4, 0xd5, 0xa1, 0xbd }", - "mesh-local-prefix": "{0xfd, 0x0, 0x0d, 0xb8, 0x0, 0x0, 0x0, 0x0}", - "network-name": "\"Thread Network\"", - "pskd": "\"ABCDEFGH\"", - "pskc": "{0xc8, 0xa6, 0x2e, 0xae, 0xf3, 0x68, 0xf3, 0x46, 0xa9, 0x9e, 0x57, 0x85, 0x98, 0x9d, 0x1c, 0xd0}", - "thread-master-key": "{0x10, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}", - "thread-use-static-link-config": true, - "thread-security-policy": 255, - "LED": "NC", - "SERIAL_TX": "NC", - "SERIAL_RX": "NC", - "SERIAL_CTS": "NC", - "SERIAL_RTS": "NC" - }, - "macros": ["MBEDTLS_USER_CONFIG_FILE=\"source/mbedtls_thread_config.h\"", "ATMEL_SPI_RST=PTD4"], - "target_overrides": { - "*": { - "target.network-default-interface-type": "ETHERNET", - "nsapi.default-stack": "NANOSTACK", - "mbed-trace.enable": 1, - "nanostack.configuration": "thread_border_router", - "platform.stdio-convert-newlines": true, - "platform.stdio-baud-rate": 115200, - "mbed-mesh-api.heap-size": 65535, - "mbed-mesh-api.heap-stat-info": "&memory_heap_stat", - "mbed-mesh-api.heap-stat-info-definition": "mem_stat_t memory_heap_stat;" - }, - "K64F": { - "LED": "LED_GREEN", - "SERIAL_TX": "PTE0", - "SERIAL_RX": "PTE1", - "SERIAL_CTS": "PTE2", - "SERIAL_RTS": "PTE3" - }, - "K66F": { - "LED": "LED_GREEN" - } - } -} diff --git a/configs/Wisun_Stm_s2lp_RF.json b/configs/Wisun_Stm_s2lp_RF.json index 565e074..fda84d4 100644 --- a/configs/Wisun_Stm_s2lp_RF.json +++ b/configs/Wisun_Stm_s2lp_RF.json @@ -5,7 +5,7 @@ "value": "S2LP" }, "backhaul-driver": { - "help": "options are ETH, SLIP, EMAC, CELL", + "help": "options are ETH, EMAC, CELL", "value": "EMAC" }, "mesh-mode": { diff --git a/configs/Wisun_Stm_s2lp_RF_cell.json b/configs/Wisun_Stm_s2lp_RF_cell.json index 0a56843..fa7d2c4 100644 --- a/configs/Wisun_Stm_s2lp_RF_cell.json +++ b/configs/Wisun_Stm_s2lp_RF_cell.json @@ -5,7 +5,7 @@ "value": "S2LP" }, "backhaul-driver": { - "help": "options are ETH, SLIP, EMAC, CELL", + "help": "options are ETH, EMAC, CELL", "value": "CELL" }, "mesh-mode": { diff --git a/configs/Wisun_Stm_s2lp_RF_lab.json b/configs/Wisun_Stm_s2lp_RF_lab.json index 33ff205..47ba920 100644 --- a/configs/Wisun_Stm_s2lp_RF_lab.json +++ b/configs/Wisun_Stm_s2lp_RF_lab.json @@ -5,7 +5,7 @@ "value": "S2LP" }, "backhaul-driver": { - "help": "options are ETH, SLIP, EMAC, CELL", + "help": "options are ETH, EMAC, CELL", "value": "EMAC" }, "mesh-mode": { diff --git a/drivers/sal-stack-nanostack-slip.lib b/drivers/sal-stack-nanostack-slip.lib deleted file mode 100644 index 4298225..0000000 --- a/drivers/sal-stack-nanostack-slip.lib +++ /dev/null @@ -1 +0,0 @@ -https://github.com/ARMmbed/sal-stack-nanostack-slip/#b3a969bc474a3cf39c2c5720bf98f3d29170bc2b diff --git a/mbed_app.json b/mbed_app.json index 5f698a6..d1c7ea6 100644 --- a/mbed_app.json +++ b/mbed_app.json @@ -5,7 +5,7 @@ "value": "ATMEL" }, "backhaul-driver": { - "help": "options are ETH, SLIP, EMAC", + "help": "options are ETH, EMAC", "value": "EMAC" }, "mesh-mode": { diff --git a/source/border_router_main.cpp b/source/border_router_main.cpp index f79b158..327966e 100644 --- a/source/border_router_main.cpp +++ b/source/border_router_main.cpp @@ -8,7 +8,6 @@ #include "mbed.h" #include "borderrouter_tasklet.h" #include "drivers/eth_driver.h" -#include "sal-stack-nanostack-slip/Slip.h" #include "Nanostack.h" #include "NanostackEthernetInterface.h"