Skip to content

Commit 9e73e80

Browse files
author
Mika Leppänen
committed
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.
1 parent 06302cb commit 9e73e80

12 files changed

+65
-266
lines changed

‎tools/test_configs/ESP8266Interface.json

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,21 @@
11
{
22
"config": {
3-
"header-file": {
4-
"help" : "String for including your driver header file",
5-
"value" : "\"ESP8266Interface.h\""
6-
},
7-
"object-construction" : {
8-
"value" : "new ESP8266Interface( D1, D0, false )"
9-
},
10-
"connect-statement" : {
11-
"help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
12-
"value" : "((ESP8266Interface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
13-
},
143
"echo-server-addr" : {
154
"help" : "IP address of echo server",
165
"value" : "\"echo.mbedcloudtesting.com\""
176
},
187
"echo-server-port" : {
198
"help" : "Port of echo server",
209
"value" : "7"
21-
},
22-
"tcp-echo-prefix" : {
23-
"help" : "Some servers send a prefix before echoed message",
24-
"value" : null
25-
},
26-
"tcp-client-echo-buffer-size" : {
27-
"help" : "Number of bytes to be send to echo server",
28-
"value" : "200"
29-
},
30-
"ESP8266-TX": {
31-
"value":"D1"
32-
},
33-
"ESP8266-RX": {
34-
"value":"D0"
10+
}
11+
},
12+
"target_overrides": {
13+
"*": {
14+
"target.network-default-interface-type": "WIFI",
15+
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
16+
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
17+
"nsapi.default-wifi-security": "WIFI_SECURITY",
18+
"esp8266.provide-default": true
3519
}
3620
}
3721
}

‎tools/test_configs/EthernetInterface.json

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,17 @@
11
{
22
"config": {
3-
"header-file": {
4-
"help" : "String for including your driver header file",
5-
"value" : "\"EthernetInterface.h\""
6-
},
7-
"object-construction" : {
8-
"value" : "new EthernetInterface()"
9-
},
10-
"connect-statement" : {
11-
"help" : "Must use 'net' variable name",
12-
"value" : "net->connect()"
13-
},
143
"echo-server-addr" : {
154
"help" : "IP address of echo server",
165
"value" : "\"echo.mbedcloudtesting.com\""
176
},
187
"echo-server-port" : {
198
"help" : "Port of echo server",
209
"value" : "7"
21-
},
22-
"tcp-echo-prefix" : {
23-
"help" : "Some servers send a prefix before echoed message",
24-
"value" : null
2510
}
2611
},
2712
"target_overrides": {
2813
"*": {
29-
"target.features_add": ["LWIP"],
30-
"nsapi.default-stack": "LWIP"
14+
"target.network-default-interface-type": "ETHERNET"
3115
}
3216
}
3317
}

‎tools/test_configs/HeapBlockDeviceAndEthernetInterface.json

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
{
22
"config": {
3-
"header-file": {
4-
"help" : "String for including your driver header file",
5-
"value" : "\"EthernetInterface.h\""
6-
},
7-
"object-construction" : {
8-
"value" : "new EthernetInterface()"
9-
},
10-
"connect-statement" : {
11-
"help" : "Must use 'net' variable name",
12-
"value" : "net->connect()"
13-
},
143
"echo-server-addr" : {
154
"help" : "IP address of echo server",
165
"value" : "\"echo.mbedcloudtesting.com\""
@@ -19,10 +8,6 @@
198
"help" : "Port of echo server",
209
"value" : "7"
2110
},
22-
"tcp-echo-prefix" : {
23-
"help" : "Some servers send a prefix before echoed message",
24-
"value" : null
25-
},
2611
"sim-blockdevice": {
2712
"help": "Simulated block device, requires sufficient heap",
2813
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
@@ -31,8 +16,7 @@
3116
},
3217
"target_overrides": {
3318
"*": {
34-
"target.features_add": ["LWIP"],
35-
"nsapi.default-stack": "LWIP"
19+
"target.network-default-interface-type": "ETHERNET"
3620
}
3721
}
3822
}

‎tools/test_configs/HeapBlockDeviceAndWifiInterface.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"config": {
3+
"echo-server-addr" : {
4+
"help" : "IP address of echo server",
5+
"value" : "\"echo.mbedcloudtesting.com\""
6+
},
7+
"echo-server-port" : {
8+
"help" : "Port of echo server",
9+
"value" : "7"
10+
},
11+
"sim-blockdevice": {
12+
"help": "Simulated block device, requires sufficient heap",
13+
"macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
14+
"value": "HeapBlockDevice"
15+
}
16+
},
17+
"target_overrides": {
18+
"*": {
19+
"target.network-default-interface-type": "WIFI",
20+
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
21+
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
22+
"nsapi.default-wifi-security": "WIFI_SECURITY"
23+
}
24+
}
25+
}

‎tools/test_configs/ISM43362Interface.json

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
{
22
"config": {
3-
"header-file": {
4-
"help" : "String for including your driver header file",
5-
"value" : "\"ISM43362Interface.h\""
6-
},
7-
"object-construction" : {
8-
"value" : "new ISM43362Interface()"
9-
},
10-
"connect-statement" : {
11-
"help" : "Must use 'net' variable name",
12-
"value" : "net->wifiInterface()->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2)"
13-
},
143
"echo-server-addr" : {
154
"help" : "IP address of echo server",
165
"value" : "\"echo.mbedcloudtesting.com\""
@@ -19,14 +8,6 @@
198
"help" : "Port of echo server",
209
"value" : "7"
2110
},
22-
"tcp-echo-prefix" : {
23-
"help" : "Some servers send a prefix before echoed message",
24-
"value" : null
25-
},
26-
"tcp-client-echo-buffer-size" : {
27-
"help" : "Number of bytes to be send to echo server",
28-
"value" : "200"
29-
},
3011
"wifi-secure-ssid": {
3112
"help": "WiFi SSID for WPA2 secured network",
3213
"value": "\"SSID-SECURE\""
@@ -66,7 +47,12 @@
6647
},
6748
"target_overrides": {
6849
"*": {
69-
"platform.stdio-convert-newlines": true
50+
"platform.stdio-convert-newlines": true,
51+
"target.network-default-interface-type": "WIFI",
52+
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
53+
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
54+
"nsapi.default-wifi-security": "WIFI_SECURITY",
55+
"ism43362.provide-default": true
7056
}
7157
}
7258
}

‎tools/test_configs/OdinInterface.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎tools/test_configs/Odin_EthernetInterface.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎tools/test_configs/RealtekInterface.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎tools/test_configs/SpwfSAInterface.json

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
{
22
"config": {
3-
"header-file": {
4-
"help" : "String for including your driver header file",
5-
"value" : "\"SpwfSAInterface.h\""
6-
},
7-
"object-construction" : {
8-
"value" : "new SpwfSAInterface( D8, D2 )"
9-
},
10-
"connect-statement" : {
11-
"help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
12-
"value" : "((SpwfSAInterface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
13-
},
143
"echo-server-addr" : {
154
"help" : "IP address of echo server",
165
"value" : "\"echo.mbedcloudtesting.com\""
@@ -19,9 +8,22 @@
198
"help" : "Port of echo server",
209
"value" : "7"
2110
},
22-
"tcp-echo-prefix" : {
23-
"help" : "Some servers send a prefix before echoed message",
24-
"value" : null
11+
"WIFI-TX" : {
12+
"help" : "Wifi TX pin",
13+
"value" : "D8"
14+
},
15+
"WIFI-RX" : {
16+
"help" : "Wifi RX pin",
17+
"value" : "D2"
18+
}
19+
},
20+
"target_overrides": {
21+
"*": {
22+
"target.network-default-interface-type": "WIFI",
23+
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
24+
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
25+
"nsapi.default-wifi-security": "WIFI_SECURITY",
26+
"idw0xx1.provide-default": true
2527
}
2628
}
2729
}

0 commit comments

Comments
 (0)