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

修改云台宏

Browse Source
PtzNew
Matthew 3 months ago
parent 4c426cf5ff
commit 22e81844ac
5 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/cpp/CMakeLists.txt
Unescape Escape View File

@ -21,7 +21,7 @@ if(ANDROID_ABI STREQUAL "armeabi-v7a")
add_definitions(-DUSING_N938) add_definitions(-DUSING_N938)
elseif(ANDROID_ABI STREQUAL "arm64-v8a") elseif(ANDROID_ABI STREQUAL "arm64-v8a")
# add_definitions(-DUSING_N938) # add_definitions(-DUSING_N938)
# add_definitions(-DUSING_PLZ) add_definitions(-DUSING_PTZ)
endif() endif()
# OUTPUT_DBG_INFO: 输出调试相关信息 # OUTPUT_DBG_INFO: 输出调试相关信息
@ -33,6 +33,8 @@ add_definitions(-DOUTPUT_SOCKET_DBG_INFO)
# Database.cpp # Database.cpp
# add_definitions(-DOUTPUT_DB_DBG_INFO) # add_definitions(-DOUTPUT_DB_DBG_INFO)
add_definitions(-DUSING_FFMPEG)
IF (CMAKE_BUILD_TYPE STREQUAL Debug) IF (CMAKE_BUILD_TYPE STREQUAL Debug)
ADD_DEFINITIONS(-D_DEBUG) ADD_DEFINITIONS(-D_DEBUG)
ELSE() ELSE()

6
app/src/main/cpp/GPIOControl.cpp
Unescape Escape View File

@ -346,7 +346,7 @@ bool GpioControl::SetCamerastatus(int cmd, bool status)
if(cmd == CMD_SET_PIC1_POWER) if(cmd == CMD_SET_PIC1_POWER)
m_cameraPowerStatus = status; m_cameraPowerStatus = status;
#endif #endif
#ifdef USING_PLZ #ifdef USING_PTZ
if(cmd == CMD_SET_PTZ_PWR_ENABLE) if(cmd == CMD_SET_PTZ_PWR_ENABLE)
{ {
m_cameraPowerStatus = status; m_cameraPowerStatus = status;
@ -366,7 +366,7 @@ bool GpioControl::GetSelftestStatus(time_t wait_time)
#ifdef USING_N938 #ifdef USING_N938
cmd = CMD_SET_PIC1_POWER; cmd = CMD_SET_PIC1_POWER;
#endif #endif
#ifdef USING_PLZ #ifdef USING_PTZ
cmd = CMD_SET_PTZ_PWR_ENABLE; cmd = CMD_SET_PTZ_PWR_ENABLE;
#endif #endif
time_t now = time(NULL); time_t now = time(NULL);
@ -388,7 +388,7 @@ time_t GpioControl::GetSelfTestRemain(time_t wait_time)
#ifdef USING_N938 #ifdef USING_N938
cmd = CMD_SET_PIC1_POWER; cmd = CMD_SET_PIC1_POWER;
#endif #endif
#ifdef USING_PLZ #ifdef USING_PTZ
cmd = CMD_SET_PTZ_PWR_ENABLE; cmd = CMD_SET_PTZ_PWR_ENABLE;
#endif #endif
time_t now = time(NULL); time_t now = time(NULL);

58
app/src/main/cpp/GPIOControl.h
Unescape Escape View File

@ -17,7 +17,7 @@
#ifndef USING_N938 #ifndef USING_N938
#ifndef USING_PLZ // MicroPhoto #ifndef USING_PTZ // MicroPhoto
#define CMD_GET_LIGHT_ADC 101 #define CMD_GET_LIGHT_ADC 101
#define CMD_SET_LIGHT_ADC 102 #define CMD_SET_LIGHT_ADC 102
@ -54,7 +54,7 @@
#define CMD_GET_CAMERA_STATUS 310 #define CMD_GET_CAMERA_STATUS 310
#define CMD_SET_INIT_STATUS 401 #define CMD_SET_INIT_STATUS 401
#else // defined(USING_PLZ) #else // defined(USING_PTZ)
#define CMD_SET_OTG_STATE 107 #define CMD_SET_OTG_STATE 107
#define CMD_GET_OTG_STATE 108 #define CMD_GET_OTG_STATE 108
@ -104,7 +104,7 @@
#define CMD_GET_CAMERA_STATUS 310 #define CMD_GET_CAMERA_STATUS 310
#define CMD_SET_INIT_STATUS 401 #define CMD_SET_INIT_STATUS 401
#endif // USING_PLZ #endif // USING_PTZ
#else // defined(USING_N938) #else // defined(USING_N938)
@ -220,7 +220,7 @@ public:
static void setCam3V3Enable(bool enabled, uint32_t delayedCloseTime) static void setCam3V3Enable(bool enabled, uint32_t delayedCloseTime)
{ {
#ifdef USING_PLZ #ifdef USING_PTZ
enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN, delayedCloseTime); enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN, delayedCloseTime);
#else #else
enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN, delayedCloseTime); enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN, delayedCloseTime);
@ -229,7 +229,7 @@ public:
static void setCam3V3Enable(bool enabled) static void setCam3V3Enable(bool enabled)
{ {
#ifdef USING_PLZ #ifdef USING_PTZ
enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN); enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN);
#else #else
enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN); enabled ? TurnOn(CMD_SET_3V3_PWR_EN) : TurnOff(CMD_SET_3V3_PWR_EN);
@ -239,7 +239,7 @@ public:
static void setBeeOn(bool z) static void setBeeOn(bool z)
{ {
#ifndef USING_N938 #ifndef USING_N938
#ifndef USING_PLZ #ifndef USING_PTZ
z ? TurnOn(CMD_SET_PWM_BEE_STATE) : TurnOff(CMD_SET_PWM_BEE_STATE); z ? TurnOn(CMD_SET_PWM_BEE_STATE) : TurnOff(CMD_SET_PWM_BEE_STATE);
#endif #endif
#endif #endif
@ -247,7 +247,7 @@ public:
static void setJidianqiState(bool z) { static void setJidianqiState(bool z) {
#ifndef USING_N938 #ifndef USING_N938
#ifndef USING_PLZ #ifndef USING_PTZ
z ? TurnOn(CMD_SET_ALM_MODE) : TurnOff(CMD_SET_ALM_MODE); z ? TurnOn(CMD_SET_ALM_MODE) : TurnOff(CMD_SET_ALM_MODE);
#endif #endif
#endif #endif
@ -264,7 +264,7 @@ public:
static void setRS485Enable(bool z, uint32_t delayedCloseTime) static void setRS485Enable(bool z, uint32_t delayedCloseTime)
{ {
#ifndef USING_N938 #ifndef USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
z ? TurnOn(CMD_SET_485_ENABLE) : TurnOff(CMD_SET_485_ENABLE, delayedCloseTime); z ? TurnOn(CMD_SET_485_ENABLE) : TurnOff(CMD_SET_485_ENABLE, delayedCloseTime);
#else #else
z ? TurnOn(CMD_SET_485_EN_STATE) : TurnOff(CMD_SET_485_EN_STATE, delayedCloseTime); z ? TurnOn(CMD_SET_485_EN_STATE) : TurnOff(CMD_SET_485_EN_STATE, delayedCloseTime);
@ -282,7 +282,7 @@ public:
static void setRS485Enable(bool z) static void setRS485Enable(bool z)
{ {
#ifndef USING_N938 #ifndef USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
z ? TurnOn(CMD_SET_485_ENABLE) : TurnOff(CMD_SET_485_ENABLE); z ? TurnOn(CMD_SET_485_ENABLE) : TurnOff(CMD_SET_485_ENABLE);
#else #else
z ? TurnOn(CMD_SET_485_EN_STATE) : TurnOff(CMD_SET_485_EN_STATE); z ? TurnOn(CMD_SET_485_EN_STATE) : TurnOff(CMD_SET_485_EN_STATE);
@ -305,7 +305,7 @@ public:
static void setLightAdc(int i) static void setLightAdc(int i)
{ {
#ifndef USING_N938 #ifndef USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
setInt(CMD_SET_LIGHT1_RESISTOR_ENABLE, i); setInt(CMD_SET_LIGHT1_RESISTOR_ENABLE, i);
#else #else
setInt(CMD_SET_LIGHT_ADC, i); setInt(CMD_SET_LIGHT_ADC, i);
@ -316,7 +316,7 @@ public:
static int getLightAdc() static int getLightAdc()
{ {
#ifndef USING_N938 #ifndef USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
return getInt(CMD_SET_LIGHT1_RESISTOR_ENABLE); return getInt(CMD_SET_LIGHT1_RESISTOR_ENABLE);
#else #else
return getInt(CMD_GET_LIGHT_ADC); return getInt(CMD_GET_LIGHT_ADC);
@ -562,11 +562,11 @@ public:
#ifdef USING_N938 #ifdef USING_N938
PowerControl(0, closeDelayTime) PowerControl(0, closeDelayTime)
#else // USING_N938 #else // USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
PowerControl(CMD_SET_3V3_PWR_EN, closeDelayTime) PowerControl(CMD_SET_3V3_PWR_EN, closeDelayTime)
#else // USING_PLZ #else // USING_PTZ
PowerControl(CMD_SET_3V3_PWR_EN, closeDelayTime) PowerControl(CMD_SET_3V3_PWR_EN, closeDelayTime)
#endif // USING_PLZ #endif // USING_PTZ
#endif // USING_N938 #endif // USING_N938
{ {
} }
@ -579,12 +579,12 @@ public:
#ifdef USING_N938 #ifdef USING_N938
PowerControl(CMD_SET_NETWORK_POWER_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN_STATE, closeDelayTime) PowerControl(CMD_SET_NETWORK_POWER_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN_STATE, closeDelayTime)
#else // USING_N938 #else // USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
PowerControl(CMD_SET_12V_EN_STATE, closeDelayTime) PowerControl(CMD_SET_12V_EN_STATE, closeDelayTime)
#else // USING_PLZ #else // USING_PTZ
// MicroPhoto // MicroPhoto
PowerControl(CMD_SET_12V_EN_STATE, CMD_SET_OTG_STATE, CMD_SET_485_EN_STATE, closeDelayTime) PowerControl(CMD_SET_12V_EN_STATE, CMD_SET_OTG_STATE, CMD_SET_485_EN_STATE, closeDelayTime)
#endif // USING_PLZ #endif // USING_PTZ
#endif // USING_N938 #endif // USING_N938
{ {
} }
@ -597,11 +597,11 @@ public:
#ifdef USING_N938 #ifdef USING_N938
PowerControl(CMD_SET_OTG_STATE, CMD_SET_NETWORK_POWER_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN_STATE, closeDelayTime) PowerControl(CMD_SET_OTG_STATE, CMD_SET_NETWORK_POWER_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN_STATE, closeDelayTime)
#else // USING_N938 #else // USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_485_ENABLE, CMD_SET_PTZ_PWR_ENABLE, CMD_SET_12V_EN_STATE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime) PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_485_ENABLE, CMD_SET_PTZ_PWR_ENABLE, CMD_SET_12V_EN_STATE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime)
#else // USING_PLZ #else // USING_PTZ
PowerControl(CMD_SET_OTG_STATE, CMD_SET_12V_EN_STATE, closeDelayTime) PowerControl(CMD_SET_OTG_STATE, CMD_SET_12V_EN_STATE, closeDelayTime)
#endif // USING_PLZ #endif // USING_PTZ
#endif // USING_N938 #endif // USING_N938
{ {
} }
@ -614,13 +614,13 @@ public:
#ifdef USING_N938 #ifdef USING_N938
PowerControl(CMD_SET_OTG_STATE, CMD_SET_NETWORK_POWER_EN, closeDelayTime) PowerControl(CMD_SET_OTG_STATE, CMD_SET_NETWORK_POWER_EN, closeDelayTime)
#else // USING_N938 #else // USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
// PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_5V_PWR_ENABLE, CMD_SET_100M_ENABLE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime) // PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_5V_PWR_ENABLE, CMD_SET_100M_ENABLE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime)
PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime) PowerControl(CMD_SET_3V3_PWR_EN, CMD_SET_OTG_STATE, CMD_SET_100M_SWITCH_PWR_ENABLE, closeDelayTime)
#else // USING_PLZ #else // USING_PTZ
// Micro Photo // Micro Photo
PowerControl(CMD_SET_OTG_STATE, CMD_SET_485_EN_STATE/* Only for wp6*/, closeDelayTime) PowerControl(CMD_SET_OTG_STATE, CMD_SET_485_EN_STATE/* Only for wp6*/, closeDelayTime)
#endif // USING_PLZ #endif // USING_PTZ
#endif // USING_N938 #endif // USING_N938
{ {
} }
@ -633,11 +633,11 @@ public:
#ifdef USING_N938 #ifdef USING_N938
PowerControl(CMD_SET_OTG_STATE, CMD_SET_NETWORK_POWER_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN_STATE, closeDelayTime) PowerControl(CMD_SET_OTG_STATE, CMD_SET_NETWORK_POWER_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN_STATE, closeDelayTime)
#else // USING_N938 #else // USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
PowerControl(CMD_SET_PTZ_PWR_ENABLE, CMD_SET_100M_ENABLE, CMD_SET_100M_SWITCH_PWR_ENABLE, CMD_SET_12V_EN_STATE, closeDelayTime) PowerControl(CMD_SET_PTZ_PWR_ENABLE, CMD_SET_100M_ENABLE, CMD_SET_100M_SWITCH_PWR_ENABLE, CMD_SET_12V_EN_STATE, closeDelayTime)
#else // USING_PLZ #else // USING_PTZ
PowerControl(CMD_SET_OTG_STATE, CMD_SET_12V_EN_STATE, closeDelayTime) PowerControl(CMD_SET_OTG_STATE, CMD_SET_12V_EN_STATE, closeDelayTime)
#endif // USING_PLZ #endif // USING_PTZ
#endif // USING_N938 #endif // USING_N938
{ {
} }
@ -650,11 +650,11 @@ public:
#ifdef USING_N938 #ifdef USING_N938
PowerControl(CMD_SET_SPI_POWER, CMD_SPI2SERIAL_POWER_EN, CMD_RS485_3V3_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN4, closeDelayTime) PowerControl(CMD_SET_SPI_POWER, CMD_SPI2SERIAL_POWER_EN, CMD_RS485_3V3_EN, CMD_SET_PIC1_POWER, CMD_SET_485_EN4, closeDelayTime)
#else // USING_N938 #else // USING_N938
#ifdef USING_PLZ #ifdef USING_PTZ
PowerControl(CMD_SET_12V_EN_STATE, CMD_SET_485_ENABLE, CMD_SET_3V3_PWR_EN, CMD_SET_SPI_POWER, CMD_SET_PTZ_PWR_ENABLE, closeDelayTime) PowerControl(CMD_SET_12V_EN_STATE, CMD_SET_485_ENABLE, CMD_SET_3V3_PWR_EN, CMD_SET_SPI_POWER, CMD_SET_PTZ_PWR_ENABLE, closeDelayTime)
#else // USING_PLZ #else // USING_PTZ
PowerControl(CMD_SET_12V_EN_STATE, CMD_SET_3V3_PWR_EN, CMD_SET_SPI_POWER, CMD_SET_485_EN_STATE, closeDelayTime) PowerControl(CMD_SET_12V_EN_STATE, CMD_SET_3V3_PWR_EN, CMD_SET_SPI_POWER, CMD_SET_485_EN_STATE, closeDelayTime)
#endif // USING_PLZ #endif // USING_PTZ
#endif // USING_N938 #endif // USING_N938
{ {
} }

2
app/src/main/cpp/MicroPhoto.cpp
Unescape Escape View File

@ -1457,7 +1457,7 @@ JNIEXPORT jint JNICALL
Java_com_xypower_mpapp_MicroPhotoService_getCustomAppId(JNIEnv *env, jobject thiz) { Java_com_xypower_mpapp_MicroPhotoService_getCustomAppId(JNIEnv *env, jobject thiz) {
#ifdef USING_N938 #ifdef USING_N938
return 2; return 2;
#elif defined(USING_PLZ) #elif defined(USING_PTZ)
return 1; return 1;
#else #else
return 0; return 0;

10
app/src/main/cpp/PhoneDevice.cpp
Unescape Escape View File

@ -4914,7 +4914,7 @@ bool CPhoneDevice::OpenSensors(int sensortype)
GpioControl::TurnOn(CMD_SET_SPI_POWER); GpioControl::TurnOn(CMD_SET_SPI_POWER);
// GpioControl::TurnOn(CMD_SET_485_EN_STATE); // 打开RS485电源 // GpioControl::TurnOn(CMD_SET_485_EN_STATE); // 打开RS485电源
#ifndef USING_N938 #ifndef USING_N938
#ifndef USING_PLZ #ifndef USING_PTZ
GpioControl::TurnOn(CMD_SET_485_EN_STATE); GpioControl::TurnOn(CMD_SET_485_EN_STATE);
#else #else
@ -4928,7 +4928,7 @@ bool CPhoneDevice::OpenSensors(int sensortype)
if(sensortype == CAMERA_SENSOR_OPEN) if(sensortype == CAMERA_SENSOR_OPEN)
{ {
#ifndef USING_N938 #ifndef USING_N938
#ifndef USING_PLZ #ifndef USING_PTZ
#else #else
GpioControl::TurnOn(CMD_SET_5V_PWR_ENABLE); GpioControl::TurnOn(CMD_SET_5V_PWR_ENABLE);
GpioControl::TurnOn(CMD_SET_PTZ_PWR_ENABLE); GpioControl::TurnOn(CMD_SET_PTZ_PWR_ENABLE);
@ -4979,7 +4979,7 @@ bool CPhoneDevice::CloseSensors(int sensortype, uint32_t delayedCloseTime)
GpioControl::TurnOff(CMD_SET_SPI_POWER, delayedCloseTime); GpioControl::TurnOff(CMD_SET_SPI_POWER, delayedCloseTime);
// GpioControl::TurnOff(CMD_SET_485_EN_STATE); // GpioControl::TurnOff(CMD_SET_485_EN_STATE);
#ifndef USING_N938 #ifndef USING_N938
#ifndef USING_PLZ #ifndef USING_PTZ
GpioControl::TurnOff(CMD_SET_485_EN_STATE, delayedCloseTime); GpioControl::TurnOff(CMD_SET_485_EN_STATE, delayedCloseTime);
#else #else
GpioControl::TurnOff(CMD_SET_485_ENABLE, delayedCloseTime); GpioControl::TurnOff(CMD_SET_485_ENABLE, delayedCloseTime);
@ -5001,7 +5001,7 @@ bool CPhoneDevice::CloseSensors(int sensortype, uint32_t delayedCloseTime)
#ifndef USING_N938 #ifndef USING_N938
// GpioControl::TurnOff(CMD_SET_3V3_PWR_ENABLE); // GpioControl::TurnOff(CMD_SET_3V3_PWR_ENABLE);
#ifndef USING_PLZ #ifndef USING_PTZ
#else #else
GpioControl::TurnOffImmediately(CMD_SET_5V_PWR_ENABLE); GpioControl::TurnOffImmediately(CMD_SET_5V_PWR_ENABLE);
GpioControl::TurnOffImmediately(CMD_SET_PTZ_PWR_ENABLE); GpioControl::TurnOffImmediately(CMD_SET_PTZ_PWR_ENABLE);
@ -5017,7 +5017,7 @@ bool CPhoneDevice::CloseSensors(int sensortype, uint32_t delayedCloseTime)
#ifndef USING_N938 #ifndef USING_N938
// GpioControl::TurnOff(CMD_SET_3V3_PWR_ENABLE); // GpioControl::TurnOff(CMD_SET_3V3_PWR_ENABLE);
#ifndef USING_PLZ #ifndef USING_PTZ
#else #else
GpioControl::TurnOff(CMD_SET_PTZ_PWR_ENABLE, delayedCloseTime); GpioControl::TurnOff(CMD_SET_PTZ_PWR_ENABLE, delayedCloseTime);
#endif #endif

Write Preview
Loading…
Cancel
Save