Skip to content

Commit d93e8f9

Browse files
authored
Merge pull request #84 from PelionIoT/release-4.11.1
mbed-cloud-client-example 4.11.1
2 parents 3693858 + 4e8c128 commit d93e8f9

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog for Pelion Device Management Client example application
22

3+
## Release 4.11.1 (11.10.2021)
4+
5+
- Updated Parsec to 0.6.0 version. This version is compatible with Mbed TLS 2.27.0.
6+
37
## Release 4.11.0 (17.09.2021)
48

59
- Application restructuring:

mbed-cloud-client.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/PelionIoT/mbed-cloud-client/#105a1846277c80e5eb15ad74de7e4d7b15e57c26
1+
https://github.com/PelionIoT/mbed-cloud-client/#8a30590179cdfb4c6949a7f5b14cae39448d8454

pal-platform/pal-platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@
5252
"to": "Middleware/trusted_storage/trusted_storage"
5353
},
5454
"parsec_se_driver": {
55-
"version": "0.5.0",
55+
"version": "0.6.0",
5656
"from": {
5757
"protocol": "git",
5858
"location": "https://github.com/parallaxsecond/parsec-se-driver.git",
59-
"tag": "0.5.0"
59+
"tag": "0.6.0"
6060
},
6161
"to": "Middleware/parsec_se_driver/parsec_se_driver"
6262
},

source/fota_platform_hooks_impl.cpp

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,17 @@ static fota_component_desc_info_t external_component_info;
3737
/*Subcomponent callbacks*/
3838
int sub_component_rollback_handler(const char *comp_name, const char *sub_comp_name, const uint8_t *vendor_data, size_t vendor_data_size, void *app_ctx)
3939
{
40-
printf("sub_component_rollback_handler sub_comp_name: %s, vendor_data: %.*s", sub_comp_name, (int)vendor_data_size, vendor_data);
40+
printf("-----------------------------------------------------------------------------------\n");
41+
printf("sub_component_rollback_handler CB invoked for sub_comp_name: %s, vendor_data: %.*s\n", sub_comp_name, (int)vendor_data_size, vendor_data);
42+
4143
return FOTA_STATUS_SUCCESS;
4244
}
4345

4446
int sub_component_finalize_handler(const char *comp_name, const char *sub_comp_name, const uint8_t *vendor_data, size_t vendor_data_size, fota_status_e fota_status, void *app_ctx)
4547
{
46-
printf("sub_component_finalize_handler sub_comp_name: %s, vendor_data: %.*s", sub_comp_name, (int)vendor_data_size, vendor_data);
48+
printf("-----------------------------------------------------------------------------------\n");
49+
printf("sub_component_finalize_handler CB invoked for sub_comp_name: %s, vendor_data: %.*s\n", sub_comp_name, (int)vendor_data_size, vendor_data);
50+
4751
return FOTA_STATUS_SUCCESS;
4852
}
4953
#endif //#if defined(TARGET_LIKE_LINUX) && (MBED_CLOUD_CLIENT_FOTA_SUB_COMPONENT_SUPPORT == 1)
@@ -60,9 +64,11 @@ static void print_component_info(const char *comp_name, const char *sub_comp_nam
6064
}
6165

6266
static int pdmc_component_verifier(const char *comp_name, const char *sub_comp_name, const uint8_t *vendor_data, size_t vendor_data_size, void* app_ctx)
63-
{
64-
printf("pdmc_component_verifier called for %s\n", comp_name);
67+
{
68+
printf("-----------------------------------------------------------------------------------\n");
69+
printf("pdmc_component_verifier CB invoked for sub_comp_name: %s, vendor_data: %.*s\n", sub_comp_name, (int)vendor_data_size, vendor_data);
6570
print_component_info(comp_name, sub_comp_name, vendor_data, vendor_data_size);
71+
6672
return FOTA_STATUS_SUCCESS;
6773
}
6874

@@ -89,6 +95,8 @@ static int pdmc_component_installer(const char *comp_name, const char *sub_comp_
8995
#else
9096
static int pdmc_component_installer(const char *comp_name, const char *sub_comp_name, const char *file_name, const uint8_t *vendor_data, size_t vendor_data_size, void *app_ctx)
9197
{
98+
printf("-----------------------------------------------------------------------------------\n");
99+
printf("pdmc_component_installer CB invoked\n");
92100
print_component_info(comp_name, sub_comp_name, vendor_data, vendor_data_size);
93101
return FOTA_STATUS_SUCCESS;
94102
}
@@ -127,7 +135,7 @@ int fota_platform_init_hook(bool after_upgrade)
127135
dummy_sub_component_desc.rollback_order = 2;
128136
dummy_sub_component_desc.verify_cb= pdmc_component_verifier;
129137
dummy_sub_component_desc.verify_order = 1;
130-
ret = fota_sub_component_add("MAIN","img1_id", &dummy_sub_component_desc); //Component MAIN registered by default during fota initialization, no need to call `fota_component_add` for MAIN component.
138+
ret = fota_sub_component_add("MAIN","BL", &dummy_sub_component_desc); //Component MAIN registered by default during fota initialization, no need to call `fota_component_add` for MAIN component.
131139
if (ret != 0){
132140
return ret;
133141
}
@@ -141,7 +149,7 @@ int fota_platform_init_hook(bool after_upgrade)
141149
dummy_sub_component_desc2.rollback_order = 1;
142150
dummy_sub_component_desc2.verify_cb = pdmc_component_verifier;
143151
dummy_sub_component_desc2.verify_order = 2;
144-
ret = fota_sub_component_add("MAIN","img2_id", &dummy_sub_component_desc2);//Component MAIN registered by default during fota initialization, no need to call `fota_component_add` for MAIN component.
152+
ret = fota_sub_component_add("MAIN","rootfs", &dummy_sub_component_desc2);//Component MAIN registered by default during fota initialization, no need to call `fota_component_add` for MAIN component.
145153
#endif
146154

147155
return ret;

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ manifest:
1010
- name: pelion-dm
1111
repo-path: mbed-cloud-client
1212
remote: PelionIoT
13-
revision: 105a1846277c80e5eb15ad74de7e4d7b15e57c26
13+
revision: 8a30590179cdfb4c6949a7f5b14cae39448d8454
1414
path: modules/lib/pelion-dm
1515
- name: zephyr
1616
remote: zephyrproject-rtos

0 commit comments

Comments
 (0)