diff --git a/app/src/main/cpp/GPIOControl.h b/app/src/main/cpp/GPIOControl.h index 7c188dd0..bbad6049 100644 --- a/app/src/main/cpp/GPIOControl.h +++ b/app/src/main/cpp/GPIOControl.h @@ -43,7 +43,7 @@ #ifdef USING_N938 -#if 0 //云台 +#if 1 //云台 #define CMD_SET_485_ENABLE 512 #define CMD_SET_3V3_PWR_ENABLE 516 #define CMD_SET_5V_PWR_ENABLE 517 diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index d6757281..b0633180 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -3209,17 +3209,23 @@ bool CPhoneDevice::OpenSensors(int sensortype) { if(sensortype == MAIN_POWER_OPEN) { - GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 1); +// GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 1); GpioControl::setInt(CMD_SET_SPI_POWER, 1); - GpioControl::setInt(CMD_SET_5V_EN, 1); - GpioControl::setInt(CMD_SET_485_EN_STATE, 1); - GpioControl::setInt(CMD_SET_12V_EN_STATE, 1); - GpioControl::setInt(CMD_RS485_3V3_EN, 1); +// GpioControl::setInt(CMD_SET_5V_EN, 1); +// GpioControl::setInt(CMD_SET_485_EN_STATE, 1); +// GpioControl::setInt(CMD_SET_12V_EN_STATE, 1); +// GpioControl::setInt(CMD_RS485_3V3_EN, 1); + GpioControl::set12VEnable(true); + GpioControl::setCam3V3Enable(true); + GpioControl::setRS485Enable(true); + GpioControl::setInt(CMD_SET_485_ENABLE, 1); // 打开RS485电源 } if(sensortype == CAMERA_SENSOR_OPEN) { GpioControl::setInt(CMD_SET_PIC1_POWER, 1); GpioControl::setInt(CMD_SET_485_en4, 1); + GpioControl::setInt(CMD_SET_3V3_PWR_ENABLE, 1); // 打开3.3V电压 + GpioControl::setInt(CMD_SET_PTZ_PWR_ENABLE, 1); } if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN) { @@ -3245,19 +3251,19 @@ bool CPhoneDevice::CloseSensors(int sensortype) { if(sensortype == MAIN_POWER_OPEN) { - GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 0); GpioControl::setInt(CMD_SET_SPI_POWER, 0); - GpioControl::setInt(CMD_SET_5V_EN, 0); - GpioControl::setInt(CMD_SET_485_EN_STATE, 0); - GpioControl::setInt(CMD_SET_12V_EN_STATE, 0); - GpioControl::setInt(CMD_RS485_3V3_EN, 0); - } + GpioControl::set12VEnable(false); + GpioControl::setCam3V3Enable(false); + GpioControl::setRS485Enable(false); + GpioControl::setInt(CMD_SET_485_ENABLE, 0); - int igpio; + } if(sensortype == CAMERA_SENSOR_OPEN) { GpioControl::setInt(CMD_SET_PIC1_POWER, 0); GpioControl::setInt(CMD_SET_485_en4, 0); + GpioControl::setInt(CMD_SET_3V3_PWR_ENABLE, 0); + GpioControl::setInt(CMD_SET_PTZ_PWR_ENABLE, 0); } if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN) {