Proyecto integrador para asignatura de Especialización
Revision 22:1b8c2a81c85d, committed 2018-01-02
- Comitter:
- Jan Jongboom
- Date:
- Tue Jan 02 15:20:08 2018 +0000
- Parent:
- 21:903bdf9a49f4
- Child:
- 23:6a9d776c9794
- Commit message:
- Update easy-connect, Mbed OS to 5.7.1, add IPv6 example
Changed in this revision
--- a/easy-connect.lib Fri Dec 15 09:18:00 2017 +0700 +++ b/easy-connect.lib Tue Jan 02 15:20:08 2018 +0000 @@ -1,1 +1,1 @@ -https://github.com/ARMmbed/easy-connect/#298f798045ecdf353c1108bd2c699607dcb1493f +https://github.com/ARMmbed/easy-connect/#542e3ab6d180e362b1344d9736ac1e8e4986934b
--- a/mbed-os.lib Fri Dec 15 09:18:00 2017 +0700 +++ b/mbed-os.lib Tue Jan 02 15:20:08 2018 +0000 @@ -1,1 +1,1 @@ -https://github.com/ARMmbed/mbed-os/#8828635da469162cf2854b5287561c663fb96e72 \ No newline at end of file +https://github.com/ARMmbed/mbed-os/#2b4ff78ab0a52ef1dc3f2998908453c595e2b2c0 \ No newline at end of file
--- a/mbed_app.json Fri Dec 15 09:18:00 2017 +0700
+++ b/mbed_app.json Tue Jan 02 15:20:08 2018 +0000
@@ -1,13 +1,35 @@
{
"config": {
"network-interface": {
- "help": "options are ETHERNET,WIFI_ESP8266,WIFI_ODIN,MESH_LOWPAN_ND,MESH_THREAD",
+ "help": "options are ETHERNET, WIFI_ESP8266, WIFI_IDW0XX1, WIFI_ODIN, WIFI_RTW, MESH_LOWPAN_ND, MESH_THREAD, CELLULAR_ONBOARD",
"value": "ETHERNET"
},
"mesh_radio_type": {
- "help": "options are ATMEL, MCR20",
+ "help": "options are ATMEL, MCR20, SPIRIT1, EFR32",
"value": "ATMEL"
},
+ "wifi-ssid": {
+ "value": "\"SSID\""
+ },
+ "wifi-password": {
+ "value": "\"Password\""
+ },
+ "cellular-apn": {
+ "help": "Please provide the APN string for your SIM if it is not already included in APN_db.h.",
+ "value": "\"my_sims_apn\""
+ },
+ "cellular-username": {
+ "help": "May or may not be required for your APN, please consult your SIM provider.",
+ "value": "\"my_sim_apns_username\""
+ },
+ "cellular-password": {
+ "help": "May or may not be required for your APN, please consult your SIM provider.",
+ "value": "\"my_sim_apns_password\""
+ },
+ "cellular-sim-pin": {
+ "help": "Please provide the PIN for your SIM (as a four digit string) if your SIM is normally locked",
+ "value": "\"1234\""
+ },
"esp8266-tx": {
"help": "Pin used as TX (connects to ESP8266 RX)",
"value": "D1"
@@ -18,12 +40,6 @@
},
"esp8266-debug": {
"value": false
- },
- "wifi-ssid": {
- "value": "\"SSID\""
- },
- "wifi-password": {
- "value": "\"Password\""
}
},
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_entropy_config.h\"",
--- a/source/select-demo.h Fri Dec 15 09:18:00 2017 +0700 +++ b/source/select-demo.h Tue Jan 02 15:20:08 2018 +0000 @@ -5,6 +5,7 @@ #define DEMO_HTTP_SOCKET_REUSE 2 #define DEMO_HTTPS 3 #define DEMO_HTTPS_SOCKET_REUSE 4 +#define DEMO_HTTP_IPV6 5 #define DEMO DEMO_HTTP