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

Commit d4ad6c3

Browse files
author
Janne Kiiskilä
committed
WIFI_REALTEK to WIFI_RTW, NANOSTACK to features
The name of the WIFI should follow the actual class name, this aligns the example code as well to match the change done in easy-connect. Adding NANOSTACK to features as well - this enables the code to compile even with the .mbedignore and now it also works again (there were issues prior that ethernet would not work, if nanostack was included). This should remove the need to have the .mbedignore files now.
1 parent 532f527 commit d4ad6c3

12 files changed

+35
-25
lines changed

‎build_all.sh

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
#
33
set -e
44
TOOL=GCC_ARM
5-
5+
echo
6+
echo Assuming mbed deploy is already run.
7+
echo
68
echo Compiling with $TOOL
79
echo Ethernet v4
810
cp configs/eth_v4.json ./mbed_app.json
9-
cp configs/eth-wifi-mbedignore ./.mbedignore
11+
#cp configs/eth-wifi-mbedignore ./.mbedignore
1012
mbed compile -m K64F -t $TOOL
1113
cp BUILD/K64F/$TOOL/mbed-os-example-client.bin k64f-$TOOL-eth-v4.bin
1214
mbed compile -m NUCLEO_F429ZI -t $TOOL
@@ -16,7 +18,7 @@ cp ./BUILD/UBLOX_EVK_ODIN_W2/$TOOL/mbed-os-example-client.bin ublox-odin-$TOOL-e
1618

1719
echo Ethernet v6
1820
cp configs/eth_v6.json ./mbed_app.json
19-
cp configs/eth-wifi-mbedignore ./.mbedignore
21+
#cp configs/eth-wifi-mbedignore ./.mbedignore
2022
mbed compile -m K64F -t $TOOL
2123
cp BUILD/K64F/$TOOL/mbed-os-example-client.bin k64f-$TOOL-eth-v6.bin
2224
mbed compile -m NUCLEO_F429ZI -t $TOOL
@@ -26,36 +28,43 @@ cp ./BUILD/UBLOX_EVK_ODIN_W2/$TOOL/mbed-os-example-client.bin ublox-odin-$TOOL-e
2628

2729
echo WIFI - ESP8266
2830
cp configs/wifi_esp8266_v4.json ./mbed_app.json
29-
cp configs/eth-wifi-mbedignore ./.mbedignore
31+
#cp configs/eth-wifi-mbedignore ./.mbedignore
3032
mbed compile -m K64F -t $TOOL
3133
cp BUILD/K64F/$TOOL/mbed-os-example-client.bin k64f-$TOOL-esp-wifi-v4.bin
3234
mbed compile -m NUCLEO_F429ZI -t $TOOL
3335
cp ./BUILD/NUCLEO_F429ZI/$TOOL/mbed-os-example-client.bin f429zi-$TOOL-esp-wifi-v4.bin
3436

3537
echo WIFI - ODIN for UBLOX_EVK_ODIN_W2
3638
cp configs/wifi_odin_v4.json ./mbed_app.json
37-
cp configs/eth-wifi-mbedignore ./.mbedignore
39+
#cp configs/eth-wifi-mbedignore ./.mbedignore
3840
mbed compile -m UBLOX_EVK_ODIN_W2 -t $TOOL
3941
cp ./BUILD/UBLOX_EVK_ODIN_W2/$TOOL/mbed-os-example-client.bin ublox-odin-$TOOL-wifi-v4.bin
4042

4143
echo 6-Lowpan builds
4244
cp configs/mesh_6lowpan.json ./mbed_app.json
43-
cp configs/mesh-mbedignore ./.mbedignore
45+
#cp configs/mesh-mbedignore ./.mbedignore
4446
mbed compile -m K64F -t $TOOL
4547
cp BUILD/K64F/$TOOL/mbed-os-example-client.bin k64f-$TOOL-6lowpan.bin
4648
mbed compile -m NUCLEO_F429ZI -t $TOOL
4749
cp ./BUILD/NUCLEO_F429ZI/$TOOL/mbed-os-example-client.bin f429zi-$TOOL-6lowpan.bin
4850

4951
echo 6-Lowpan Sub-1 GHz builds
5052
cp configs/mesh_6lowpan_subg.json ./mbed_app.json
51-
cp configs/mesh-mbedignore ./.mbedignore
53+
#cp configs/mesh-mbedignore ./.mbedignore
5254
mbed compile -m NUCLEO_F429ZI -t $TOOL
5355
cp ./BUILD/NUCLEO_F429ZI/$TOOL/mbed-os-example-client.bin f429zi-$TOOL-6lowpan-subg.bin
5456

5557
echo Thread builds
5658
cp configs/mesh_thread.json ./mbed_app.json
57-
cp configs/mesh-mbedignore ./.mbedignore
59+
#cp configs/mesh-mbedignore ./.mbedignore
5860
mbed compile -m K64F -t $TOOL
5961
cp BUILD/K64F/$TOOL/mbed-os-example-client.bin k64f-$TOOL-Thread.bin
6062
mbed compile -m NUCLEO_F429ZI -t $TOOL
6163
cp ./BUILD/NUCLEO_F429ZI/$TOOL/mbed-os-example-client.bin f429zi-$TOOL-Thread.bin
64+
65+
66+
echo WIFI - RTW for REALTEK_RTL8195AM
67+
cp configs/wifi_realtek_v4.json ./mbed_app.json
68+
mbed compile -m REALTEK_RTL8195AM -t $TOOL
69+
cp ./BUILD/REALTEK_RTL8195AM/$TOOL/mbed-os-example-client.bin realtek-rtl8195am-$TOOL-wifi-v4.bin
70+

‎configs/eth_v4.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, MESH_LOWPAN_ND, MESH_THREAD",
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD",
55
"value": "ETHERNET"
66
}
77
},
88
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_mbed_client_config.h\""],
99
"target_overrides": {
1010
"*": {
11-
"target.features_add": ["LWIP", "COMMON_PAL"],
11+
"target.features_add": ["NANOSTACK", "LWIP", "COMMON_PAL"],
1212
"platform.stdio-baud-rate": 115200,
1313
"platform.stdio-convert-newlines": true,
1414
"lwip.ipv4-enabled": true,

‎configs/eth_v6.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_REALTEK, MESH_LOWPAN_ND, MESH_THREAD",
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD",
55
"value": "ETHERNET"
66
}
77
},
88
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_mbed_client_config.h\""],
99
"target_overrides": {
1010
"*": {
11-
"target.features_add": ["LWIP", "COMMON_PAL"],
11+
"target.features_add": ["NANOSTACK", "LWIP", "COMMON_PAL"],
1212
"platform.stdio-baud-rate": 115200,
1313
"platform.stdio-convert-newlines": true,
1414
"lwip.ipv4-enabled": false,

‎configs/mesh_6lowpan.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_REALTEK, MESH_LOWPAN_ND, MESH_THREAD",
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD",
55
"value": "MESH_LOWPAN_ND"
66
},
77
"mesh_radio_type": {

‎configs/mesh_6lowpan_subg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_REALTEK, MESH_LOWPAN_ND, MESH_THREAD",
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD",
55
"value": "MESH_LOWPAN_ND"
66
},
77
"mesh_radio_type": {

‎configs/mesh_thread.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_REALTEK, MESH_LOWPAN_ND, MESH_THREAD",
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD",
55
"value": "MESH_THREAD"
66
},
77
"mesh_radio_type": {

‎configs/wifi_esp8266_v4.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_REALTEK, MESH_LOWPAN_ND, MESH_THREAD",
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD",
55
"value": "WIFI_ESP8266"
66
},
77
"wifi-ssid": {
@@ -24,7 +24,7 @@
2424
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_mbed_client_config.h\""],
2525
"target_overrides": {
2626
"*": {
27-
"target.features_add": ["COMMON_PAL"],
27+
"target.features_add": ["NANOSTACK", "COMMON_PAL"],
2828
"platform.stdio-baud-rate": 115200,
2929
"platform.stdio-convert-newlines": true,
3030
"mbed-trace.enable": 0

‎configs/wifi_odin_v4.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_REALTEK, MESH_LOWPAN_ND, MESH_THREAD",
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD",
55
"value": "WIFI_ODIN"
66
},
77
"wifi-ssid": {
@@ -24,7 +24,7 @@
2424
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_mbed_client_config.h\""],
2525
"target_overrides": {
2626
"*": {
27-
"target.features_add": ["LWIP", "COMMON_PAL"],
27+
"target.features_add": ["NANOSTACK", "LWIP", "COMMON_PAL"],
2828
"platform.stdio-baud-rate": 115200,
2929
"platform.stdio-convert-newlines":true,
3030
"lwip.ipv4-enabled": true,

‎configs/wifi_realtek_v4.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, MESH_LOWPAN_ND, MESH_THREAD",
5-
"value": "WIFI_REALTEK"
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD",
5+
"value": "WIFI_RTW"
66
},
77
"wifi-ssid": {
88
"help": "WiFi SSID",
@@ -24,7 +24,7 @@
2424
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_mbed_client_config.h\""],
2525
"target_overrides": {
2626
"*": {
27-
"target.features_add": ["COMMON_PAL"],
27+
"target.features_add": ["NANOSTACK", "COMMON_PAL"],
2828
"platform.stdio-baud-rate": 115200,
2929
"platform.stdio-convert-newlines": true,
3030
"mbed-trace.enable": 0

‎configs/wifi_v4.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_REALTEK, MESH_LOWPAN_ND, MESH_THREAD",
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD",
55
"value": "WIFI_ESP8266"
66
},
77
"wifi-ssid": {
@@ -24,7 +24,7 @@
2424
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_mbed_client_config.h\""],
2525
"target_overrides": {
2626
"*": {
27-
"target.features_add": ["LWIP", "COMMON_PAL"],
27+
"target.features_add": ["NANOSTACK", "LWIP", "COMMON_PAL"],
2828
"platform.stdio-baud-rate": 115200,
2929
"platform.stdio-convert-newlines": true,
3030
"lwip.ipv4-enabled": true,

‎easy-connect.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
https://github.com/ARMmbed/easy-connect/#bf821b0695ccada3620a6091503eb53a2a1ac3c8
22

3+

‎mbed_app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"config": {
33
"network-interface":{
4-
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, MESH_LOWPAN_ND, MESH_THREAD, CELLULAR_ONBOARD",
4+
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD, CELLULAR_ONBOARD",
55
"value": "ETHERNET"
66
},
77
"mesh_radio_type": {

0 commit comments

Comments
 (0)