|
|
@@ -1106,6 +1106,24 @@ static void HMI_Decode(void)
|
|
|
else if (strstr(rx_buffer,"DebugDisable")!=NULL) {
|
|
|
Debug_log_OFF();
|
|
|
}
|
|
|
+
|
|
|
+ //3.0测报灯
|
|
|
+ else if (strstr(rx_buffer,"SwversionV3.0")!=NULL)
|
|
|
+ {
|
|
|
+ device_status.dtype = 3;
|
|
|
+ if(device_status.version_type != 30)
|
|
|
+ {
|
|
|
+ device_status.version_type = 30;
|
|
|
+ sprintf(device_status.driver, "%s",VERSION_UVC);
|
|
|
+ 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();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
//高空
|
|
|
else if (strstr(rx_buffer,"SwversionV11")!=NULL)
|
|
|
{
|
|
|
@@ -1960,6 +1978,8 @@ void Check_ParamConfig(void)
|
|
|
}
|
|
|
else if (device_status.version_type==5) {
|
|
|
rt_sprintf(device_status.driver, "%s",VERSION_V5);
|
|
|
+ }else if (device_status.version_type==30) {
|
|
|
+ rt_sprintf(device_status.driver, "%s",VERSION_UVC);
|
|
|
}
|
|
|
/*定制三色光源*/
|
|
|
#if LAMP_EN == 1
|
|
|
@@ -2021,8 +2041,9 @@ void Check_ParamConfig(void)
|
|
|
sht30_collect();
|
|
|
#if SENSOR_EN==1
|
|
|
mb_master_samlpe();
|
|
|
-#endif
|
|
|
thread_485_play();
|
|
|
+#endif
|
|
|
+
|
|
|
#if ROBOT_EN == 0
|
|
|
uint16_t connect_num=0;
|
|
|
//等待联网,
|
|
|
@@ -2065,18 +2086,12 @@ void Check_ParamConfig(void)
|
|
|
if(device_status.version_type==6) device_status.timeSwitch = 1;
|
|
|
DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
|
|
|
rt_thread_delay(1000);
|
|
|
- if(device_status.dtype!=7&&device_status.version_type!=30)
|
|
|
+ if(device_status.update_flag==0)
|
|
|
{
|
|
|
Workstatus_check();
|
|
|
- }
|
|
|
-
|
|
|
- /********************/
|
|
|
- //工作流程
|
|
|
- if(device_status.version_type!=30)
|
|
|
- {
|
|
|
+ //工作流程
|
|
|
Work_Loop_Task();
|
|
|
}
|
|
|
-
|
|
|
#endif
|
|
|
}
|
|
|
}
|