Compare commits
1 Commits
2.30.34.20
...
2.31.35.21
Author | SHA1 | Date | |
---|---|---|---|
66c3d0709e |
@ -88,6 +88,7 @@ static char * s_strSbgAccuracy="None";
|
||||
char XimeaFramerate[100]=" ";
|
||||
char XimeaExposeTime[100]=" ";
|
||||
char XimeaExposeMaxValue[100]=" ";
|
||||
char spectralBin[100]="None";
|
||||
static char * s_strSbgSolutionMode="None";
|
||||
static char * s_strStateOfXimea="None";
|
||||
|
||||
@ -115,6 +116,7 @@ static const T_PsdkWidgetHandlerListItem s_widgetHandlerList[] = {
|
||||
{8, PSDK_WIDGET_TYPE_INT_INPUT_BOX, PsdkTestWidget_SetWidgetValue_StartRecord, PsdkTestWidget_GetWidgetValue, NULL},
|
||||
{9, PSDK_WIDGET_TYPE_SWITCH, PsdkTestWidget_SetWidgetValue_StartRecord, PsdkTestWidget_GetWidgetValue, NULL},
|
||||
{10, PSDK_WIDGET_TYPE_LIST, PsdkTestWidget_SetWidgetValue_StartRecord, PsdkTestWidget_GetWidgetValue, NULL},//PsdkTestWidget_SetWidgetValue
|
||||
{11, PSDK_WIDGET_TYPE_LIST, PsdkTestWidget_SetWidgetValue_StartRecord, PsdkTestWidget_GetWidgetValue, NULL},
|
||||
};
|
||||
|
||||
static char *s_widgetTypeNameArray[] = {
|
||||
@ -289,8 +291,8 @@ static void *PsdkTest_WidgetTask(void *arg)
|
||||
|
||||
//snprintf(message, PSDK_WIDGET_FLOATING_WINDOW_MSG_MAX_LEN, "System time: %u ms;\nMAG: %d;\nIMAGER: %d;\nIMU: %d;\nFile: %d;\n", sysTimeMs, s_sbgMagState, s_stateOfXimea, s_stateOfSbg, s_stateOfFile);
|
||||
|
||||
snprintf(message, PSDK_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",
|
||||
s_strUIMessage, s_strStateOfXimea, s_strStateOfSbg, s_strSbgSatelliteCounter, s_strSbgAccuracy, XimeaFramerate, XimeaExposeTime, XimeaExposeMaxValue, s_strPitch, s_strRoll, s_strYaw);
|
||||
snprintf(message, PSDK_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_strUIMessage, s_strStateOfXimea, s_strStateOfSbg, s_strSbgSatelliteCounter, s_strSbgAccuracy, XimeaFramerate, XimeaExposeTime, XimeaExposeMaxValue, s_strPitch, s_strRoll, s_strYaw, spectralBin);
|
||||
|
||||
psdkStat = PsdkWidgetFloatingWindow_ShowMessage(message);
|
||||
if (psdkStat != PSDK_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
@ -409,7 +411,7 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)//
|
||||
|
||||
if (systemON_Control == 3)
|
||||
{
|
||||
strcpy(s_strUIMessage,"采集系统崩溃,请重启并联系技术工程师!");
|
||||
strcpy(s_strUIMessage,"数据量过大,采集系统已经停止,请重新上电!");
|
||||
messageTimeCounter = 0;
|
||||
messageTimespan = 1000;
|
||||
}
|
||||
@ -560,6 +562,11 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)//
|
||||
messageTimeCounter = 0;
|
||||
messageTimespan = 10;
|
||||
}
|
||||
else if (strcmp(result[0],"bin") == 0)
|
||||
{
|
||||
int spectralBin_tm = atoi(result[2]);
|
||||
sprintf(spectralBin,"%d",spectralBin_tm);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -859,6 +866,24 @@ static T_PsdkReturnCode PsdkTestWidget_SetWidgetValue_StartRecord(E_PsdkWidgetTy
|
||||
|
||||
system("/home/pi/tc_ShellScripts/update0.sh &> /media/nvme/300TC/update/log");
|
||||
}
|
||||
break;
|
||||
case 11:
|
||||
if (value==0)//等待指令
|
||||
{
|
||||
}
|
||||
if (value==1)
|
||||
{
|
||||
system("sudo sed -i 's/spectralBin =.*/spectralBin = 1;/g' /media/nvme/300TC/config/ximea.cfg");
|
||||
}
|
||||
else if (value==2)
|
||||
{
|
||||
system("sudo sed -i 's/spectralBin =.*/spectralBin = 2;/g' /media/nvme/300TC/config/ximea.cfg");
|
||||
}
|
||||
|
||||
strcpy(s_strUIMessage,"请重新上电!");
|
||||
messageTimeCounter = 0;
|
||||
messageTimespan = 10000;
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
@ -125,6 +125,22 @@
|
||||
"item_name": "更新"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"widget_index": 11,
|
||||
"widget_type": "list",
|
||||
"widget_name": "bin",
|
||||
"list_item": [
|
||||
{
|
||||
"item_name": "等待指令"
|
||||
},
|
||||
{
|
||||
"item_name": "光谱1"
|
||||
},
|
||||
{
|
||||
"item_name": "光谱2"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -125,6 +125,22 @@
|
||||
"item_name": "更新"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"widget_index": 11,
|
||||
"widget_type": "list",
|
||||
"widget_name": "bin",
|
||||
"list_item": [
|
||||
{
|
||||
"item_name": "等待指令"
|
||||
},
|
||||
{
|
||||
"item_name": "光谱1"
|
||||
},
|
||||
{
|
||||
"item_name": "光谱2"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -398,7 +398,7 @@ int main(void)
|
||||
}
|
||||
|
||||
//设置负载设备的别称
|
||||
if (PsdkProductInfo_SetAlias("300TC_2.30.34.20") != PSDK_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
if (PsdkProductInfo_SetAlias("300TC_2.31.35.21") != PSDK_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
PsdkLogger_UserLogError("set product alias error.");
|
||||
return PSDK_ERROR_SYSTEM_MODULE_CODE_UNKNOWN;
|
||||
}
|
||||
|
Reference in New Issue
Block a user