Skip to content

Commit ed7b2c9

Browse files
Cheng-SGCheng-SG
authored
Merge pull request #426 from alibaba/update_1.3.1
Update 1.3.1
2 parents fc4a1bc + b02fd94 commit ed7b2c9

File tree

96 files changed

+11984
-46344
lines changed

Some content is hidden

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

96 files changed

+11984
-46344
lines changed

‎board/esp8266/board.c‎

Lines changed: 250 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
#include "esp_system.h"
1010

11-
/* Logic partition on flash devices */
12-
const hal_logic_partition_t hal_partitions[] =
11+
/* Logic partition on flash devices for 4M bytes 1024*1024 */
12+
const hal_logic_partition_t hal_partitions_4M_1024x1024[] =
1313
{
1414
[HAL_PARTITION_BOOTLOADER] =
1515
{
1616
.partition_owner = HAL_FLASH_EMBEDDED,
1717
.partition_description = "Bootloader",
18-
.partition_start_addr = 0x1000,
19-
.partition_length = 0x7000, //28k bytes
18+
.partition_start_addr = 0x0000,
19+
.partition_length = 0x1000, //4k bytes
2020
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
2121
},
2222
[HAL_PARTITION_PARAMETER_1] =
@@ -39,15 +39,15 @@ const hal_logic_partition_t hal_partitions[] =
3939
{
4040
.partition_owner = HAL_FLASH_EMBEDDED,
4141
.partition_description = "Application",
42-
.partition_start_addr = 0x10000,
42+
.partition_start_addr = 0x1000,
4343
.partition_length = 0x100000, //1MB bytes
4444
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
4545
},
4646
[HAL_PARTITION_OTA_TEMP] =
4747
{
4848
.partition_owner = HAL_FLASH_EMBEDDED,
4949
.partition_description = "OTA Storage",
50-
.partition_start_addr = 0x110000,
50+
.partition_start_addr = 0x101000,
5151
.partition_length = 0x100000, //1MB bytes
5252
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
5353
},
@@ -69,6 +69,250 @@ const hal_logic_partition_t hal_partitions[] =
6969
},
7070
};
7171

72+
/* Logic partition on flash devices for 2M bytes 1024*1024 */
73+
const hal_logic_partition_t hal_partitions_2M_1024x1024[] =
74+
{
75+
[HAL_PARTITION_BOOTLOADER] =
76+
{
77+
.partition_owner = HAL_FLASH_EMBEDDED,
78+
.partition_description = "Bootloader",
79+
.partition_start_addr = 0x0000,
80+
.partition_length = 0x1000, //4k bytes
81+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
82+
},
83+
[HAL_PARTITION_PARAMETER_1] =
84+
{
85+
.partition_owner = HAL_FLASH_EMBEDDED,
86+
.partition_description = "PARAMETER1",
87+
.partition_start_addr = 0x1f6000,
88+
.partition_length = 0x1000, // 4k bytes
89+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
90+
},
91+
[HAL_PARTITION_PARAMETER_2] =
92+
{
93+
.partition_owner = HAL_FLASH_EMBEDDED,
94+
.partition_description = "PARAMETER2",
95+
.partition_start_addr = 0x1f7000,
96+
.partition_length = 0x2000, //8k bytes
97+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
98+
},
99+
[HAL_PARTITION_APPLICATION] =
100+
{
101+
.partition_owner = HAL_FLASH_EMBEDDED,
102+
.partition_description = "Application",
103+
.partition_start_addr = 0x1000,
104+
.partition_length = 0xF4000, //976 bytes
105+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
106+
},
107+
[HAL_PARTITION_OTA_TEMP] =
108+
{
109+
.partition_owner = HAL_FLASH_EMBEDDED,
110+
.partition_description = "OTA Storage",
111+
.partition_start_addr = 0x101000,
112+
.partition_length = 0xF4000, //976 bytes
113+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
114+
},
115+
[HAL_PARTITION_PARAMETER_3] =
116+
{
117+
.partition_owner = HAL_FLASH_EMBEDDED,
118+
.partition_description = "PARAMETER3",
119+
.partition_start_addr = 0x1f9000,
120+
.partition_length = 0x1000, //4k bytes
121+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
122+
},
123+
[HAL_PARTITION_PARAMETER_4] =
124+
{
125+
.partition_owner = HAL_FLASH_EMBEDDED,
126+
.partition_description = "PARAMETER4",
127+
.partition_start_addr = 0x1FA000,
128+
.partition_length = 0x1000, //4k bytes
129+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
130+
},
131+
};
132+
133+
/* Logic partition on flash devices for 1M bytes 512*512 */
134+
const hal_logic_partition_t hal_partitions_1M_512x512[] =
135+
{
136+
[HAL_PARTITION_BOOTLOADER] =
137+
{
138+
.partition_owner = HAL_FLASH_EMBEDDED,
139+
.partition_description = "Bootloader",
140+
.partition_start_addr = 0x0000,
141+
.partition_length = 0x1000, //4k bytes
142+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
143+
},
144+
[HAL_PARTITION_PARAMETER_1] =
145+
{
146+
.partition_owner = HAL_FLASH_EMBEDDED,
147+
.partition_description = "PARAMETER1",
148+
.partition_start_addr = 0xF6000,
149+
.partition_length = 0x1000, // 4k bytes
150+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
151+
},
152+
[HAL_PARTITION_PARAMETER_2] =
153+
{
154+
.partition_owner = HAL_FLASH_EMBEDDED,
155+
.partition_description = "PARAMETER2",
156+
.partition_start_addr = 0xF7000,
157+
.partition_length = 0x2000, //8k bytes
158+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
159+
},
160+
[HAL_PARTITION_APPLICATION] =
161+
{
162+
.partition_owner = HAL_FLASH_EMBEDDED,
163+
.partition_description = "Application",
164+
.partition_start_addr = 0x1000,
165+
.partition_length = 0x75000, //468 bytes
166+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
167+
},
168+
[HAL_PARTITION_OTA_TEMP] =
169+
{
170+
.partition_owner = HAL_FLASH_EMBEDDED,
171+
.partition_description = "OTA Storage",
172+
.partition_start_addr = 0x81000,
173+
.partition_length = 0x75000, //468 bytes
174+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
175+
},
176+
[HAL_PARTITION_PARAMETER_3] =
177+
{
178+
.partition_owner = HAL_FLASH_EMBEDDED,
179+
.partition_description = "PARAMETER3",
180+
.partition_start_addr = 0xF9000,
181+
.partition_length = 0x1000, //4k bytes
182+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
183+
},
184+
[HAL_PARTITION_PARAMETER_4] =
185+
{
186+
.partition_owner = HAL_FLASH_EMBEDDED,
187+
.partition_description = "PARAMETER4",
188+
.partition_start_addr = 0xFA000,
189+
.partition_length = 0x1000, //4k bytes
190+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
191+
},
192+
};
193+
194+
/* Logic partition on flash devices for 2M bytes 512*512 */
195+
const hal_logic_partition_t hal_partitions_2M_512x512[] =
196+
{
197+
[HAL_PARTITION_BOOTLOADER] =
198+
{
199+
.partition_owner = HAL_FLASH_EMBEDDED,
200+
.partition_description = "Bootloader",
201+
.partition_start_addr = 0x0000,
202+
.partition_length = 0x1000, //4k bytes
203+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
204+
},
205+
[HAL_PARTITION_PARAMETER_1] =
206+
{
207+
.partition_owner = HAL_FLASH_EMBEDDED,
208+
.partition_description = "PARAMETER1",
209+
.partition_start_addr = 0x1F6000,
210+
.partition_length = 0x1000, // 4k bytes
211+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
212+
},
213+
[HAL_PARTITION_PARAMETER_2] =
214+
{
215+
.partition_owner = HAL_FLASH_EMBEDDED,
216+
.partition_description = "PARAMETER2",
217+
.partition_start_addr = 0x1F7000,
218+
.partition_length = 0x2000, //8k bytes
219+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
220+
},
221+
[HAL_PARTITION_APPLICATION] =
222+
{
223+
.partition_owner = HAL_FLASH_EMBEDDED,
224+
.partition_description = "Application",
225+
.partition_start_addr = 0x1000,
226+
.partition_length = 0x7B000, //492 bytes
227+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
228+
},
229+
[HAL_PARTITION_OTA_TEMP] =
230+
{
231+
.partition_owner = HAL_FLASH_EMBEDDED,
232+
.partition_description = "OTA Storage",
233+
.partition_start_addr = 0x81000,
234+
.partition_length = 0x7B000, //492 bytes
235+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
236+
},
237+
[HAL_PARTITION_PARAMETER_3] =
238+
{
239+
.partition_owner = HAL_FLASH_EMBEDDED,
240+
.partition_description = "PARAMETER3",
241+
.partition_start_addr = 0x1F9000,
242+
.partition_length = 0x1000, //4k bytes
243+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
244+
},
245+
[HAL_PARTITION_PARAMETER_4] =
246+
{
247+
.partition_owner = HAL_FLASH_EMBEDDED,
248+
.partition_description = "PARAMETER4",
249+
.partition_start_addr = 0x1FA000,
250+
.partition_length = 0x1000, //4k bytes
251+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
252+
},
253+
};
254+
255+
/* Logic partition on flash devices for 4M bytes 512*512 */
256+
const hal_logic_partition_t hal_partitions_4M_512x512[] =
257+
{
258+
[HAL_PARTITION_BOOTLOADER] =
259+
{
260+
.partition_owner = HAL_FLASH_EMBEDDED,
261+
.partition_description = "Bootloader",
262+
.partition_start_addr = 0x0000,
263+
.partition_length = 0x1000, //4k bytes
264+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
265+
},
266+
[HAL_PARTITION_PARAMETER_1] =
267+
{
268+
.partition_owner = HAL_FLASH_EMBEDDED,
269+
.partition_description = "PARAMETER1",
270+
.partition_start_addr = 0x3F6000,
271+
.partition_length = 0x1000, // 4k bytes
272+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
273+
},
274+
[HAL_PARTITION_PARAMETER_2] =
275+
{
276+
.partition_owner = HAL_FLASH_EMBEDDED,
277+
.partition_description = "PARAMETER2",
278+
.partition_start_addr = 0x3F7000,
279+
.partition_length = 0x2000, //8k bytes
280+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
281+
},
282+
[HAL_PARTITION_APPLICATION] =
283+
{
284+
.partition_owner = HAL_FLASH_EMBEDDED,
285+
.partition_description = "Application",
286+
.partition_start_addr = 0x1000,
287+
.partition_length = 0x7B000, //492 bytes
288+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
289+
},
290+
[HAL_PARTITION_OTA_TEMP] =
291+
{
292+
.partition_owner = HAL_FLASH_EMBEDDED,
293+
.partition_description = "OTA Storage",
294+
.partition_start_addr = 0x81000,
295+
.partition_length = 0x7B000, //492 bytes
296+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
297+
},
298+
[HAL_PARTITION_PARAMETER_3] =
299+
{
300+
.partition_owner = HAL_FLASH_EMBEDDED,
301+
.partition_description = "PARAMETER3",
302+
.partition_start_addr = 0x3F9000,
303+
.partition_length = 0x1000, //4k bytes
304+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
305+
},
306+
[HAL_PARTITION_PARAMETER_4] =
307+
{
308+
.partition_owner = HAL_FLASH_EMBEDDED,
309+
.partition_description = "PARAMETER4",
310+
.partition_start_addr = 0x3FA000,
311+
.partition_length = 0x1000, //4k bytes
312+
.partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
313+
},
314+
};
315+
72316
uint32_t user_rf_cal_sector_set(void)
73317
{
74318
flash_size_map size_map = system_get_flash_size_map();

‎board/esp8266/k_config.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
#ifndef RHINO_CONFIG_MM_BLK
3636
#define RHINO_CONFIG_MM_BLK 1
3737
#endif
38+
#ifndef RHINO_CONFIG_MM_BLK_SIZE
39+
#define RHINO_CONFIG_MM_BLK_SIZE 16
40+
#endif
3841
#ifndef RHINO_CONFIG_MM_TLF
3942
#define RHINO_CONFIG_MM_TLF 1
4043
#endif

‎framework/connectivity/coap/iotx_product_linux.c‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
#include "iot_export.h"
1010

11-
#define IOTX_PRODUCT_KEY "vtkkbrpmxmF"
12-
#define IOTX_DEVICE_NAME "IoTxCoAPTestDev"
13-
#define IOTX_DEVICE_SECRET "Stk4IUErQUBc1tWRWEKWb5ACra4hFDYF"
14-
#define IOTX_DEVICE_ID "IoTxCoAPTestDev.1"
11+
#define IOTX_PRODUCT_KEY "vtkkbrpmxmF"
12+
#define IOTX_DEVICE_NAME "IoTxCoAPTestDev"
13+
#define IOTX_DEVICE_SECRET "Stk4IUErQUBc1tWRWEKWb5ACra4hFDYF"
14+
#define IOTX_DEVICE_ID "IoTxCoAPTestDev.1"
1515

1616
int iotx_set_devinfo(iotx_deviceinfo_t *p_devinfo)
1717
{
@@ -20,16 +20,18 @@ int iotx_set_devinfo(iotx_deviceinfo_t *p_devinfo)
2020
}
2121

2222
memset(p_devinfo, 0x00, sizeof(iotx_deviceinfo_t));
23-
strncpy(p_devinfo->device_id, IOTX_DEVICE_ID, IOTX_DEVICE_ID_LEN);
24-
strncpy(p_devinfo->product_key, IOTX_PRODUCT_KEY, IOTX_PRODUCT_KEY_LEN);
25-
strncpy(p_devinfo->device_secret, IOTX_DEVICE_SECRET, IOTX_DEVICE_SECRET_LEN);
26-
strncpy(p_devinfo->device_name, IOTX_DEVICE_NAME, IOTX_DEVICE_NAME_LEN);
27-
28-
fprintf(stderr, "*****The Product Key : %s *****\r\n", p_devinfo->product_key);
29-
fprintf(stderr, "*****The Device Name : %s *****\r\n", p_devinfo->device_name);
30-
fprintf(stderr, "*****The Device Secret: %s *****\r\n", p_devinfo->device_secret);
31-
fprintf(stderr, "*****The Device ID : %s *****\r\n", p_devinfo->device_id);
23+
strncpy(p_devinfo->device_id, IOTX_DEVICE_ID, IOTX_DEVICE_ID_LEN);
24+
strncpy(p_devinfo->product_key, IOTX_PRODUCT_KEY, IOTX_PRODUCT_KEY_LEN);
25+
strncpy(p_devinfo->device_secret, IOTX_DEVICE_SECRET,
26+
IOTX_DEVICE_SECRET_LEN);
27+
strncpy(p_devinfo->device_name, IOTX_DEVICE_NAME, IOTX_DEVICE_NAME_LEN);
28+
29+
fprintf(stderr, "*****The Product Key : %s *****\r\n",
30+
p_devinfo->product_key);
31+
fprintf(stderr, "*****The Device Name : %s *****\r\n",
32+
p_devinfo->device_name);
33+
fprintf(stderr, "*****The Device ID : %s *****\r\n",
34+
p_devinfo->device_id);
3235

3336
return IOTX_SUCCESS;
3437
}
35-

0 commit comments

Comments
 (0)