xymp
/
TestComm
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加打开雨刮和机芯电源

Browse Source
main
jxjajs 7 months ago
parent 3b68418a1e
commit ef70a2a5d3
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File

40
app/src/main/cpp/SensorsProtocol.cpp
Unescape Escape View File

@ -2434,7 +2434,7 @@ int FindNextCameraPhotoCommand(int devidx)
packetsize = (WORD)MAX_PHOTO_FRAME_LEN; packetsize = (WORD)MAX_PHOTO_FRAME_LEN;
break; break;
case 10005: /* 关闭功能*/ case Stop_Cmd: /* 关闭功能*/
//Gm_CtrlPtzCmd(1, P_MOVE_LEFT); //Gm_CtrlPtzCmd(1, P_MOVE_LEFT);
//sleep(2); //sleep(2);
Gm_CtrlPtzCmd(channel, Cmd_Cancel); Gm_CtrlPtzCmd(channel, Cmd_Cancel);
@ -2443,25 +2443,25 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
//sleep(20); //sleep(20);
return 1; return 1;
case 10006: /* 自动扫描功能控制(1/0 打开/关闭该功能)*/ case Auto_Scan: /* 自动扫描功能控制(1/0 打开/关闭该功能)*/
Gm_CtrlPtzCmd(channel, P_Auto_Scan); Gm_CtrlPtzCmd(channel, P_Auto_Scan);
usleep(100000); usleep(100000);
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10007: /* 光圈缩小(1 有效)*/ case IRIS_CLOSE: /* 光圈缩小(1 有效)*/
Gm_CtrlPtzCmd(channel, P_IRIS_CLOSE); Gm_CtrlPtzCmd(channel, P_IRIS_CLOSE);
usleep(100000); usleep(100000);
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10008: /* 光圈放大(1 有效)*/ case IRIS_OPEN: /* 光圈放大(1 有效)*/
Gm_CtrlPtzCmd(channel, P_IRIS_OPEN); Gm_CtrlPtzCmd(channel, P_IRIS_OPEN);
usleep(100000); usleep(100000);
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10009: /* 近距离聚焦(1 有效)*/ case FOCUS_NEAR: /* 近距离聚焦(1 有效)*/
Gm_CtrlPtzCmd(channel, P_FOCUS_NEAR); Gm_CtrlPtzCmd(channel, P_FOCUS_NEAR);
usleep(100000); usleep(100000);
Gm_CtrlPtzCmd(channel, Cmd_Cancel); Gm_CtrlPtzCmd(channel, Cmd_Cancel);
@ -2469,7 +2469,7 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10010: /* 远距离聚焦(1 有效)*/ case FOCUS_FAR: /* 远距离聚焦(1 有效)*/
Gm_CtrlPtzCmd(channel, P_FOCUS_FAR); Gm_CtrlPtzCmd(channel, P_FOCUS_FAR);
usleep(100000); usleep(100000);
Gm_CtrlPtzCmd(channel, Cmd_Cancel); Gm_CtrlPtzCmd(channel, Cmd_Cancel);
@ -2477,7 +2477,7 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10011: /* 远离物体(1 有效)*/ case ZOOM_WIDE: /* 远离物体(1 有效)*/
Gm_CtrlPtzCmd(channel, P_ZOOM_WIDE); Gm_CtrlPtzCmd(channel, P_ZOOM_WIDE);
usleep(100000); usleep(100000);
Gm_CtrlPtzCmd(channel, Cmd_Cancel); Gm_CtrlPtzCmd(channel, Cmd_Cancel);
@ -2485,7 +2485,7 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10012: /* 接近物体(1 有效)*/ case ZOOM_TELE: /* 接近物体(1 有效)*/
Gm_CtrlPtzCmd(channel, P_ZOOM_TELE); Gm_CtrlPtzCmd(channel, P_ZOOM_TELE);
usleep(100000); usleep(100000);
Gm_CtrlPtzCmd(channel, Cmd_Cancel); Gm_CtrlPtzCmd(channel, Cmd_Cancel);
@ -2493,7 +2493,7 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10013: /* 向下移动镜头(1 有效)*/ case MOVE_DOWN: /* 向下移动镜头(1 有效)*/
Gm_CtrlPtzCmd(channel, P_MOVE_DOWN); Gm_CtrlPtzCmd(channel, P_MOVE_DOWN);
sleep(1); sleep(1);
Gm_CtrlPtzCmd(channel, Cmd_Cancel); Gm_CtrlPtzCmd(channel, Cmd_Cancel);
@ -2501,7 +2501,7 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10014: /* 向上移动镜头(1 有效)*/ case MOVE_UP: /* 向上移动镜头(1 有效)*/
Gm_CtrlPtzCmd(channel, P_MOVE_UP); Gm_CtrlPtzCmd(channel, P_MOVE_UP);
sleep(1); sleep(1);
Gm_CtrlPtzCmd(channel, Cmd_Cancel); Gm_CtrlPtzCmd(channel, Cmd_Cancel);
@ -2509,7 +2509,7 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10015: /* 向左移动镜头(1 有效)*/ case MOVE_LEFT: /* 向左移动镜头(1 有效)*/
Gm_CtrlPtzCmd(channel, P_MOVE_LEFT); Gm_CtrlPtzCmd(channel, P_MOVE_LEFT);
sleep(1); sleep(1);
Gm_CtrlPtzCmd(channel, Cmd_Cancel); Gm_CtrlPtzCmd(channel, Cmd_Cancel);
@ -2517,7 +2517,7 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10016: /* 向右移动镜头(1 有效)*/ case MOVE_RIGHT: /* 向右移动镜头(1 有效)*/
Gm_CtrlPtzCmd(channel, P_MOVE_RIGHT); Gm_CtrlPtzCmd(channel, P_MOVE_RIGHT);
sleep(1); sleep(1);
Gm_CtrlPtzCmd(channel, Cmd_Cancel); Gm_CtrlPtzCmd(channel, Cmd_Cancel);
@ -2525,7 +2525,7 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 1; return 1;
case 10017: /* 调用预置点*/ case MOVE_PRESETNO: /* 调用预置点*/
//srdt.presetno = 2; //srdt.presetno = 2;
Gm_CtrlPtzCmd(channel, MOVE_TO_PRESETNO+srdt.presetno); Gm_CtrlPtzCmd(channel, MOVE_TO_PRESETNO+srdt.presetno);
sleep(2); sleep(2);
@ -2546,12 +2546,24 @@ int FindNextCameraPhotoCommand(int devidx)
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
srdt.IsSleep = 0; srdt.IsSleep = 0;
return 1; return 1;
case 10018: /* 设置预置点*/ case SAVE_PRESETNO: /* 设置预置点*/
Gm_CtrlPtzCmd(channel, SET_PRESETNO+srdt.presetno); Gm_CtrlPtzCmd(channel, SET_PRESETNO+srdt.presetno);
usleep(100000); usleep(100000);
srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
srdt.iLastGetPhotoNo = -1; srdt.iLastGetPhotoNo = -1;
return 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: default:
imagesize = 0xFF; imagesize = 0xFF;
packetsize = (WORD)srdt.ms_dev[devidx].SerialCmdidx; packetsize = (WORD)srdt.ms_dev[devidx].SerialCmdidx;

4
app/src/main/cpp/SensorsProtocol.h
Unescape Escape View File

@ -113,6 +113,8 @@ typedef long long LONG;
#define D_MOVE_UP 0x0008002d /* 向上移动镜头(1 有效)*/ #define D_MOVE_UP 0x0008002d /* 向上移动镜头(1 有效)*/
#define D_MOVE_LEFT 0x00042d00 /* 向左移动镜头(1 有效)*/ #define D_MOVE_LEFT 0x00042d00 /* 向左移动镜头(1 有效)*/
#define D_MOVE_RIGHT 0x00022d00 /* 向右移动镜头(1 有效)*/ #define D_MOVE_RIGHT 0x00022d00 /* 向右移动镜头(1 有效)*/
#define D_OPEN_TOTAL 0x0009000B /* 打开总电源(1 有效)*/
#define D_OPEN_MODULE_POWER 0x0009000C /* 打开机芯电源(1 有效)*/
/* 摄像机下发命令宏定义*/ /* 摄像机下发命令宏定义*/
#define Take_Photo 0 /* 拍照*/ #define Take_Photo 0 /* 拍照*/
@ -131,6 +133,8 @@ typedef long long LONG;
#define MOVE_RIGHT 10016 /* 向右移动镜头(1 有效)*/ #define MOVE_RIGHT 10016 /* 向右移动镜头(1 有效)*/
#define MOVE_PRESETNO 10017 // 调用预置点 #define MOVE_PRESETNO 10017 // 调用预置点
#define SAVE_PRESETNO 10018 // 设置预置点 #define SAVE_PRESETNO 10018 // 设置预置点
#define OPEN_TOTAL 10019 /* 打开总电源(1 有效)*/
#define OPEN_MODULE_POWER 10020 /* 打开机芯电源(1 有效)*/
#define SPEED_DOME_CAMERA 0 /* 球机摄像机*/ #define SPEED_DOME_CAMERA 0 /* 球机摄像机*/
#define SERIAL_CAMERA 2 /* 串口摄像机a*/ #define SERIAL_CAMERA 2 /* 串口摄像机a*/

5
app/src/main/cpp/native-lib.cpp
Unescape Escape View File

@ -877,7 +877,7 @@ Java_com_xinyingpower_testcomm_MainActivity_turnOn(
setInt(CMD_SET_485_en4, 1); setInt(CMD_SET_485_en4, 1);
setInt(CMD_SET_SPI_POWER, 1); setInt(CMD_SET_SPI_POWER, 1);
LoadSensorConfig(); 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( Java_com_xinyingpower_testcomm_MainActivity_setSpeed(
JNIEnv* env, JNIEnv* env,
jobject /*this*/, jint speed) { jobject /*this*/, jint speed) {
CameraPhotoCmd(0, 1, OPEN_TOTAL, 0, 0);
usleep(200000);
CameraPhotoCmd(0, 1, OPEN_MODULE_POWER, 0, 0);
} }

Write Preview
Loading…
Cancel
Save