From b70a6a2999181415f708f539c0900709eead57ea Mon Sep 17 00:00:00 2001
From: "XI.CHEN" <chenxi@xinyingpower.com>
Date: Mon, 11 Nov 2024 15:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4N938=E5=AE=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/GPIOControl.h   |  2 --
 app/src/main/cpp/PhoneDevice.cpp | 15 +--------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/src/main/cpp/GPIOControl.h b/app/src/main/cpp/GPIOControl.h
index bbad6049..920c114b 100644
--- a/app/src/main/cpp/GPIOControl.h
+++ b/app/src/main/cpp/GPIOControl.h
@@ -41,7 +41,6 @@
 #define CMD_SET_CAM_3V3_EN_STATE				132
 #endif
 
-#ifdef USING_N938
 
 #if 1   //云台
 #define CMD_SET_485_ENABLE 512
@@ -166,7 +165,6 @@
 
 #endif
 
-#endif // USING_N938
 
 #ifdef USING_N938
 #define GPIO_NODE_N938          "/sys/devices/platform/1000b000.pinctrl/mt_gpio"
diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index b0633180..5ed58446 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -3133,8 +3133,6 @@ void CPhoneDevice::UpdateSimcard(const std::string& simcard)
 
 
 
-#ifdef USING_N938
-
 int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceTail, SENSOR_PARAM *sensorParam)
 {
     Collect_sensor_data();		//15s
@@ -3283,15 +3281,4 @@ bool CPhoneDevice::CloseSensors(int sensortype)
         GpioControl::setInt(CMD_SET_485_en2, 0);
     }
     return 0;
-}
-#else
-bool CPhoneDevice::OpenSensors(int sensortype)
-{
-    return false;
-}
-
-bool CPhoneDevice::CloseSensors(int sensortype)
-{
-    return false;
-}
-#endif
+}
\ No newline at end of file