From 36ebd0e7e552a353e2f9ccfce7b6a2d98ab50059 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Thu, 7 Dec 2017 14:43:40 -0600 Subject: [PATCH 1/5] Update Cortex-A build errors --- tools/build_api.py | 2 +- tools/options.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build_api.py b/tools/build_api.py index cbe2f8d253..423adc5121 100644 --- a/tools/build_api.py +++ b/tools/build_api.py @@ -443,7 +443,7 @@ def scan_resources(src_paths, toolchain, dependencies_paths=None, "rtos" in toolchain.config.lib_config_data): if "Cortex-A" in toolchain.target.core: raise NotSupportedException( - ("%s Will be supported in mbed OS 5.6. " + ("%s Will be supported in a future version of Mbed OS. " "To use the %s, please checkout the mbed OS 5.4 release branch. " "See https://developer.mbed.org/platforms/Renesas-GR-PEACH/#important-notice " "for more information") % (toolchain.target.name, toolchain.target.name)) diff --git a/tools/options.py b/tools/options.py index 8cfec663ac..58aed4d6d7 100644 --- a/tools/options.py +++ b/tools/options.py @@ -122,7 +122,7 @@ def mcu_is_enabled(parser, mcu): if "Cortex-A" in TARGET_MAP[mcu].core: args_error( parser, - ("%s Will be supported in mbed OS 5.6. " + ("%s Will be supported in a future version of Mbed OS. " "To use the %s, please checkout the mbed OS 5.4 release branch. " "See https://developer.mbed.org/platforms/Renesas-GR-PEACH/#important-notice " "for more information") % (mcu, mcu)) From 22c0205afe2f60fe2aca407dc4f6e6385e0cc90e Mon Sep 17 00:00:00 2001 From: Martin Kojtal <0xc0170@gmail.com> Date: Mon, 11 Dec 2017 15:38:02 +0000 Subject: [PATCH 2/5] Export: fix link in gettingstarted --- tools/export/GettingStarted.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/export/GettingStarted.html b/tools/export/GettingStarted.html index 9fce79ce03..226e4f7bd7 100644 --- a/tools/export/GettingStarted.html +++ b/tools/export/GettingStarted.html @@ -3,9 +3,9 @@ + content="1;url="https://os.mbed.com/docs/latest/tools/exporting.html> Page Redirection From 280ccd1053b58fdd7bd45bcac7ef7295b1fcfc07 Mon Sep 17 00:00:00 2001 From: Arto Kinnunen Date: Tue, 12 Dec 2017 10:41:08 +0200 Subject: [PATCH 3/5] Squashed 'features/nanostack/FEATURE_NANOSTACK/coap-service/' changes from 29bfb78..d0a2597 d0a2597 Fix IAR compilation error with NUCLEO_F401RE (#86) 674a465 Delete transaction if message is non-confirmable (#83) git-subtree-dir: features/nanostack/FEATURE_NANOSTACK/coap-service git-subtree-split: d0a25979f8143334c86e422fd358f895bde2ad87 --- .../coap-service/source/coap_message_handler.c | 1 + .../coap-service/source/coap_service_api.c | 4 ++-- .../source/include/coap_security_handler.h | 11 +++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c index 63ef701194..3d6c91a031 100644 --- a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c +++ b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c @@ -337,6 +337,7 @@ uint16_t coap_message_handler_request_send(coap_msg_handler_t *handle, int8_t se transaction_ptr->options = options; memcpy(transaction_ptr->remote_address, destination_addr, 16); transaction_ptr->remote_port = destination_port; + transaction_ptr->req_msg_type = msg_type; memset(&request, 0, sizeof(request)); dst_addr.addr_ptr = (uint8_t *) destination_addr; // Cast away const and trust that nsdl doesn't modify... dst_addr.addr_len = 16; diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_service_api.c b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_service_api.c index 91f2e3ef58..9adcee212a 100644 --- a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_service_api.c +++ b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_service_api.c @@ -188,7 +188,7 @@ static uint8_t coap_tx_function(uint8_t *data_ptr, uint16_t data_len, sn_nsdl_ad memcpy(transaction_ptr->data_ptr, data_ptr, data_len); transaction_ptr->data_len = data_len; } - } else if ((ret_val == -1) || (transaction_ptr->resp_cb == NULL)) { + } else if ((ret_val == -1) || (!transaction_ptr->resp_cb && transaction_ptr->req_msg_type == COAP_MSG_TYPE_NON_CONFIRMABLE)) { transaction_delete(transaction_ptr); } @@ -300,7 +300,7 @@ static void sec_done_cb(int8_t socket_id, uint8_t address[static 16], uint16_t p ns_dyn_mem_free(transaction_ptr->data_ptr); transaction_ptr->data_ptr = NULL; transaction_ptr->data_len = 0; - if (transaction_ptr->resp_cb == NULL) { + if (!transaction_ptr->resp_cb && transaction_ptr->req_msg_type == COAP_MSG_TYPE_NON_CONFIRMABLE) { transaction_delete(transaction_ptr); } } diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_security_handler.h b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_security_handler.h index 2c20f8a49a..0a4d948a78 100644 --- a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_security_handler.h +++ b/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_security_handler.h @@ -20,11 +20,18 @@ #include "ns_types.h" #ifdef NS_USE_EXTERNAL_MBED_TLS +#if !defined(MBEDTLS_CONFIG_FILE) +#include "mbedtls/config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + +#if defined(MBEDTLS_SSL_TLS_C) #include "mbedtls/ssl.h" -#ifdef MBEDTLS_SSL_TLS_C #define COAP_SECURITY_AVAILABLE #endif -#endif + +#endif /* NS_USE_EXTERNAL_MBED_TLS */ #define COOKIE_SIMPLE_LEN 8 typedef struct simple_cookie { From c981a16f51629beb0a4396edc6f0480329ad37aa Mon Sep 17 00:00:00 2001 From: Arto Kinnunen Date: Tue, 12 Dec 2017 10:45:48 +0200 Subject: [PATCH 4/5] Update Thread PSKd default value Thread PSKd can contain only uppercase characters. --- .../nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed_lib.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed_lib.json b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed_lib.json index c9401e662c..e5d63766e6 100644 --- a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed_lib.json +++ b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed_lib.json @@ -12,7 +12,7 @@ "6lowpan-nd-psk-key": "{0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf}", "6lowpan-nd-sec-level": 5, "6lowpan-nd-device-type": "NET_6LOWPAN_ROUTER", - "thread-pskd": "\"abcdefghijklmno\"", + "thread-pskd": "\"ABCDEFGH\"", "thread-use-static-link-config": true, "thread-config-channel-mask": "0x7fff800", "thread-config-channel-page": 0, From 7c4a770f5a5931120cbe34ad9ef78674a24e3dae Mon Sep 17 00:00:00 2001 From: adbridge Date: Wed, 13 Dec 2017 10:34:45 +0000 Subject: [PATCH 5/5] Update Mbed version block for patch release --- mbed.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mbed.h b/mbed.h index 424801c24c..6e6c5f3af0 100644 --- a/mbed.h +++ b/mbed.h @@ -16,7 +16,7 @@ #ifndef MBED_H #define MBED_H -#define MBED_LIBRARY_VERSION 156 +#define MBED_LIBRARY_VERSION 0 #if MBED_CONF_RTOS_PRESENT // RTOS present, this is valid only for mbed OS 5