|
|
@@ -1557,9 +1557,12 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
{
|
|
|
LOG_I("测试拍照!");
|
|
|
#if 1
|
|
|
- char *takephotojson = makeJson_takephoto();
|
|
|
- DTU_Write("%s",takephotojson);
|
|
|
- rt_free(takephotojson);
|
|
|
+ if(device_status.version_type!=41){
|
|
|
+ char *takephotojson = makeJson_takephoto();
|
|
|
+ DTU_Write("%s",takephotojson);
|
|
|
+ rt_free(takephotojson);
|
|
|
+ }
|
|
|
+
|
|
|
#endif
|
|
|
rt_thread_delay(5000); //延时
|
|
|
}
|
|
|
@@ -1571,9 +1574,11 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
rt_thread_delay(1000);
|
|
|
LOG_I("测试拍照!");
|
|
|
Hk_Take_io();
|
|
|
-// char *takephotojson = makeJson_takephoto();
|
|
|
-// DTU_Write("%s",takephotojson);
|
|
|
-// rt_free(takephotojson);
|
|
|
+ if(device_status.version_type==41){
|
|
|
+ char *takephotojson = makeJson_takephoto();
|
|
|
+ DTU_Write("%s",takephotojson);
|
|
|
+ rt_free(takephotojson);
|
|
|
+ }
|
|
|
}
|
|
|
photo_led_sec--;
|
|
|
if(photo_led_sec==300) //
|
|
|
@@ -2099,7 +2104,8 @@ void Check_ParamConfig(void)
|
|
|
ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
|
|
|
ymodem_ota(1,0);
|
|
|
}
|
|
|
- else {
|
|
|
+ else
|
|
|
+ {
|
|
|
device_status.update_flag = 0;
|
|
|
//初始化联网状态
|
|
|
rt_sprintf(device_status.net,"1");
|
|
|
@@ -2163,7 +2169,8 @@ void Check_ParamConfig(void)
|
|
|
if(connect_num>5) break;
|
|
|
}
|
|
|
if(device_status.version_type==6) device_status.timeSwitch = 1;
|
|
|
- DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
|
|
|
+ if(device_status.update_flag==0)
|
|
|
+ DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
|
|
|
rt_thread_delay(1000);
|
|
|
dtu_send_data_start();
|
|
|
#endif
|
|
|
@@ -2307,54 +2314,69 @@ void app_partion_backup(void)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- rt_kprintf("Clone %s partition to %s partition:\n", src_part_name, dst_part_name);
|
|
|
- if (fal_partition_erase(dst_part, 0, dst_part->len) >= 0)
|
|
|
+ rt_kprintf("Clone %s partition to %s partition:\n", src_part_name, dst_part_name);
|
|
|
+ if (fal_partition_erase(dst_part, 0, dst_part->len) >= 0)
|
|
|
+ {
|
|
|
+ int clone_pos = 0;
|
|
|
+ int clone_len = 0, clone_tol_len;
|
|
|
+ rt_uint8_t *buf = rt_malloc(4096);
|
|
|
+
|
|
|
+ if (dst_part->len < src_part->len)
|
|
|
+ clone_tol_len = dst_part->len;
|
|
|
+ else
|
|
|
+ clone_tol_len = src_part->len;
|
|
|
+
|
|
|
+ while ((clone_pos < clone_tol_len) && (buf != RT_NULL))
|
|
|
+ {
|
|
|
+ clone_len = fal_partition_read(src_part, clone_pos, buf, 4096);
|
|
|
+ if (clone_len < 0)
|
|
|
{
|
|
|
- int clone_pos = 0;
|
|
|
- int clone_len = 0, clone_tol_len;
|
|
|
- rt_uint8_t *buf = rt_malloc(4096);
|
|
|
-
|
|
|
- if (dst_part->len < src_part->len)
|
|
|
- clone_tol_len = dst_part->len;
|
|
|
- else
|
|
|
- clone_tol_len = src_part->len;
|
|
|
-
|
|
|
- while ((clone_pos < clone_tol_len) && (buf != RT_NULL))
|
|
|
- {
|
|
|
- clone_len = fal_partition_read(src_part, clone_pos, buf, 4096);
|
|
|
- if (clone_len < 0)
|
|
|
- {
|
|
|
- rt_kprintf("\nread %s partition failed, clone stop!\n", src_part_name);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if (fal_partition_write(dst_part, clone_pos, buf, clone_len) < 0)
|
|
|
- {
|
|
|
- rt_kprintf("\nwrite %s partition failed, clone stop!\n", dst_part_name);
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- HMI_WRITE("#");
|
|
|
- rt_kprintf("#");
|
|
|
- clone_pos += clone_len;
|
|
|
- }
|
|
|
-
|
|
|
- if (clone_pos >= clone_tol_len)
|
|
|
- {
|
|
|
-
|
|
|
- rt_kprintf("\nClone partition success, total %d bytes!\n", clone_tol_len);
|
|
|
-
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- rt_kprintf("Clone partition failed!");
|
|
|
-
|
|
|
- }
|
|
|
- if (buf)
|
|
|
- rt_free(buf);
|
|
|
+ rt_kprintf("\nread %s partition failed, clone stop!\n", src_part_name);
|
|
|
+ break;
|
|
|
}
|
|
|
+
|
|
|
+ if (fal_partition_write(dst_part, clone_pos, buf, clone_len) < 0)
|
|
|
+ {
|
|
|
+ rt_kprintf("\nwrite %s partition failed, clone stop!\n", dst_part_name);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ HMI_WRITE("#");
|
|
|
+ rt_kprintf("#");
|
|
|
+ clone_pos += clone_len;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (clone_pos >= clone_tol_len)
|
|
|
+ {
|
|
|
+
|
|
|
+ rt_kprintf("\nClone partition success, total %d bytes!\n", clone_tol_len);
|
|
|
+
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ rt_kprintf("Clone partition failed!");
|
|
|
+
|
|
|
+ }
|
|
|
+ if (buf)
|
|
|
+ rt_free(buf);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+int delete_hmi_thread(void)
|
|
|
+{
|
|
|
+ LOG_W("delete_hmi_thread.");
|
|
|
+ if(ctr_motor!=RT_NULL)
|
|
|
+ {
|
|
|
+ rt_thread_delete(ctr_motor);
|
|
|
+ }
|
|
|
+ if(hmi1!=RT_NULL)
|
|
|
+ {
|
|
|
+ rt_thread_delete(hmi1);
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
void Debug_log_ON(void)
|
|
|
{
|
|
|
rt_console_set_device("uart4");
|