ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated greentea test configurations to use default interface 

Created one configuration .json file for boards with internal
wifi (HeapBlockDeviceAndWifiInterface.json). Removed dedicated
Odin, Wiced and Realtek wifi configuration files. Removed Odin
ethernet configuration file and replaced that with general
ethernet configuration.
pull/7812/head
Mika Leppänen 2018-08-16 10:40:14 +03:00
parent 06302cb10e
commit 9e73e80926
12 changed files with 65 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/test_configs/ESP8266Interface.json
View File

@ -1,16 +1,5 @@
{
"config": {
"header-file": {
"help" : "String for including your driver header file",
"value" : "\"ESP8266Interface.h\""
},
"object-construction" : {
"value" : "new ESP8266Interface( D1, D0, false )"
},
"connect-statement" : {
"help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
"value" : "((ESP8266Interface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
},
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
@ -18,20 +7,15 @@
"echo-server-port" : {
"help" : "Port of echo server",
"value" : "7"
},
"tcp-echo-prefix" : {
"help" : "Some servers send a prefix before echoed message",
"value" : null
},
"tcp-client-echo-buffer-size" : {
"help" : "Number of bytes to be send to echo server",
"value" : "200"
},
"ESP8266-TX": {
"value":"D1"
},
"ESP8266-RX": {
"value":"D0"
}
},
"target_overrides": {
"*": {
"target.network-default-interface-type": "WIFI",
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
"nsapi.default-wifi-security": "WIFI_SECURITY",
"esp8266.provide-default": true
}
}
}

18
tools/test_configs/EthernetInterface.json
View File

@ -1,16 +1,5 @@
{
"config": {
"header-file": {
"help" : "String for including your driver header file",
"value" : "\"EthernetInterface.h\""
},
"object-construction" : {
"value" : "new EthernetInterface()"
},
"connect-statement" : {
"help" : "Must use 'net' variable name",
"value" : "net->connect()"
},
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
@ -18,16 +7,11 @@
"echo-server-port" : {
"help" : "Port of echo server",
"value" : "7"
},
"tcp-echo-prefix" : {
"help" : "Some servers send a prefix before echoed message",
"value" : null
}
},
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
"target.network-default-interface-type": "ETHERNET"
}
}
}

18
tools/test_configs/HeapBlockDeviceAndEthernetInterface.json
View File

@ -1,16 +1,5 @@
{
"config": {
"header-file": {
"help" : "String for including your driver header file",
"value" : "\"EthernetInterface.h\""
},
"object-construction" : {
"value" : "new EthernetInterface()"
},
"connect-statement" : {
"help" : "Must use 'net' variable name",
"value" : "net->connect()"
},
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
@ -19,10 +8,6 @@
"help" : "Port of echo server",
"value" : "7"
},
"tcp-echo-prefix" : {
"help" : "Some servers send a prefix before echoed message",
"value" : null
},
"sim-blockdevice": {
"help": "Simulated block device, requires sufficient heap",
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
@ -31,8 +16,7 @@
},
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
"target.network-default-interface-type": "ETHERNET"
}
}
}

25
tools/test_configs/HeapBlockDeviceAndWifiInterface.json Normal file
View File

@ -0,0 +1,25 @@
{
"config": {
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
},
"echo-server-port" : {
"help" : "Port of echo server",
"value" : "7"
},
"sim-blockdevice": {
"help": "Simulated block device, requires sufficient heap",
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
"value": "HeapBlockDevice"
}
},
"target_overrides": {
"*": {
"target.network-default-interface-type": "WIFI",
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
"nsapi.default-wifi-security": "WIFI_SECURITY"
}
}
}

26
tools/test_configs/ISM43362Interface.json
View File

@ -1,16 +1,5 @@
{
"config": {
"header-file": {
"help" : "String for including your driver header file",
"value" : "\"ISM43362Interface.h\""
},
"object-construction" : {
"value" : "new ISM43362Interface()"
},
"connect-statement" : {
"help" : "Must use 'net' variable name",
"value" : "net->wifiInterface()->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2)"
},
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
@ -19,14 +8,6 @@
"help" : "Port of echo server",
"value" : "7"
},
"tcp-echo-prefix" : {
"help" : "Some servers send a prefix before echoed message",
"value" : null
},
"tcp-client-echo-buffer-size" : {
"help" : "Number of bytes to be send to echo server",
"value" : "200"
},
"wifi-secure-ssid": {
"help": "WiFi SSID for WPA2 secured network",
"value": "\"SSID-SECURE\""
@ -66,7 +47,12 @@
},
"target_overrides": {
"*": {
"platform.stdio-convert-newlines": true
"platform.stdio-convert-newlines": true,
"target.network-default-interface-type": "WIFI",
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
"nsapi.default-wifi-security": "WIFI_SECURITY",
"ism43362.provide-default": true
}
}
}

38
tools/test_configs/OdinInterface.json
View File

@ -1,38 +0,0 @@
{
"config": {
"header-file": {
"help" : "String for including your driver header file",
"value" : "\"OdinWiFiInterface.h\""
},
"object-construction" : {
"value" : "new OdinWiFiInterface()"
},
"connect-statement" : {
"help" : "Must use 'net' variable name",
"value" : "net->wifiInterface()->connect(WIFI_SSID, WIFI_PASSWORD)"
},
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
},
"echo-server-port" : {
"help" : "Port of echo server",
"value" : "7"
},
"tcp-echo-prefix" : {
"help" : "Some servers send a prefix before echoed message",
"value" : null
},
"sim-blockdevice": {
"help": "Simulated block device, requires sufficient heap",
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
"value": "HeapBlockDevice"
}
},
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
}
}
}

38
tools/test_configs/Odin_EthernetInterface.json
View File

@ -1,38 +0,0 @@
{
"config": {
"header-file": {
"help" : "String for including your driver header file",
"value" : "\"EthernetInterface.h\""
},
"object-construction" : {
"value" : "new EthernetInterface()"
},
"connect-statement" : {
"help" : "Must use 'net' variable name",
"value" : "net->connect()"
},
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
},
"echo-server-port" : {
"help" : "Port of echo server",
"value" : "7"
},
"tcp-echo-prefix" : {
"help" : "Some servers send a prefix before echoed message",
"value" : null
},
"sim-blockdevice": {
"help": "Simulated block device, requires sufficient heap",
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
"value": "HeapBlockDevice"
}
},
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
}
}
}

38
tools/test_configs/RealtekInterface.json
View File

@ -1,38 +0,0 @@
{
"config": {
"header-file": {
"help" : "String for including your driver header file",
"value" : "\"RTWInterface.h\""
},
"object-construction" : {
"value" : "new RTWInterface()"
},
"connect-statement" : {
"help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL with your WiFi settings",
"value" : "net->wifiInterface()->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL)"
},
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
},
"echo-server-port" : {
"help" : "Port of echo server",
"value" : "7"
},
"tcp-echo-prefix" : {
"help" : "Some servers send a prefix before echoed message",
"value" : null
},
"sim-blockdevice": {
"help": "Simulated block device, requires sufficient heap",
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
"value": "HeapBlockDevice"
}
},
"target_overrides": {
"*": {
"target.features_add": ["LWIP"],
"nsapi.default-stack": "LWIP"
}
}
}

30
tools/test_configs/SpwfSAInterface.json
View File

@ -1,16 +1,5 @@
{
"config": {
"header-file": {
"help" : "String for including your driver header file",
"value" : "\"SpwfSAInterface.h\""
},
"object-construction" : {
"value" : "new SpwfSAInterface( D8, D2 )"
},
"connect-statement" : {
"help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
"value" : "((SpwfSAInterface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
},
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
@ -19,9 +8,22 @@
"help" : "Port of echo server",
"value" : "7"
},
"tcp-echo-prefix" : {
"help" : "Some servers send a prefix before echoed message",
"value" : null
"WIFI-TX" : {
"help" : "Wifi TX pin",
"value" : "D8"
},
"WIFI-RX" : {
"help" : "Wifi RX pin",
"value" : "D2"
}
},
"target_overrides": {
"*": {
"target.network-default-interface-type": "WIFI",
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
"nsapi.default-wifi-security": "WIFI_SECURITY",
"idw0xx1.provide-default": true
}
}
}

49
tools/test_configs/WicedInterface.json
View File

@ -1,49 +0,0 @@
{
"config": {
"header-file": {
"help" : "String for including your driver header file",
"value" : "\"WicedInterface.h\""
},
"object-construction" : {
"value" : "new WicedInterface()"
},
"connect-statement" : {
"help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
"value" : "net->wifiInterface()->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
},
"echo-server-addr" : {
"help" : "IP address of echo server",
"value" : "\"echo.mbedcloudtesting.com\""
},
"echo-server-port" : {
"help" : "Port of echo server",
"value" : "7"
},
"tcp-echo-prefix" : {
"help" : "Some servers send a prefix before echoed message",
"value" : null
},
"sim-blockdevice": {
"help": "Simulated block device, requires sufficient heap",
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
"value": "HeapBlockDevice"
}
},
"target_overrides": {
"*": {
"nsapi.default-stack": "LWIP"
},
"MTB_ADV_WISE_1530": {
"target.extra_labels_add": ["WICED"],
"target.features_add": ["BLE", "LWIP"]
},
"MTB_USI_WM_BN_BM_22": {
"target.extra_labels_add": ["WICED"],
"target.features_add": ["BLE", "LWIP"]
},
"MTB_MXCHIP_EMW3166": {
"target.extra_labels_add": ["WICED"],
"target.features_add": ["LWIP"]
}
}
}

5
tools/test_configs/config_paths.json
View File

@ -2,11 +2,8 @@
"ETHERNET" : "EthernetInterface.json",
"HEAPBLOCKDEVICE": "HeapBlockDevice.json",
"HEAPBLOCKDEVICE_AND_ETHERNET": "HeapBlockDeviceAndEthernetInterface.json",
"ODIN_WIFI" : "OdinInterface.json",
"ODIN_ETHERNET" : "Odin_EthernetInterface.json",
"REALTEK_WIFI" : "RealtekInterface.json",
"HEAPBLOCKDEVICE_AND_WIFI": "HeapBlockDeviceAndWifiInterface.json",
"ESP8266_WIFI" : "ESP8266Interface.json",
"WICED_WIFI" : "WicedInterface.json",
"ISM43362_WIFI" : "ISM43362Interface.json",
"IDW0XX1_WIFI" : "SpwfSAInterface.json"
}

12
tools/test_configs/target_configs.json
View File

@ -1,11 +1,11 @@
{
"UBLOX_EVK_ODIN_W2": {
"default_test_configuration": "NONE",
"test_configurations": ["ODIN_WIFI", "ODIN_ETHERNET"]
"test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI", "HEAPBLOCKDEVICE_AND_ETHERNET"]
},
"REALTEK_RTL8195AM": {
"default_test_configuration": "NONE",
"test_configurations": ["REALTEK_WIFI"]
"test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
},
"K64F": {
"default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
@ -25,19 +25,19 @@
},
"MTB_UBLOX_ODIN_W2": {
"default_test_configuration": "NONE",
"test_configurations": ["ODIN_WIFI"]
"test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
},
"MTB_ADV_WISE_1530": {
"default_test_configuration": "NONE",
"test_configurations": ["WICED_WIFI"]
"test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
},
"MTB_USI_WM_BN_BM_22": {
"default_test_configuration": "NONE",
"test_configurations": ["WICED_WIFI"]
"test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
},
"MTB_MXCHIP_EMW3166": {
"default_test_configuration": "NONE",
"test_configurations": ["WICED_WIFI"]
"test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
},
"NUCLEO_F401RE": {
"default_test_configuration": "NONE",