From 27e0762f0022801b4fe3f665fc20062f03accf96 Mon Sep 17 00:00:00 2001
From: Teemu Takaluoma <teemu.takaluoma@arm.com>
Date: Mon, 13 May 2019 09:45:15 +0300
Subject: [PATCH] mbed-cloud-client-example 3.1.1

---
 CHANGELOG.md                |  6 ++++++
 CMakeLists.txt              |  5 -----
 mbed-cloud-client.lib       |  2 +-
 mbed-os.lib                 |  2 +-
 mbed_app.json               |  1 +
 source/application_init.cpp |  2 ++
 source/simplem2mclient.h    | 13 +++++++++----
 7 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 251924d..1d52526 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog for Pelion Device Management Client example application
 
+## Release 3.1.1 (13.05.2019)
+
+* Updated to Mbed OS 5.12.2.
+* Fixed the application initialization issue in production flow. This fixes a regression caused by 3.1.0 release.
+* Fixed a compilation issue of Nucleo F429ZI board with the root-level `mbed_app.json`.
+
 ## Release 3.1.0 (26.04.2019)
 
 * Updated to Mbed OS 5.12.1.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54b7ace..6f5ce4c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,11 +8,6 @@ project(mbedCloudClientExample)
 add_definitions(-DNS_EXCLUDE_HIGHRES_TIMER)
 add_definitions(-DNS_EVENTLOOP_USE_TICK_TIMER)
 add_definitions(-DMBED_CONF_MBED_CLIENT_EVENT_LOOP_SIZE=8192)
-if(${OS_BRAND} STREQUAL "FreeRTOS")
-    add_definitions(-DMBED_CONF_MBED_CLIENT_DNS_THREAD_STACK_SIZE=2048)
-else()
-    add_definitions(-DMBED_CONF_MBED_CLIENT_DNS_THREAD_STACK_SIZE=102400)
-endif()
 
 # mbed-cloud-client-example
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/mbed-cloud-client.lib b/mbed-cloud-client.lib
index 62a5605..b1a658d 100644
--- a/mbed-cloud-client.lib
+++ b/mbed-cloud-client.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-cloud-client/#caf14b6e3117636ea86a3845929ac5c22f303d3f
+https://github.com/ARMmbed/mbed-cloud-client/#ab201631cbb03e879aa7f6943e942cd8f024e2e9
diff --git a/mbed-os.lib b/mbed-os.lib
index 441b7db..d2c3d69 100644
--- a/mbed-os.lib
+++ b/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#0063e5de32fc575f061244c96ac60c41c07bd2e6
+https://github.com/ARMmbed/mbed-os/#cfa7938a4dd6d1a4c501945b9c26ca68f70e284e
diff --git a/mbed_app.json b/mbed_app.json
index d63212b..67324ad 100644
--- a/mbed_app.json
+++ b/mbed_app.json
@@ -1,5 +1,6 @@
 {
     "macros": [
+        "MBED_BOOTLOADER_SIZE=(32*1024)",
         "ARM_UC_USE_PAL_BLOCKDEVICE=1"
     ],
     "target_overrides": {
diff --git a/source/application_init.cpp b/source/application_init.cpp
index 8d230be..eb95fb7 100644
--- a/source/application_init.cpp
+++ b/source/application_init.cpp
@@ -198,11 +198,13 @@ static bool application_init_verify_cloud_configuration()
     }
 #endif
 #ifndef MCC_MINIMAL
+#if MBED_CONF_APP_DEVELOPER_MODE == 1
     status = fcc_verify_device_configured_4mbed_cloud();
     print_fcc_status(status);
     if (status != FCC_STATUS_SUCCESS && status != FCC_STATUS_EXPIRED_CERTIFICATE) {
         result = 1;
     }
+#endif
 #endif
     return result;
 }
diff --git a/source/simplem2mclient.h b/source/simplem2mclient.h
index 86b5a00..eb7543c 100644
--- a/source/simplem2mclient.h
+++ b/source/simplem2mclient.h
@@ -54,6 +54,7 @@ class SimpleM2MClient {
     bool call_register() {
 
         _cloud_client.on_registered(this, &SimpleM2MClient::client_registered);
+        _cloud_client.on_registration_updated(this, &SimpleM2MClient::client_registration_updated);
         _cloud_client.on_unregistered(this, &SimpleM2MClient::client_unregistered);
         _cloud_client.on_error(this, &SimpleM2MClient::error);
 
@@ -87,7 +88,7 @@ class SimpleM2MClient {
 
     void client_registered() {
         _registered = true;
-        printf("\nClient registered\n");
+        printf("Client registered\n");
         static const ConnectorClientEndpointInfo* endpoint = NULL;
         if (endpoint == NULL) {
             endpoint = _cloud_client.endpoint_info();
@@ -108,10 +109,14 @@ class SimpleM2MClient {
 #endif
     }
 
+    void client_registration_updated() {
+        printf("Client registration updated\n");
+    }
+
     void client_unregistered() {
         _registered = false;
         _register_called = false;
-        printf("\nClient unregistered - Exiting application\n\n");
+        printf("Client unregistered - Exiting application\n");
 #ifdef MBED_HEAP_STATS_ENABLED
         print_heap_stats();
 #endif
@@ -216,8 +221,8 @@ class SimpleM2MClient {
                 error = "UNKNOWN";
         }
         printf("\nError occurred : %s\r\n", error);
-        printf("Error code : %d\r\n\n", error_code);
-        printf("Error details : %s\r\n\n",_cloud_client.error_description());
+        printf("Error code : %d\r\n", error_code);
+        printf("Error details : %s\r\n",_cloud_client.error_description());
     }
 
     bool is_client_registered() {