diff --git a/TestComm/app/src/main/cpp/SensorsProtocol.cpp b/TestComm/app/src/main/cpp/SensorsProtocol.cpp index ce30591e..0c9386ce 100644 --- a/TestComm/app/src/main/cpp/SensorsProtocol.cpp +++ b/TestComm/app/src/main/cpp/SensorsProtocol.cpp @@ -1144,7 +1144,7 @@ void testComm() sleep(5); CameraPhotoCmd(0, 1, ZOOM_WIDE, 0, 0); sleep(5); - CameraPhotoCmd(time(NULL), 1, 0, 6, 1); + CameraPhotoCmd(time(NULL), 1, 0, 6, 2); sleep(5); #endif diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index ce30591e..e6b9a07b 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -58,7 +58,7 @@ int getInt(int cmd) param.cmd = cmd; ioctl(fd, IOT_PARAM_READ, ¶m); #ifdef _DEBUG - ALOGI("getInt cmd=%d,value=%d,result=%d\r\n",param.cmd, param.value, param.result); + //ALOGI("getInt cmd=%d,value=%d,result=%d\r\n",param.cmd, param.value, param.result); #endif close(fd); return param.value; @@ -567,7 +567,7 @@ void Gm_CloseSensorsPower() /* 关闭电源*/ //switch(port) /* 根据硬件具体布置最后调整,目前是微拍板子的来控制*/ - set12VEnable(false); +/* set12VEnable(false); setCam3V3Enable(false); setRS485Enable(false); @@ -607,14 +607,14 @@ void Gm_CloseSensorsPower() igpio = getInt(CMD_SET_485_en3); igpio = getInt(CMD_SET_485_en4); #endif - +*/ } // 打开传感器电源 void Gm_OpenSensorsPower() { //char iIoNo; - int igpio; +/* int igpio; char szbuf[128]; //if(0 == port) @@ -669,9 +669,9 @@ void Gm_OpenSensorsPower() setInt(CMD_SET_485_en4, 0); #endif - /* 打开电源*/ + // 打开电源 //switch(port) - +*/ } // 查询传感器电源状态 @@ -1144,7 +1144,7 @@ void testComm() sleep(5); CameraPhotoCmd(0, 1, ZOOM_WIDE, 0, 0); sleep(5); - CameraPhotoCmd(time(NULL), 1, 0, 6, 1); + CameraPhotoCmd(time(NULL), 1, 0, 6, 2); sleep(5); #endif diff --git a/app/src/main/cpp/~$函数调用说明.docx b/app/src/main/cpp/~$函数调用说明.docx new file mode 100644 index 00000000..040ecd4c Binary files /dev/null and b/app/src/main/cpp/~$函数调用说明.docx differ diff --git a/app/src/main/cpp/串口函数调用说明(V1.0).docx b/app/src/main/cpp/串口函数调用说明(V1.0).docx deleted file mode 100644 index c550d605..00000000 Binary files a/app/src/main/cpp/串口函数调用说明(V1.0).docx and /dev/null differ diff --git a/app/src/main/cpp/串口函数调用说明.docx b/app/src/main/cpp/串口函数调用说明.docx new file mode 100644 index 00000000..af3bb815 Binary files /dev/null and b/app/src/main/cpp/串口函数调用说明.docx differ diff --git a/gradle.properties b/gradle.properties index 0cc565fc..68cb0ebb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,11 +23,12 @@ COMPILE_SDK_VERSION=33 TARGET_SDK_VERSION=28 COMPILE_MIN_SDK_VERSION=25 -opencvsdk=D:/shxy/android_lib/opencv-mobile-4.9.0-android +opencvsdk=D:/Workspace/deps/opencv-mobile-4.9.0-android # opencvsdk=D:/Workspace/deps/opencv-mobile-3.4.20-android -coreroot=D:/shxy/xymp/Core +coreroot=D:/Workspace/Github/xymp/xymp/Core # opencvsdk=D:/Workspace/deps/opencv-v5 -asioroot=D:/shxy/android_lib/asio-1.28.0 +asioroot=D:/Workspace/deps/asio-1.28.0 evpproot=D:/Workspace/Github/evpp -ncnnroot=D:/shxy/android_lib/ncnn-20230517-android-vulkan -libzipsdkroot=D:/shxy/android_lib/libzip-android-sdk +ncnnroot=D:/Workspace/deps/ncnn-20240410-android-vulkan +# ncnnroot=D:/Workspace/deps/ncnn-20230517-android-vulkan +libzipsdkroot=D:/Workspace/deps/libzip-android-sdk \ No newline at end of file