From 1f18a20b14ca32310ccf2f04cdaece69baac5c1c Mon Sep 17 00:00:00 2001
From: "XI.CHEN" <chenxi@xinyingpower.com>
Date: Thu, 14 Nov 2024 11:59:18 +0800
Subject: [PATCH] =?UTF-8?q?GPIO=E5=8F=A3=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/GPIOControl.h   |  4 ++--
 app/src/main/cpp/PhoneDevice.cpp | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/src/main/cpp/GPIOControl.h b/app/src/main/cpp/GPIOControl.h
index 105a0a21..0d754c4d 100644
--- a/app/src/main/cpp/GPIOControl.h
+++ b/app/src/main/cpp/GPIOControl.h
@@ -39,7 +39,7 @@
 #define CMD_SET_SYSTEM_RESET  		            202
 #define CMD_SET_485_EN_STATE					131
 #define CMD_SET_12V_EN_STATE					133
-#if 0
+#if 1
 #define CMD_SET_SPI_POWER                       129
 #define CMD_SET_CAM_3V3_EN_STATE				132
 #endif
@@ -104,7 +104,7 @@
 
 #else   //938
 #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_485_en0	                        301
 #define CMD_SET_NETWORK_POWER_EN            	362
diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index e3d8e0fa..55489ac5 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -3232,24 +3232,20 @@ int CPhoneDevice::GetWData(IDevice::WEATHER_INFO *weatherInfo)
 
 bool CPhoneDevice::OpenSensors(int sensortype)
 {
-    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);
+    if(sensortype == MAIN_POWER_OPEN) {
         GpioControl::set12VEnable(true);
         GpioControl::setCam3V3Enable(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)
     {
         GpioControl::setInt(CMD_SET_PIC1_POWER, 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);
     }
     if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN)
@@ -3280,14 +3276,16 @@ bool CPhoneDevice::CloseSensors(int sensortype)
         GpioControl::set12VEnable(false);
         GpioControl::setCam3V3Enable(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)
     {
         GpioControl::setInt(CMD_SET_PIC1_POWER, 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);
     }
     if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN)