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

Commit 5d813b7

Browse files
author
Yogesh Pande
authored
Merge branch 'master' into fix_blinky_thread
2 parents 4893cf3 + d70075f commit 5d813b7

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,12 @@ To build the example using mbed CLI:
313313
314314
If you are using either of the following configurations remember to copy .mbedignore as well:
315315
316-
```
316+
```
317317
configs/eth_*
318318
configs/wifi_*
319-
```
319+
```
320320
321-
```
321+
```
322322
cp configs/eth-wifi-mbedignore ./.mbedignore
323323
```
324324
@@ -351,7 +351,8 @@ The application prints debug messages over the serial port, so you can monitor i
351351
After connecting, you should see messages about connecting to mbed Device Connector:
352352
353353
```
354-
Starting mbed Client example in IPv4 mode
354+
Starting mbed Client example
355+
[EasyConnect] IPv4 mode
355356
[EasyConnect] Using Ethernet
356357
[EasyConnect] Connected to Network successfully
357358
[EasyConnect] IP address 192.168.8.110

easy-connect.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/easy-connect/#6fb5842becaefd360f57916a587b5a0ffdc45ff0
1+
https://github.com/ARMmbed/easy-connect/#d827cdb1c3fb5a419b721646a2e1fc49fbd3fdf0

main.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,7 @@ Add MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES and MBEDTLS_TEST_NULL_ENTROPY in mbed_app
364364
// Keep track of the main thread
365365
mainThread = osThreadGetId();
366366
367-
printf("\nStarting mbed Client example in ");
368-
#if defined (MESH) || (MBED_CONF_LWIP_IPV6_ENABLED==true)
369-
printf("IPv6 mode\n");
370-
#else
371-
printf("IPv4 mode\n");
372-
#endif
367+
printf("\nStarting mbed Client example\n");
373368
374369
mbed_trace_init();
375370

mbed-client.lib

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
https://github.com/ARMmbed/mbed-client/#f8f0fc8b93210fe3791f89774b311cb6795a959b
2-
1+
https://github.com/ARMmbed/mbed-client/#31e5ce203cc0f3e5c5e3fe5e01b396d7fe2ee8f9

mbed-os.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#ed4febefdede4e88743ca12909b7bc9a3993889a
1+
https://github.com/ARMmbed/mbed-os/#8d21974ba35e04c4854e5090c0f8283171664175

0 commit comments

Comments
 (0)