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

GPIO口更改

Browse Source
hdrplus
陈曦 7 months ago
parent 99644acba9
commit 1f18a20b14
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -39,7 +39,7 @@
#define CMD_SET_SYSTEM_RESET 202 #define CMD_SET_SYSTEM_RESET 202
#define CMD_SET_485_EN_STATE 131 #define CMD_SET_485_EN_STATE 131
#define CMD_SET_12V_EN_STATE 133 #define CMD_SET_12V_EN_STATE 133
#if 0 #if 1
#define CMD_SET_SPI_POWER 129 #define CMD_SET_SPI_POWER 129
#define CMD_SET_CAM_3V3_EN_STATE 132 #define CMD_SET_CAM_3V3_EN_STATE 132
#endif #endif
@ -104,7 +104,7 @@
#else //938 #else //938
#define CMD_SET_485_en1 302 #define CMD_SET_485_en1 302
#define CMD_SET_CAM_3V3_EN_STATE 360 //#define CMD_SET_CAM_3V3_EN_STATE 360
#define CMD_SET_UART0_EN 361 #define CMD_SET_UART0_EN 361
#define CMD_SET_485_en0 301 #define CMD_SET_485_en0 301
#define CMD_SET_NETWORK_POWER_EN 362 #define CMD_SET_NETWORK_POWER_EN 362

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

@ -3232,24 +3232,20 @@ int CPhoneDevice::GetWData(IDevice::WEATHER_INFO *weatherInfo)
bool CPhoneDevice::OpenSensors(int sensortype) bool CPhoneDevice::OpenSensors(int sensortype)
{ {
if(sensortype == MAIN_POWER_OPEN) if(sensortype == MAIN_POWER_OPEN) {
{
// 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::set12VEnable(true); GpioControl::set12VEnable(true);
GpioControl::setCam3V3Enable(true); GpioControl::setCam3V3Enable(true);
GpioControl::setRS485Enable(true); GpioControl::setRS485Enable(true);
GpioControl::setInt(CMD_SET_485_EN_STATE, 1); // 打开RS485电源 // GpioControl::setInt(CMD_SET_485_EN_STATE, 1); // 打开RS485电源
GpioControl::setInt(CMD_SET_485_ENABLE, 1);
GpioControl::setInt(CMD_SET_SPI_POWER, 1);
} }
if(sensortype == CAMERA_SENSOR_OPEN) if(sensortype == CAMERA_SENSOR_OPEN)
{ {
GpioControl::setInt(CMD_SET_PIC1_POWER, 1); GpioControl::setInt(CMD_SET_PIC1_POWER, 1);
GpioControl::setInt(CMD_SET_485_en4, 1); GpioControl::setInt(CMD_SET_485_en4, 1);
GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 1); // 打开3.3V电压 // GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 1); // 打开3.3V电压
GpioControl::setInt(CMD_SET_3V3_PWR_ENABLE, 1);
GpioControl::setInt(CMD_SET_PTZ_PWR_ENABLE, 1); GpioControl::setInt(CMD_SET_PTZ_PWR_ENABLE, 1);
} }
if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN) if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN)
@ -3280,14 +3276,16 @@ bool CPhoneDevice::CloseSensors(int sensortype)
GpioControl::set12VEnable(false); GpioControl::set12VEnable(false);
GpioControl::setCam3V3Enable(false); GpioControl::setCam3V3Enable(false);
GpioControl::setRS485Enable(false); GpioControl::setRS485Enable(false);
GpioControl::setInt(CMD_SET_485_EN_STATE, 0); // GpioControl::setInt(CMD_SET_485_EN_STATE, 0);
GpioControl::setInt(CMD_SET_485_ENABLE, 0);
} }
if(sensortype == CAMERA_SENSOR_OPEN) if(sensortype == CAMERA_SENSOR_OPEN)
{ {
GpioControl::setInt(CMD_SET_PIC1_POWER, 0); GpioControl::setInt(CMD_SET_PIC1_POWER, 0);
GpioControl::setInt(CMD_SET_485_en4, 0); GpioControl::setInt(CMD_SET_485_en4, 0);
GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 0); // GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 0);
GpioControl::setInt(CMD_SET_3V3_PWR_ENABLE, 0);
GpioControl::setInt(CMD_SET_PTZ_PWR_ENABLE, 0); GpioControl::setInt(CMD_SET_PTZ_PWR_ENABLE, 0);
} }
if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN) if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN)

Write Preview
Loading…
Cancel
Save