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

Compare commits

base: tangchao0503:3.33.39.21
Branches Tags
tangchao0503:master
tangchao0503:3.38.44.21 tangchao0503:3.38.43.21 tangchao0503:3.37.43.21 tangchao0503:3.37.42.21 tangchao0503:3.36.41.21 tangchao0503:3.35.40.21 tangchao0503:3.34.39.21 tangchao0503:3.33.39.21 tangchao0503:3.32.37.21 tangchao0503:3.5 tangchao0503:3.4 tangchao0503:3.3 tangchao0503:3.2 tangchao0503:3.1 tangchao0503:2.2.1 tangchao0503:3.0
...
compare: tangchao0503:4df18d88dd81574df6deb67d4948073f327b3727
Branches Tags
tangchao0503:master
tangchao0503:3.38.44.21 tangchao0503:3.38.43.21 tangchao0503:3.37.43.21 tangchao0503:3.37.42.21 tangchao0503:3.36.41.21 tangchao0503:3.35.40.21 tangchao0503:3.34.39.21 tangchao0503:3.33.39.21 tangchao0503:3.32.37.21 tangchao0503:3.5 tangchao0503:3.4 tangchao0503:3.3 tangchao0503:3.2 tangchao0503:3.1 tangchao0503:2.2.1 tangchao0503:3.0

2 Commits
3.33.39.21 ... 4df18d88dd

Author SHA1 Message Date
tangchao0503
4df18d88dd add：psdk重启后，通知ximeaAirborneSystem发送ximeaAirborneSystem的状态，以恢复psdk状态至重启前； 2023-10-25 15:16:09 +08:00
tangchao0503
80159490e1 modify：修改dji日志输出路径 2023-09-16 19:30:05 +08:00
2 changed files with 12 additions and 7 deletions
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_port = htons(PORT);
s_server.sin_addr= *((struct in_addr *)he->h_addr);
system("/home/300tc/projects/udpClient/udpClient 127.0.0.1 10");
/* tc-----------------------------------------------*/
return DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
@ -345,7 +347,7 @@ static void *DjiTest_WidgetTask(void *arg)
// 转换为MB
double availableMB = availableBytes / (1024.0 * 1024.0);
sprintf(remainingSpaceTmp, "%.0f", availableMB/1024);
sprintf(remainingSpaceTmp, "%.2f", availableMB/1024);
s_remainingSpace = remainingSpaceTmp;
if (spectralBinInt!=0 && framerate!=0)
@ -362,7 +364,7 @@ static void *DjiTest_WidgetTask(void *arg)
double minTemp = availableMB / (frameSize * framerate * 60);
sprintf(remainingTimeTmp, "%.0f", minTemp);
sprintf(remainingTimeTmp, "%.2f", minTemp);
s_remainingTime = remainingTimeTmp;
// 打印结果
@ -491,6 +493,7 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)//
break;
case 3:
s_strStateOfSbg="采集中";
s_widgetValueList[5] = 1;
break;
default:
@ -607,6 +610,7 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)//
break;
case 104:
s_strStateOfXimea="采集中";
s_widgetValueList[9] = 1;
break;
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)
{
@ -1028,6 +1032,7 @@ static void extractSpectralBinAndBandnumber(bool isModifyBin)
}
s_widgetValueList[10] = spectralBin;
spectralBinInt = spectralBin;
if (!isModifyBin)
{

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

@ -56,9 +56,9 @@
#include "dji_sdk_config.h"
/* Private constants ---------------------------------------------------------*/
#define DJI_LOG_PATH "Logs/DJI"
#define DJI_LOG_INDEX_FILE_NAME "Logs/latest"
#define DJI_LOG_FOLDER_NAME "Logs"
#define DJI_LOG_PATH "/media/nvme/300TC/programRunLog/djiLog/DJI"
#define DJI_LOG_INDEX_FILE_NAME "/media/nvme/300TC/programRunLog/djiLog/latest"
#define DJI_LOG_FOLDER_NAME "/media/nvme/300TC/programRunLog/djiLog"
#define DJI_LOG_PATH_MAX_SIZE (128)
#define DJI_LOG_FOLDER_NAME_MAX_SIZE (32)
#define DJI_LOG_MAX_COUNT (10)
@ -137,7 +137,7 @@ int main(int argc, char **argv)
return DJI_ERROR_SYSTEM_MODULE_CODE_SYSTEM_ERROR;
}
returnCode = DjiCore_SetAlias("300TC_3.33.39.21");
returnCode = DjiCore_SetAlias("300TC_3.35.40.21");
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
USER_LOG_ERROR("set alias error");
return DJI_ERROR_SYSTEM_MODULE_CODE_SYSTEM_ERROR;