From db81ffe5ccbe48d7f7eb27017059e81f24693d52 Mon Sep 17 00:00:00 2001 From: tangchao0503 <735056338@qq.com> Date: Mon, 4 Sep 2023 18:03:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B8=A7=E7=8E=87=E5=8F=98=E5=A4=A7=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=9C=80=E5=A4=A7=E6=9B=9D=E5=85=89=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BC=9A=E5=8F=98=E5=B0=8F=202.=E6=9B=9D=E5=85=89=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=BD=BF=E7=94=A8=E5=BE=AE=E7=A7=92=203.=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_sample/widget/test_widget.c | 19 ++++++++++++++----- .../cn_big_screen/widget_config.json | 2 +- .../en_big_screen/widget_config.json | 2 +- .../module_sample/xport/test_payload_xport.c | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/samples/sample_c/module_sample/widget/test_widget.c b/samples/sample_c/module_sample/widget/test_widget.c index d85c363..9e24a4b 100644 --- a/samples/sample_c/module_sample/widget/test_widget.c +++ b/samples/sample_c/module_sample/widget/test_widget.c @@ -303,7 +303,7 @@ static void *DjiTest_WidgetTask(void *arg) } #ifndef USER_FIRMWARE_MAJOR_VERSION - snprintf(message, DJI_WIDGET_FLOATING_WINDOW_MSG_MAX_LEN, "%s\n高光谱: %s 惯导: %s\n卫星: %s 惯导状态: %s\n帧率: %s 曝光: %s max: %s \nP: %s R: %s Y: %s \n光谱bin: %s \n时间: %s min 空间: %s G\n", + snprintf(message, DJI_WIDGET_FLOATING_WINDOW_MSG_MAX_LEN, "%s\n高光谱: %s 惯导: %s\n卫星: %s 惯导状态: %s\n帧率: %s 曝光: %s μs %s \nP: %s R: %s Y: %s \n光谱bin: %s \n时间: %s min 空间: %s G\n", s_strUIMessage, s_strStateOfXimea, s_strStateOfSbg, s_strSbgSatelliteCounter, s_strSbgSolutionMode, XimeaFramerate, XimeaExposeTime, XimeaExposeMaxValue, s_strPitch, s_strRoll, s_strYaw, s_spectralBin, s_remainingTime, s_remainingSpace); #else snprintf(message, DJI_WIDGET_FLOATING_WINDOW_MSG_MAX_LEN, @@ -491,7 +491,6 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)// break; case 3: s_strStateOfSbg="采集中"; - systemON_Control = 3; break; default: @@ -590,9 +589,13 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)// case 101: s_strStateOfXimea="连接成功"; - strcpy(s_strUIMessage,"系统启动成功！"); - messageTimeCounter = 0; - messageTimespan = 20; + if(s_stateOfXimea == 100) + { + strcpy(s_strUIMessage,"系统启动成功！"); + messageTimeCounter = 0; + messageTimespan = 20; + } + systemON_Control = 3; break; case 102: @@ -899,6 +902,11 @@ static T_DjiReturnCode PsdkTestWidget_SetWidgetValue_StartRecord(E_DjiWidgetType case 9: if (value==0)//停止采集 { + if (s_stateOfXimea != 104) + { + s_strStateOfXimea="连接成功"; + } + char* command = "4"; sendto(s_sockfd, command,strlen(command),0,(struct sockaddr *)&s_server,sizeof(s_server)); } @@ -913,6 +921,7 @@ static T_DjiReturnCode PsdkTestWidget_SetWidgetValue_StartRecord(E_DjiWidgetType break; } + s_strStateOfXimea="预约采集"; char* command = "3"; sendto(s_sockfd, command,strlen(command),0,(struct sockaddr *)&s_server,sizeof(s_server)); } diff --git a/samples/sample_c/module_sample/widget/widget_file/cn_big_screen/widget_config.json b/samples/sample_c/module_sample/widget/widget_file/cn_big_screen/widget_config.json index 74ccd22..73e348e 100644 --- a/samples/sample_c/module_sample/widget/widget_file/cn_big_screen/widget_config.json +++ b/samples/sample_c/module_sample/widget/widget_file/cn_big_screen/widget_config.json @@ -61,7 +61,7 @@ "widget_index": 8, "widget_type": "int_input_box", "widget_name": "曝光时间", - "int_input_box_hint": "单位：毫秒" + "int_input_box_hint": "单位：微秒" }, { "widget_index": 9, diff --git a/samples/sample_c/module_sample/widget/widget_file/en_big_screen/widget_config.json b/samples/sample_c/module_sample/widget/widget_file/en_big_screen/widget_config.json index 74ccd22..73e348e 100644 --- a/samples/sample_c/module_sample/widget/widget_file/en_big_screen/widget_config.json +++ b/samples/sample_c/module_sample/widget/widget_file/en_big_screen/widget_config.json @@ -61,7 +61,7 @@ "widget_index": 8, "widget_type": "int_input_box", "widget_name": "曝光时间", - "int_input_box_hint": "单位：毫秒" + "int_input_box_hint": "单位：微秒" }, { "widget_index": 9, diff --git a/samples/sample_c/module_sample/xport/test_payload_xport.c b/samples/sample_c/module_sample/xport/test_payload_xport.c index b2bff63..91ccac9 100644 --- a/samples/sample_c/module_sample/xport/test_payload_xport.c +++ b/samples/sample_c/module_sample/xport/test_payload_xport.c @@ -85,7 +85,7 @@ T_DjiReturnCode DjiTest_XPortStartService(void) return djiStat; } - //通过注册回调函数获取X-Port 的姿态信息.注册后，回调函数将会被自动调用，调用频率为 + //通过注册回调函数获取X-Port 的姿态信息.注册后，回调函数将会被自动调用，调用频率为10hz djiStat = DjiXPort_RegReceiveAttitudeInformationCallback(ReceiveXPortAttitudeInformation); if (djiStat != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) { USER_LOG_ERROR("register receive XPort attitude information callback function error: 0x%08llX.",