Skip to content

Commit 2738c0a

Browse files
authored
Merge pull request ARMmbed#3 from ARMmbed/release-R1.3.1
mbed-cloud-client-example R1.3.1-GA
2 parents 36f546a + b47d19d commit 2738c0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1944
-1231
lines changed

.autostart/eth_v4.json

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"macros": [
3-
"MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\"",
43
"PAL_USER_DEFINED_CONFIGURATION=\"sotp_fs_config_MbedOS.h\"",
5-
"MBED_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
6-
"MBED_CLOUD_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
7-
"PAL_DTLS_PEER_MIN_TIMEOUT=5000",
8-
"MBED_CONF_APP_MAIN_STACK_SIZE=4608",
94
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
105
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE"
116
],
@@ -23,27 +18,27 @@
2318
"update-client.storage-locations": "1"
2419
},
2520
"K64F": {
26-
"sotp-section-1-address": "(1016*1024)",
27-
"sotp-section-1-size" : "( 4*1024)",
28-
"sotp-section-2-address": "(1020*1024)",
29-
"sotp-section-2-size" : "( 4*1024)"
21+
"client_app.sotp-section-1-address": "(1016*1024)",
22+
"client_app.sotp-section-1-size" : "( 4*1024)",
23+
"client_app.sotp-section-2-address": "(1020*1024)",
24+
"client_app.sotp-section-2-size" : "( 4*1024)"
3025
},
3126
"NUCLEO_F429ZI": {
32-
"sotp-section-1-address": "(0x08000000+1792*1024)",
33-
"sotp-section-1-size" : "(128*1024)",
34-
"sotp-section-2-address": "(0x08000000+1920*1024)",
35-
"sotp-section-2-size" : "(128*1024)"
27+
"client_app.sotp-section-1-address": "(0x08000000+1792*1024)",
28+
"client_app.sotp-section-1-size" : "(128*1024)",
29+
"client_app.sotp-section-2-address": "(0x08000000+1920*1024)",
30+
"client_app.sotp-section-2-size" : "(128*1024)"
3631
},
3732
"UBLOX_EVK_ODIN_W2": {
3833
"target.device_has_remove": ["EMAC"],
39-
"sotp-section-1-address": "(0x08000000+1792*1024)",
40-
"sotp-section-1-size" : "(128*1024)",
41-
"sotp-section-2-address": "(0x08000000+1920*1024)",
42-
"sotp-section-2-size" : "(128*1024)"
34+
"client_app.sotp-section-1-address": "(0x08000000+1792*1024)",
35+
"client_app.sotp-section-1-size" : "(128*1024)",
36+
"client_app.sotp-section-2-address": "(0x08000000+1920*1024)",
37+
"client_app.sotp-section-2-size" : "(128*1024)"
4338
}
4439
},
4540
"config": {
46-
"network-interface":{
41+
"network-interface": {
4742
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN",
4843
"value": "ETHERNET"
4944
},
@@ -58,26 +53,6 @@
5853
"led-pinname": {
5954
"help": "PinName for led, which is attached to led blink resource.",
6055
"value": "LED_RED"
61-
},
62-
"sotp-section-1-address": {
63-
"help": "Flash sector address for SOTP sector 1",
64-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
65-
"value": null
66-
},
67-
"sotp-section-1-size": {
68-
"help": "Flash sector size for SOTP sector 1",
69-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_SIZE",
70-
"value": null
71-
},
72-
"sotp-section-2-address": {
73-
"help": "Flash sector address for SOTP sector 2",
74-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_ADDRESS",
75-
"value": null
76-
},
77-
"sotp-section-2-size": {
78-
"help": "Flash sector size for SOTP sector 2",
79-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_SIZE",
80-
"value": null
8156
}
8257
}
8358
}

.autostart/eth_v6.json

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"macros": [
3-
"MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\"",
43
"PAL_USER_DEFINED_CONFIGURATION=\"sotp_fs_config_MbedOS.h\"",
5-
"MBED_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
6-
"MBED_CLOUD_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
7-
"PAL_DTLS_PEER_MIN_TIMEOUT=5000",
8-
"MBED_CONF_APP_MAIN_STACK_SIZE=4608",
94
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
105
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE"
116
],
@@ -25,27 +20,27 @@
2520
"update-client.storage-locations": "1"
2621
},
2722
"K64F": {
28-
"sotp-section-1-address": "(1016*1024)",
29-
"sotp-section-1-size" : "( 4*1024)",
30-
"sotp-section-2-address": "(1020*1024)",
31-
"sotp-section-2-size" : "( 4*1024)"
23+
"client_app.sotp-section-1-address": "(1016*1024)",
24+
"client_app.sotp-section-1-size" : "( 4*1024)",
25+
"client_app.sotp-section-2-address": "(1020*1024)",
26+
"client_app.sotp-section-2-size" : "( 4*1024)"
3227
},
3328
"NUCLEO_F429ZI": {
34-
"sotp-section-1-address": "(0x08000000+1792*1024)",
35-
"sotp-section-1-size" : "(128*1024)",
36-
"sotp-section-2-address": "(0x08000000+1920*1024)",
37-
"sotp-section-2-size" : "(128*1024)"
29+
"client_app.sotp-section-1-address": "(0x08000000+1792*1024)",
30+
"client_app.sotp-section-1-size" : "(128*1024)",
31+
"client_app.sotp-section-2-address": "(0x08000000+1920*1024)",
32+
"client_app.sotp-section-2-size" : "(128*1024)"
3833
},
3934
"UBLOX_EVK_ODIN_W2": {
4035
"target.device_has_remove": ["EMAC"],
41-
"sotp-section-1-address": "(0x08000000+1792*1024)",
42-
"sotp-section-1-size" : "(128*1024)",
43-
"sotp-section-2-address": "(0x08000000+1920*1024)",
44-
"sotp-section-2-size" : "(128*1024)"
36+
"client_app.sotp-section-1-address": "(0x08000000+1792*1024)",
37+
"client_app.sotp-section-1-size" : "(128*1024)",
38+
"client_app.sotp-section-2-address": "(0x08000000+1920*1024)",
39+
"client_app.sotp-section-2-size" : "(128*1024)"
4540
}
4641
},
4742
"config": {
48-
"network-interface":{
43+
"network-interface": {
4944
"help": "Options are ETHERNET, WIFI_ESP8266, WIFI_ODIN",
5045
"value": "ETHERNET"
5146
},
@@ -60,26 +55,6 @@
6055
"led-pinname": {
6156
"help": "PinName for led, which is attached to led blink resource.",
6257
"value": "LED_RED"
63-
},
64-
"sotp-section-1-address": {
65-
"help": "Flash sector address for SOTP sector 1",
66-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
67-
"value": null
68-
},
69-
"sotp-section-1-size": {
70-
"help": "Flash sector size for SOTP sector 1",
71-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_SIZE",
72-
"value": null
73-
},
74-
"sotp-section-2-address": {
75-
"help": "Flash sector address for SOTP sector 2",
76-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_ADDRESS",
77-
"value": null
78-
},
79-
"sotp-section-2-size": {
80-
"help": "Flash sector size for SOTP sector 2",
81-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_SIZE",
82-
"value": null
8358
}
8459
}
8560
}

.autostart/mesh_6lowpan.json

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"macros": [
3-
"MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\"",
43
"PAL_USER_DEFINED_CONFIGURATION=\"sotp_fs_config_MbedOS.h\"",
5-
"MBED_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
6-
"MBED_CLOUD_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
7-
"PAL_DTLS_PEER_MIN_TIMEOUT=10000",
8-
"MBED_CONF_APP_MAIN_STACK_SIZE=4608",
94
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
105
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE"
116
],
@@ -28,26 +23,27 @@
2823
"storage-selector.storage" : "SD_CARD",
2924
"update-client.storage-address" : "(1024*1024*64)",
3025
"update-client.storage-size" : "(1024*1024*2)",
31-
"update-client.storage-locations": "1"
26+
"update-client.storage-locations": "1",
27+
"client_app.pal_dtls_peer_min_timeout": "10000"
3228
},
3329
"K64F": {
34-
"sotp-section-1-address": "(1016*1024)",
35-
"sotp-section-1-size" : "( 4*1024)",
36-
"sotp-section-2-address": "(1020*1024)",
37-
"sotp-section-2-size" : "( 4*1024)"
30+
"client_app.sotp-section-1-address": "(1016*1024)",
31+
"client_app.sotp-section-1-size" : "( 4*1024)",
32+
"client_app.sotp-section-2-address": "(1020*1024)",
33+
"client_app.sotp-section-2-size" : "( 4*1024)"
3834
},
3935
"NUCLEO_F429ZI": {
40-
"sotp-section-1-address": "(0x08000000+1792*1024)",
41-
"sotp-section-1-size" : "(128*1024)",
42-
"sotp-section-2-address": "(0x08000000+1920*1024)",
43-
"sotp-section-2-size" : "(128*1024)",
36+
"client_app.sotp-section-1-address": "(0x08000000+1792*1024)",
37+
"client_app.sotp-section-1-size" : "(128*1024)",
38+
"client_app.sotp-section-2-address": "(0x08000000+1920*1024)",
39+
"client_app.sotp-section-2-size" : "(128*1024)",
4440
"target.macros_add": ["ATMEL_SPI_MOSI=PB_5"]
4541
},
4642
"UBLOX_EVK_ODIN_W2": {
47-
"sotp-section-1-address": "(0x08000000+1792*1024)",
48-
"sotp-section-1-size" : "(128*1024)",
49-
"sotp-section-2-address": "(0x08000000+1920*1024)",
50-
"sotp-section-2-size" : "(128*1024)"
43+
"client_app.sotp-section-1-address": "(0x08000000+1792*1024)",
44+
"client_app.sotp-section-1-size" : "(128*1024)",
45+
"client_app.sotp-section-2-address": "(0x08000000+1920*1024)",
46+
"client_app.sotp-section-2-size" : "(128*1024)"
5147
}
5248
},
5349
"config": {
@@ -69,26 +65,6 @@
6965
"led-pinname": {
7066
"help": "PinName for led, which is attached to led blink resource.",
7167
"value": "LED_RED"
72-
},
73-
"sotp-section-1-address": {
74-
"help": "Flash sector address for SOTP sector 1",
75-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
76-
"value": null
77-
},
78-
"sotp-section-1-size": {
79-
"help": "Flash sector size for SOTP sector 1",
80-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_SIZE",
81-
"value": null
82-
},
83-
"sotp-section-2-address": {
84-
"help": "Flash sector address for SOTP sector 2",
85-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_ADDRESS",
86-
"value": null
87-
},
88-
"sotp-section-2-size": {
89-
"help": "Flash sector size for SOTP sector 2",
90-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_SIZE",
91-
"value": null
9268
}
9369
}
9470
}

.autostart/mesh_thread.json

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"macros": [
3-
"MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\"",
43
"PAL_USER_DEFINED_CONFIGURATION=\"sotp_fs_config_MbedOS.h\"",
5-
"MBED_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
6-
"MBED_CLOUD_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
7-
"PAL_DTLS_PEER_MIN_TIMEOUT=10000",
8-
"MBED_CONF_APP_MAIN_STACK_SIZE=4608",
94
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
105
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
116
"MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED",
@@ -29,26 +24,27 @@
2924
"storage-selector.storage" : "SD_CARD",
3025
"update-client.storage-address" : "(1024*1024*64)",
3126
"update-client.storage-size" : "(1024*1024*2)",
32-
"update-client.storage-locations": "1"
27+
"update-client.storage-locations": "1",
28+
"client_app.pal_dtls_peer_min_timeout": "10000"
3329
},
3430
"K64F": {
35-
"sotp-section-1-address": "(1016*1024)",
36-
"sotp-section-1-size" : "( 4*1024)",
37-
"sotp-section-2-address": "(1020*1024)",
38-
"sotp-section-2-size" : "( 4*1024)"
31+
"client_app.sotp-section-1-address": "(1016*1024)",
32+
"client_app.sotp-section-1-size" : "( 4*1024)",
33+
"client_app.sotp-section-2-address": "(1020*1024)",
34+
"client_app.sotp-section-2-size" : "( 4*1024)"
3935
},
4036
"NUCLEO_F429ZI": {
41-
"sotp-section-1-address": "(0x08000000+1792*1024)",
42-
"sotp-section-1-size" : "(128*1024)",
43-
"sotp-section-2-address": "(0x08000000+1920*1024)",
44-
"sotp-section-2-size" : "(128*1024)",
37+
"client_app.sotp-section-1-address": "(0x08000000+1792*1024)",
38+
"client_app.sotp-section-1-size" : "(128*1024)",
39+
"client_app.sotp-section-2-address": "(0x08000000+1920*1024)",
40+
"client_app.sotp-section-2-size" : "(128*1024)",
4541
"target.macros_add": ["ATMEL_SPI_MOSI=PB_5"]
4642
},
4743
"UBLOX_EVK_ODIN_W2": {
48-
"sotp-section-1-address": "(0x08000000+1792*1024)",
49-
"sotp-section-1-size" : "(128*1024)",
50-
"sotp-section-2-address": "(0x08000000+1920*1024)",
51-
"sotp-section-2-size" : "(128*1024)"
44+
"client_app.sotp-section-1-address": "(0x08000000+1792*1024)",
45+
"client_app.sotp-section-1-size" : "(128*1024)",
46+
"client_app.sotp-section-2-address": "(0x08000000+1920*1024)",
47+
"client_app.sotp-section-2-size" : "(128*1024)"
5248
}
5349
},
5450
"config": {
@@ -70,26 +66,6 @@
7066
"led-pinname": {
7167
"help": "PinName for led, which is attached to led blink resource.",
7268
"value": "LED_RED"
73-
},
74-
"sotp-section-1-address": {
75-
"help": "Flash sector address for SOTP sector 1",
76-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
77-
"value": null
78-
},
79-
"sotp-section-1-size": {
80-
"help": "Flash sector size for SOTP sector 1",
81-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_SIZE",
82-
"value": null
83-
},
84-
"sotp-section-2-address": {
85-
"help": "Flash sector address for SOTP sector 2",
86-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_ADDRESS",
87-
"value": null
88-
},
89-
"sotp-section-2-size": {
90-
"help": "Flash sector size for SOTP sector 2",
91-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_SIZE",
92-
"value": null
9369
}
9470
}
9571
}

.autostart/wifi_esp8266_v4.json

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"macros": [
3-
"MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\"",
43
"PAL_USER_DEFINED_CONFIGURATION=\"sotp_fs_config_MbedOS.h\"",
5-
"MBED_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
6-
"MBED_CLOUD_CLIENT_USER_CONFIG_FILE=\"mbed_cloud_client_user_config.h\"",
7-
"PAL_DTLS_PEER_MIN_TIMEOUT=5000",
8-
"MBED_CONF_APP_MAIN_STACK_SIZE=4608",
94
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
105
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE"
116
],
@@ -24,16 +19,16 @@
2419
"update-client.storage-locations": "1"
2520
},
2621
"K64F": {
27-
"sotp-section-1-address": "(1016*1024)",
28-
"sotp-section-1-size" : "( 4*1024)",
29-
"sotp-section-2-address": "(1020*1024)",
30-
"sotp-section-2-size" : "( 4*1024)"
22+
"client_app.sotp-section-1-address": "(1016*1024)",
23+
"client_app.sotp-section-1-size" : "( 4*1024)",
24+
"client_app.sotp-section-2-address": "(1020*1024)",
25+
"client_app.sotp-section-2-size" : "( 4*1024)"
3126
},
3227
"NUCLEO_F429ZI": {
33-
"sotp-section-1-address": "(0x08000000+1792*1024)",
34-
"sotp-section-1-size" : "(128*1024)",
35-
"sotp-section-2-address": "(0x08000000+1920*1024)",
36-
"sotp-section-2-size" : "(128*1024)"
28+
"client_app.sotp-section-1-address": "(0x08000000+1792*1024)",
29+
"client_app.sotp-section-1-size" : "(128*1024)",
30+
"client_app.sotp-section-2-address": "(0x08000000+1920*1024)",
31+
"client_app.sotp-section-2-size" : "(128*1024)"
3732
},
3833
"NUCLEO_F401RE": {
3934
"wifi-tx": "PA_11",
@@ -76,26 +71,6 @@
7671
"led-pinname": {
7772
"help": "PinName for led, which is attached to led blink resource.",
7873
"value": "LED_RED"
79-
},
80-
"sotp-section-1-address": {
81-
"help": "Flash sector address for SOTP sector 1",
82-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_ADDRESS",
83-
"value": null
84-
},
85-
"sotp-section-1-size": {
86-
"help": "Flash sector size for SOTP sector 1",
87-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_1_SIZE",
88-
"value": null
89-
},
90-
"sotp-section-2-address": {
91-
"help": "Flash sector address for SOTP sector 2",
92-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_ADDRESS",
93-
"value": null
94-
},
95-
"sotp-section-2-size": {
96-
"help": "Flash sector size for SOTP sector 2",
97-
"macro_name": "PAL_INTERNAL_FLASH_SECTION_2_SIZE",
98-
"value": null
9974
}
10075
}
10176
}

0 commit comments

Comments
 (0)