tangchao0503/Payload-SDK
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add：psdk重启后，通知ximeaAirborneSystem发送ximeaAirborneSystem的状态，以恢复psdk状态至重启前；

Browse Source
This commit is contained in:
tangchao0503
2023-10-25 15:16:09 +08:00
parent 80159490e1
commit 4df18d88dd
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/sample_c/module_sample/widget/test_widget.c
View File

@ -245,6 +245,8 @@ T_DjiReturnCode DjiTest_WidgetStartService(void)
s_server.sin_family = AF_INET; s_server.sin_family = AF_INET;
s_server.sin_port = htons(PORT); s_server.sin_port = htons(PORT);
s_server.sin_addr= *((struct in_addr *)he->h_addr); s_server.sin_addr= *((struct in_addr *)he->h_addr);
system("/home/300tc/projects/udpClient/udpClient 127.0.0.1 10");
/* tc-----------------------------------------------*/ /* tc-----------------------------------------------*/
return DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS; return DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
@ -345,7 +347,7 @@ static void *DjiTest_WidgetTask(void *arg)
// 转换为MB // 转换为MB
double availableMB = availableBytes / (1024.0 * 1024.0); double availableMB = availableBytes / (1024.0 * 1024.0);
sprintf(remainingSpaceTmp, "%.0f", availableMB/1024); sprintf(remainingSpaceTmp, "%.2f", availableMB/1024);
s_remainingSpace = remainingSpaceTmp; s_remainingSpace = remainingSpaceTmp;
if (spectralBinInt!=0 && framerate!=0) if (spectralBinInt!=0 && framerate!=0)
@ -362,7 +364,7 @@ static void *DjiTest_WidgetTask(void *arg)
double minTemp = availableMB / (frameSize * framerate * 60); double minTemp = availableMB / (frameSize * framerate * 60);
sprintf(remainingTimeTmp, "%.0f", minTemp); sprintf(remainingTimeTmp, "%.2f", minTemp);
s_remainingTime = remainingTimeTmp; s_remainingTime = remainingTimeTmp;
// 打印结果 // 打印结果
@ -491,6 +493,7 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)//
break; break;
case 3: case 3:
s_strStateOfSbg="采集中"; s_strStateOfSbg="采集中";
s_widgetValueList[5] = 1;
break; break;
default: default:
@ -607,6 +610,7 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)//
break; break;
case 104: case 104:
s_strStateOfXimea="采集中"; s_strStateOfXimea="采集中";
s_widgetValueList[9] = 1;
break; break;
default: default:
@ -874,7 +878,7 @@ static T_DjiReturnCode PsdkTestWidget_SetWidgetValue_StartRecord(E_DjiWidgetType
} }
//曝光时间有效性判断 //曝光时间有效性判断
float maxExposureTime = 1 / (float)framerate * 1000;//单位是ms float maxExposureTime = 1 / (float)framerate * 1000 * 1000;//单位是μs
if(value > maxExposureTime) if(value > maxExposureTime)
{ {
@ -1028,6 +1032,7 @@ static void extractSpectralBinAndBandnumber(bool isModifyBin)
} }
s_widgetValueList[10] = spectralBin; s_widgetValueList[10] = spectralBin;
spectralBinInt = spectralBin;
if (!isModifyBin) if (!isModifyBin)
{ {

2
samples/sample_c/platform/linux/manifold2/application/main.c
View File

@ -137,7 +137,7 @@ int main(int argc, char **argv)
return DJI_ERROR_SYSTEM_MODULE_CODE_SYSTEM_ERROR; return DJI_ERROR_SYSTEM_MODULE_CODE_SYSTEM_ERROR;
} }
returnCode = DjiCore_SetAlias("300TC_3.34.39.21"); returnCode = DjiCore_SetAlias("300TC_3.35.40.21");
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) { if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
USER_LOG_ERROR("set alias error"); USER_LOG_ERROR("set alias error");
return DJI_ERROR_SYSTEM_MODULE_CODE_SYSTEM_ERROR; return DJI_ERROR_SYSTEM_MODULE_CODE_SYSTEM_ERROR;