|
|
@@ -563,7 +563,7 @@ static void HMI_Decode(void)
|
|
|
//清扫
|
|
|
else if (strstr(rx_buffer,"clear")!=NULL) {
|
|
|
rt_kprintf("\n清扫!\n");
|
|
|
- if(device_status.version_type==4||device_status.version_type==41)
|
|
|
+ if(device_status.version_type==4||device_status.version_type==41||device_status.version_type==42)
|
|
|
{
|
|
|
device_status.clear_status=1;
|
|
|
}
|
|
|
@@ -1223,14 +1223,14 @@ static void HMI_Decode(void)
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- //高空
|
|
|
- else if (strstr(rx_buffer,"SwversionV11")!=NULL)
|
|
|
+ //1.0
|
|
|
+ else if (strstr(rx_buffer,"SwversionV1")!=NULL)
|
|
|
{
|
|
|
- device_status.dtype = 3;
|
|
|
- if(device_status.version_type != 11)
|
|
|
+ if(device_status.version_type != 1)
|
|
|
{
|
|
|
- device_status.version_type = 11;
|
|
|
- sprintf(device_status.driver, "%s",VERSION_GK);
|
|
|
+ device_status.dtype = 3;
|
|
|
+ device_status.version_type = 1;
|
|
|
+ sprintf(device_status.driver, "%s",VERSION_ZP);
|
|
|
ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type)); //版本类型
|
|
|
ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype)); //版本类型
|
|
|
MA_save();
|
|
|
@@ -1239,14 +1239,14 @@ static void HMI_Decode(void)
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- //1.0
|
|
|
- else if (strstr(rx_buffer,"SwversionV1")!=NULL)
|
|
|
+ //高空
|
|
|
+ else if (strstr(rx_buffer,"SwversionV11")!=NULL)
|
|
|
{
|
|
|
- if(device_status.version_type != 1)
|
|
|
+ device_status.dtype = 3;
|
|
|
+ if(device_status.version_type != 11)
|
|
|
{
|
|
|
- device_status.dtype = 3;
|
|
|
- device_status.version_type = 1;
|
|
|
- sprintf(device_status.driver, "%s",VERSION_ZP);
|
|
|
+ device_status.version_type = 11;
|
|
|
+ sprintf(device_status.driver, "%s",VERSION_GK);
|
|
|
ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type)); //版本类型
|
|
|
ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype)); //版本类型
|
|
|
MA_save();
|
|
|
@@ -1255,6 +1255,7 @@ static void HMI_Decode(void)
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
//低端款
|
|
|
else if (strstr(rx_buffer,"SwversionV42")!=NULL) {
|
|
|
device_status.dtype = 3;
|
|
|
@@ -1618,7 +1619,7 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
if(photo_led_sec==900)
|
|
|
ctr_led(ON);
|
|
|
//打开补光灯
|
|
|
- if((device_status.version_type==4||device_status.version_type==42)&&photo_led_sec==800)
|
|
|
+ if(photo_led_sec==800)
|
|
|
{
|
|
|
LOG_I("测试拍照!");
|
|
|
#if 1
|
|
|
@@ -1627,7 +1628,6 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
rt_free(takephotojson);
|
|
|
#endif
|
|
|
rt_thread_delay(5000); //延时
|
|
|
-
|
|
|
}
|
|
|
//15S后执行拍照
|
|
|
else if (photo_led_sec==750)
|