tangchao0503/Payload_SDK_V2.2.1_300tc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1. 新电脑：确定新的网口和串口号；

Browse Source 
2. 取消显示惯导模式；
3. 修改cmakelist：适配依赖库；
This commit is contained in:
tangchao0503
2022-11-21 12:14:27 +08:00
parent 92d53656a1
commit 164ed89840
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sample/api_sample/widget/test_widget.c
View File

@ -268,7 +268,7 @@ 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, "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, "System time: %u ms;\n光谱仪: %s;\n惯导: %s;\n精度: %s;\nmode: %s;\n", sysTimeMs, s_strStateOfXimea, s_strStateOfSbg, s_strSbgAccuracy, s_strSbgSolutionMode); snprintf(message, PSDK_WIDGET_FLOATING_WINDOW_MSG_MAX_LEN, "System time: %u ms;\n光谱仪: %s;\n惯导: %s;\n精度: %s;\n", sysTimeMs, s_strStateOfXimea, s_strStateOfSbg, s_strSbgAccuracy);
psdkStat = PsdkWidgetFloatingWindow_ShowMessage(message); psdkStat = PsdkWidgetFloatingWindow_ShowMessage(message);
if (psdkStat != PSDK_ERROR_SYSTEM_MODULE_CODE_SUCCESS) { if (psdkStat != PSDK_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
@ -383,29 +383,29 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)//
} }
else if (strcmp(result[0],"SolutionMode") == 0) else if (strcmp(result[0],"SolutionMode") == 0)
{ {
s_sbgMagState = atoi(result[1]); // s_sbgMagState = atoi(result[1]);
//
switch (s_sbgMagState) // switch (s_sbgMagState)
{ // {
case 0: // case 0:
s_strSbgSolutionMode="UNINITIALIZED"; // s_strSbgSolutionMode="UNINITIALIZED";
break; // break;
case 1: // case 1:
s_strSbgSolutionMode="VERTICAL_GYRO"; // s_strSbgSolutionMode="VERTICAL_GYRO";
break; // break;
case 2: // case 2:
s_strSbgSolutionMode="AHRS"; // s_strSbgSolutionMode="AHRS";
break; // break;
case 3: // case 3:
s_strSbgSolutionMode="NAV_VELOCITY"; // s_strSbgSolutionMode="NAV_VELOCITY";
break; // break;
case 4: // case 4:
s_strSbgSolutionMode="NAV_POSITION"; // s_strSbgSolutionMode="NAV_POSITION";
break; // break;
//
default: // default:
break; // break;
} // }
} }
else if (strcmp(result[0],"ximea") == 0) else if (strcmp(result[0],"ximea") == 0)
{ {

2
sample/platform/linux/manifold2/hal/hal_network.c
View File

@ -32,7 +32,7 @@
#include "psdk_logger.h" #include "psdk_logger.h"
/* Private constants ---------------------------------------------------------*/ /* Private constants ---------------------------------------------------------*/
#define LINUX_NETWORK_DEV "eth0"//enx00e04c360a7d #define LINUX_NETWORK_DEV "eth1"//enx00e04c360a7d
#define LINUX_CMD_STR_MAX_SIZE (128) #define LINUX_CMD_STR_MAX_SIZE (128)
/* Private types -------------------------------------------------------------*/ /* Private types -------------------------------------------------------------*/

2
sample/platform/linux/manifold2/hal/hal_uart.c
View File

@ -28,7 +28,7 @@
#include "hal_uart.h" #include "hal_uart.h"
/* Private constants ---------------------------------------------------------*/ /* Private constants ---------------------------------------------------------*/
#define LINUX_UART_DEV "/dev/ttyUSB0"///dev/dji_serial_port #define LINUX_UART_DEV "/dev/ttyUSB1"///dev/dji_serial_port
/* Private types -------------------------------------------------------------*/ /* Private types -------------------------------------------------------------*/
static int s_psdkUartFd = -1; static int s_psdkUartFd = -1;

10
sample/platform/linux/manifold2/project/CMakeLists.txt
View File

@ -21,9 +21,9 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/api_header
#include_directories(/home/iris-xport/projects/ellipse_n_sdk/SoftwareDevelopment/sbgECom/src) #include_directories(/home/iris-xport/projects/ellipse_n_sdk/SoftwareDevelopment/sbgECom/src)
#include_directories(/home/iris-xport/projects/ximea) #include_directories(/home/iris-xport/projects/ximea)
include_directories(/home/rock/ffmpeg_build/include) include_directories(/home/300tc/library/ffmpeg_build/include)
#include_directories(/usr/local/include) #include_directories(/usr/local/include)
#include_directories(/home/rock/ffmpeg_build) #include_directories(/home/300tc/library/ffmpeg_build)
## Srcs ## Srcs
file(GLOB_RECURSE APP_SRC ../../manifold2/application/*.c file(GLOB_RECURSE APP_SRC ../../manifold2/application/*.c
@ -52,7 +52,7 @@ if (DEVICE_SYSTEM_ID MATCHES x86_64)
link_directories(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/x86_64-linux-gnu-gcc) link_directories(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/x86_64-linux-gnu-gcc)
link_libraries(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/x86_64-linux-gnu-gcc/libpayloadsdk.a) link_libraries(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/x86_64-linux-gnu-gcc/libpayloadsdk.a)
link_libraries(/home/rock/ffmpeg_build/lib) link_libraries(/home/300tc/library/ffmpeg_build/lib)
# link_libraries(/usr/local/lib) # link_libraries(/usr/local/lib)
#link_libraries(/home/iris-xport/projects/ellipse_n_sdk/SoftwareDevelopment/sbgECom/bin/libsbgECom.a) #link_libraries(/home/iris-xport/projects/ellipse_n_sdk/SoftwareDevelopment/sbgECom/bin/libsbgECom.a)
@ -62,8 +62,8 @@ elseif (DEVICE_SYSTEM_ID MATCHES aarch64)
link_directories(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/aarch64-linux-gnu-gcc) link_directories(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/aarch64-linux-gnu-gcc)
link_libraries(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a) link_libraries(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a)
link_directories(/home/rock/ffmpeg_build/lib) link_directories(/home/300tc/library/ffmpeg_build/lib)
#link_libraries(/home/rock/ffmpeg_build/lib) #link_libraries(/home/300tc/library/ffmpeg_build/lib)
endif () endif ()
## Outputs ## Outputs