From 164ed89840c651b02a9d8ea192028464d869958d Mon Sep 17 00:00:00 2001 From: tangchao0503 <735056338@qq.com> Date: Mon, 21 Nov 2022 12:14:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=96=B0=E7=94=B5=E8=84=91=EF=BC=9A?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E6=96=B0=E7=9A=84=E7=BD=91=E5=8F=A3=E5=92=8C?= =?UTF-8?q?=E4=B8=B2=E5=8F=A3=E5=8F=B7=EF=BC=9B=202.=20=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=83=AF=E5=AF=BC=E6=A8=A1=E5=BC=8F=EF=BC=9B?= =?UTF-8?q?=203.=20=E4=BF=AE=E6=94=B9cmakelist=EF=BC=9A=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=BA=93=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sample/api_sample/widget/test_widget.c | 48 +++++++++---------- .../linux/manifold2/hal/hal_network.c | 2 +- .../platform/linux/manifold2/hal/hal_uart.c | 2 +- .../linux/manifold2/project/CMakeLists.txt | 10 ++-- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/sample/api_sample/widget/test_widget.c b/sample/api_sample/widget/test_widget.c index 6683971..87224c4 100644 --- a/sample/api_sample/widget/test_widget.c +++ b/sample/api_sample/widget/test_widget.c @@ -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;\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); 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) { - s_sbgMagState = atoi(result[1]); - - switch (s_sbgMagState) - { - case 0: - s_strSbgSolutionMode="UNINITIALIZED"; - break; - case 1: - s_strSbgSolutionMode="VERTICAL_GYRO"; - break; - case 2: - s_strSbgSolutionMode="AHRS"; - break; - case 3: - s_strSbgSolutionMode="NAV_VELOCITY"; - break; - case 4: - s_strSbgSolutionMode="NAV_POSITION"; - break; - - default: - break; - } +// s_sbgMagState = atoi(result[1]); +// +// switch (s_sbgMagState) +// { +// case 0: +// s_strSbgSolutionMode="UNINITIALIZED"; +// break; +// case 1: +// s_strSbgSolutionMode="VERTICAL_GYRO"; +// break; +// case 2: +// s_strSbgSolutionMode="AHRS"; +// break; +// case 3: +// s_strSbgSolutionMode="NAV_VELOCITY"; +// break; +// case 4: +// s_strSbgSolutionMode="NAV_POSITION"; +// break; +// +// default: +// break; +// } } else if (strcmp(result[0],"ximea") == 0) { diff --git a/sample/platform/linux/manifold2/hal/hal_network.c b/sample/platform/linux/manifold2/hal/hal_network.c index 66df06d..f501aaa 100644 --- a/sample/platform/linux/manifold2/hal/hal_network.c +++ b/sample/platform/linux/manifold2/hal/hal_network.c @@ -32,7 +32,7 @@ #include "psdk_logger.h" /* Private constants ---------------------------------------------------------*/ -#define LINUX_NETWORK_DEV "eth0"//enx00e04c360a7d +#define LINUX_NETWORK_DEV "eth1"//enx00e04c360a7d #define LINUX_CMD_STR_MAX_SIZE (128) /* Private types -------------------------------------------------------------*/ diff --git a/sample/platform/linux/manifold2/hal/hal_uart.c b/sample/platform/linux/manifold2/hal/hal_uart.c index eba73e6..ff14353 100644 --- a/sample/platform/linux/manifold2/hal/hal_uart.c +++ b/sample/platform/linux/manifold2/hal/hal_uart.c @@ -28,7 +28,7 @@ #include "hal_uart.h" /* Private constants ---------------------------------------------------------*/ -#define LINUX_UART_DEV "/dev/ttyUSB0"///dev/dji_serial_port +#define LINUX_UART_DEV "/dev/ttyUSB1"///dev/dji_serial_port /* Private types -------------------------------------------------------------*/ static int s_psdkUartFd = -1; diff --git a/sample/platform/linux/manifold2/project/CMakeLists.txt b/sample/platform/linux/manifold2/project/CMakeLists.txt index dfa8629..f8fdd40 100644 --- a/sample/platform/linux/manifold2/project/CMakeLists.txt +++ b/sample/platform/linux/manifold2/project/CMakeLists.txt @@ -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/ximea) -include_directories(/home/rock/ffmpeg_build/include) +include_directories(/home/300tc/library/ffmpeg_build/include) #include_directories(/usr/local/include) -#include_directories(/home/rock/ffmpeg_build) +#include_directories(/home/300tc/library/ffmpeg_build) ## Srcs 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_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(/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_libraries(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a) - link_directories(/home/rock/ffmpeg_build/lib) - #link_libraries(/home/rock/ffmpeg_build/lib) + link_directories(/home/300tc/library/ffmpeg_build/lib) + #link_libraries(/home/300tc/library/ffmpeg_build/lib) endif () ## Outputs