From ef70a2a5d39d09f7b61e8c7fc72b9c861ce31506 Mon Sep 17 00:00:00 2001 From: jxjajs Date: Fri, 29 Nov 2024 21:38:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=BC=80=E9=9B=A8?= =?UTF-8?q?=E5=88=AE=E5=92=8C=E6=9C=BA=E8=8A=AF=E7=94=B5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/SensorsProtocol.cpp | 40 ++++++++++++++++++---------- app/src/main/cpp/SensorsProtocol.h | 4 +++ app/src/main/cpp/native-lib.cpp | 5 +++- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index b8cca27..05e63c9 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -2434,7 +2434,7 @@ int FindNextCameraPhotoCommand(int devidx) packetsize = (WORD)MAX_PHOTO_FRAME_LEN; break; - case 10005: /* 关闭功能*/ + case Stop_Cmd: /* 关闭功能*/ //Gm_CtrlPtzCmd(1, P_MOVE_LEFT); //sleep(2); Gm_CtrlPtzCmd(channel, Cmd_Cancel); @@ -2443,25 +2443,25 @@ int FindNextCameraPhotoCommand(int devidx) srdt.iLastGetPhotoNo = -1; //sleep(20); return 1; - case 10006: /* 自动扫描功能控制(1/0 打开/关闭该功能)*/ + case Auto_Scan: /* 自动扫描功能控制(1/0 打开/关闭该功能)*/ Gm_CtrlPtzCmd(channel, P_Auto_Scan); usleep(100000); srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10007: /* 光圈缩小(1 有效)*/ + case IRIS_CLOSE: /* 光圈缩小(1 有效)*/ Gm_CtrlPtzCmd(channel, P_IRIS_CLOSE); usleep(100000); srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10008: /* 光圈放大(1 有效)*/ + case IRIS_OPEN: /* 光圈放大(1 有效)*/ Gm_CtrlPtzCmd(channel, P_IRIS_OPEN); usleep(100000); srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10009: /* 近距离聚焦(1 有效)*/ + case FOCUS_NEAR: /* 近距离聚焦(1 有效)*/ Gm_CtrlPtzCmd(channel, P_FOCUS_NEAR); usleep(100000); Gm_CtrlPtzCmd(channel, Cmd_Cancel); @@ -2469,7 +2469,7 @@ int FindNextCameraPhotoCommand(int devidx) srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10010: /* 远距离聚焦(1 有效)*/ + case FOCUS_FAR: /* 远距离聚焦(1 有效)*/ Gm_CtrlPtzCmd(channel, P_FOCUS_FAR); usleep(100000); Gm_CtrlPtzCmd(channel, Cmd_Cancel); @@ -2477,7 +2477,7 @@ int FindNextCameraPhotoCommand(int devidx) srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10011: /* 远离物体(1 有效)*/ + case ZOOM_WIDE: /* 远离物体(1 有效)*/ Gm_CtrlPtzCmd(channel, P_ZOOM_WIDE); usleep(100000); Gm_CtrlPtzCmd(channel, Cmd_Cancel); @@ -2485,7 +2485,7 @@ int FindNextCameraPhotoCommand(int devidx) srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10012: /* 接近物体(1 有效)*/ + case ZOOM_TELE: /* 接近物体(1 有效)*/ Gm_CtrlPtzCmd(channel, P_ZOOM_TELE); usleep(100000); Gm_CtrlPtzCmd(channel, Cmd_Cancel); @@ -2493,7 +2493,7 @@ int FindNextCameraPhotoCommand(int devidx) srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10013: /* 向下移动镜头(1 有效)*/ + case MOVE_DOWN: /* 向下移动镜头(1 有效)*/ Gm_CtrlPtzCmd(channel, P_MOVE_DOWN); sleep(1); Gm_CtrlPtzCmd(channel, Cmd_Cancel); @@ -2501,7 +2501,7 @@ int FindNextCameraPhotoCommand(int devidx) srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10014: /* 向上移动镜头(1 有效)*/ + case MOVE_UP: /* 向上移动镜头(1 有效)*/ Gm_CtrlPtzCmd(channel, P_MOVE_UP); sleep(1); Gm_CtrlPtzCmd(channel, Cmd_Cancel); @@ -2509,7 +2509,7 @@ int FindNextCameraPhotoCommand(int devidx) srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10015: /* 向左移动镜头(1 有效)*/ + case MOVE_LEFT: /* 向左移动镜头(1 有效)*/ Gm_CtrlPtzCmd(channel, P_MOVE_LEFT); sleep(1); Gm_CtrlPtzCmd(channel, Cmd_Cancel); @@ -2517,7 +2517,7 @@ int FindNextCameraPhotoCommand(int devidx) srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10016: /* 向右移动镜头(1 有效)*/ + case MOVE_RIGHT: /* 向右移动镜头(1 有效)*/ Gm_CtrlPtzCmd(channel, P_MOVE_RIGHT); sleep(1); Gm_CtrlPtzCmd(channel, Cmd_Cancel); @@ -2525,7 +2525,7 @@ int FindNextCameraPhotoCommand(int devidx) srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; - case 10017: /* 调用预置点*/ + case MOVE_PRESETNO: /* 调用预置点*/ //srdt.presetno = 2; Gm_CtrlPtzCmd(channel, MOVE_TO_PRESETNO+srdt.presetno); sleep(2); @@ -2546,12 +2546,24 @@ int FindNextCameraPhotoCommand(int devidx) srdt.iLastGetPhotoNo = -1; srdt.IsSleep = 0; return 1; - case 10018: /* 设置预置点*/ + case SAVE_PRESETNO: /* 设置预置点*/ Gm_CtrlPtzCmd(channel, SET_PRESETNO+srdt.presetno); usleep(100000); srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.iLastGetPhotoNo = -1; return 1; + case OPEN_TOTAL: /* 设置预置点*/ + Gm_CtrlPtzCmd(channel, D_OPEN_TOTAL); + usleep(100000); + srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; + srdt.iLastGetPhotoNo = -1; + return 1; + case OPEN_MODULE_POWER: /* 设置预置点*/ + Gm_CtrlPtzCmd(channel, D_OPEN_MODULE_POWER); + usleep(100000); + srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; + srdt.iLastGetPhotoNo = -1; + return 1; default: imagesize = 0xFF; packetsize = (WORD)srdt.ms_dev[devidx].SerialCmdidx; diff --git a/app/src/main/cpp/SensorsProtocol.h b/app/src/main/cpp/SensorsProtocol.h index 6472fe3..2be9685 100644 --- a/app/src/main/cpp/SensorsProtocol.h +++ b/app/src/main/cpp/SensorsProtocol.h @@ -113,6 +113,8 @@ typedef long long LONG; #define D_MOVE_UP 0x0008002d /* 向上移动镜头(1 有效)*/ #define D_MOVE_LEFT 0x00042d00 /* 向左移动镜头(1 有效)*/ #define D_MOVE_RIGHT 0x00022d00 /* 向右移动镜头(1 有效)*/ +#define D_OPEN_TOTAL 0x0009000B /* 打开总电源(1 有效)*/ +#define D_OPEN_MODULE_POWER 0x0009000C /* 打开机芯电源(1 有效)*/ /* 摄像机下发命令宏定义*/ #define Take_Photo 0 /* 拍照*/ @@ -131,6 +133,8 @@ typedef long long LONG; #define MOVE_RIGHT 10016 /* 向右移动镜头(1 有效)*/ #define MOVE_PRESETNO 10017 // 调用预置点 #define SAVE_PRESETNO 10018 // 设置预置点 +#define OPEN_TOTAL 10019 /* 打开总电源(1 有效)*/ +#define OPEN_MODULE_POWER 10020 /* 打开机芯电源(1 有效)*/ #define SPEED_DOME_CAMERA 0 /* 球机摄像机*/ #define SERIAL_CAMERA 2 /* 串口摄像机a*/ diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp index 6cca7ab..7ae08e3 100644 --- a/app/src/main/cpp/native-lib.cpp +++ b/app/src/main/cpp/native-lib.cpp @@ -877,7 +877,7 @@ Java_com_xinyingpower_testcomm_MainActivity_turnOn( setInt(CMD_SET_485_en4, 1); setInt(CMD_SET_SPI_POWER, 1); LoadSensorConfig(); -// InitPLZ(); +// InitPLZ CameraPhotoCmd(0, 1, OPEN_TOTAL, 0, 0);(); } @@ -942,6 +942,9 @@ extern "C" JNIEXPORT void JNICALL Java_com_xinyingpower_testcomm_MainActivity_setSpeed( JNIEnv* env, jobject /*this*/, jint speed) { + CameraPhotoCmd(0, 1, OPEN_TOTAL, 0, 0); + usleep(200000); + CameraPhotoCmd(0, 1, OPEN_MODULE_POWER, 0, 0); }