移除无用的代码

app/src/main/cpp/SensorsProtocol.cpp

@@ -523,111 +523,12 @@ void Gm_CloseSensorsPower()
 	/* 关闭电源*/
 	//switch(port)
 	/* 根据硬件具体布置最后调整，目前是微拍板子的来控制*/
-/*    set12VEnable(false);
-	setCam3V3Enable(false);
-	setRS485Enable(false);
 
-#if 0
-	setInt(CMD_SET_WTH_POWER, 0);
-	setInt(CMD_SET_PULL_POWER, 0);
-	setInt(CMD_SET_ANGLE_POWER, 0);
-	setInt(CMD_SET_OTHER_POWER, 0);
-	setInt(CMD_SET_PIC1_POWER, 0);
-
-	sleep(3);
-	igpio = getInt(CMD_SET_WTH_POWER);
-	igpio = getInt(CMD_SET_PULL_POWER);
-	igpio = getInt(CMD_SET_ANGLE_POWER);
-	igpio = getInt(CMD_SET_OTHER_POWER);
-	igpio = getInt(CMD_SET_PIC1_POWER);
-#endif
-#if 1
-	setInt(CMD_SET_SPI_POWER, 1);
-	setInt(CMD_SET_485_EN0, 1);
-	setInt(CMD_SET_485_EN1, 1);
-	setInt(CMD_SET_485_EN2, 1);
-	setInt(CMD_SET_485_EN3, 1);
-	setInt(CMD_SET_485_EN4, 1);
-#else
-	setInt(CMD_SET_SPI_POWER, 0);
-	setInt(CMD_SET_485_EN0, 0);
-	setInt(CMD_SET_485_EN1, 0);
-	setInt(CMD_SET_485_EN2, 0);
-	setInt(CMD_SET_485_EN3, 0);
-	setInt(CMD_SET_485_EN4, 0);
-	sleep(3);
-	igpio = getInt(CMD_SET_SPI_POWER);
-	igpio = getInt(CMD_SET_485_EN0);
-	igpio = getInt(CMD_SET_485_EN1);
-	igpio = getInt(CMD_SET_485_EN2);
-	igpio = getInt(CMD_SET_485_EN3);
-	igpio = getInt(CMD_SET_485_EN4);
-#endif
-*/
 }
 
 // 打开传感器电源
 void Gm_OpenSensorsPower()
 {
-    //char		iIoNo;
-/*    int     igpio;
-	char		szbuf[128];
-
-	//if(0 == port)
-	  //  return;
-	//sprintf(szbuf, "Open Sensors port %d Power!", port);
-
-	//set12VEnable(true);
-	setCam3V3Enable(true);
-	setRS485Enable(true);
-
-#if 0
-	setInt(CMD_SET_WTH_POWER, 0);
-	setInt(CMD_SET_PULL_POWER, 0);
-	setInt(CMD_SET_ANGLE_POWER, 0);
-	setInt(CMD_SET_OTHER_POWER, 0);
-	setInt(CMD_SET_PIC1_POWER, 0);
-#else
-	setInt(CMD_SET_WTH_POWER, 1);
-	setInt(CMD_SET_PULL_POWER, 1);
-	setInt(CMD_SET_ANGLE_POWER, 1);
-	setInt(CMD_SET_OTHER_POWER, 1);
-	setInt(CMD_SET_PIC1_POWER, 1);
-	//sleep(3);
-	igpio = getInt(CMD_SET_WTH_POWER);
-	igpio = getInt(CMD_SET_PULL_POWER);
-	igpio = getInt(CMD_SET_ANGLE_POWER);
-	igpio = getInt(CMD_SET_OTHER_POWER);
-	igpio = getInt(CMD_SET_PIC1_POWER);
-
-#endif
-#if 1
-	setInt(CMD_SET_SPI_POWER, 1);
-	setInt(CMD_SET_485_EN0, 1);
-	setInt(CMD_SET_485_EN1, 1);
-	setInt(CMD_SET_485_EN2, 1);
-	setInt(CMD_SET_485_EN3, 1);
-	setInt(CMD_SET_485_EN4, 1);
-
-	//sleep(3);
-	igpio = getInt(CMD_SET_SPI_POWER);
-	igpio = getInt(CMD_SET_485_EN0);
-	igpio = getInt(CMD_SET_485_EN1);
-	igpio = getInt(CMD_SET_485_EN2);
-	igpio = getInt(CMD_SET_485_EN3);
-	igpio = getInt(CMD_SET_485_EN4);
-
-#else
-	setInt(CMD_SET_485_EN0, 0);
-	setInt(CMD_SET_485_EN1, 0);
-	setInt(CMD_SET_485_EN2, 0);
-	setInt(CMD_SET_485_EN3, 0);
-	setInt(CMD_SET_485_EN4, 0);
-#endif
-
-	// 打开电源
-	//switch(port)
-*/
 }
 
 // 查询传感器电源状态

app/src/main/cpp/serial/WeatherComm.cpp

@@ -112,37 +112,6 @@ int set_port_attr (int fd, int baudrate, int databit, const char *stopbit, char
     return (tcsetattr (fd, TCSANOW, &opt));
 }
 
-static void setInt(int cmd, int value)
-{
-    int fd = open("/dev/mtkgpioctrl", O_RDONLY);
-    IOT_PARAM param;
-    param.cmd = cmd;
-    param.value = value;
-    // LOGE("set_int fd=%d,cmd=%d,value=%d\r\n",fd, cmd, value);
-    if( fd > 0 )
-    {
-        int res = ioctl(fd, IOT_PARAM_WRITE, &param);
-        // LOGE("set_int22 cmd=%d,value=%d,result=%d\r\n",param.cmd, param.value, param.result);
-        close(fd);
-    }
-    return;
-}
-static void setRS485Enable(bool z) {
-    setInt(CMD_SET_485_EN_STATE, z ? 1 : 0);
-}
-
-static void set485WriteMode() {
-    setInt(CMD_SET_485_STATE, 1);
-}
-
-static void set485ReadMode() {
-    setInt(CMD_SET_485_STATE, 0);
-}
-static void set12VEnable(bool z) {
-    setInt(CMD_SET_12V_EN_STATE, z ? 1 : 0);
-}
-
-
 /*********************************************************************************
 *						            气象数据处理							         *
 **********************************************************************************/

app/src/main/cpp/serial/WeatherComm.h

@@ -8,10 +8,6 @@
 #include <string>
 #include "GPIOControl.h"
 
-#define MAX_STRING_LEN 32
-#define IOT_PARAM_WRITE 0xAE
-#define IOT_PARAM_READ 0xAF
-
 #define LOGE(fmt, args...) __android_log_print(ANDROID_LOG_ERROR, "serial_port_comm", fmt, ##args)
 
 // 串口参数
@@ -34,14 +30,6 @@ typedef struct
     unsigned char	m_au8RecvBuf[128];/* */
 } SIO_PARAM_SERIAL_DEF;
 
-typedef struct
-{
-    int cmd;
-    int value;
-    int result;
-    long value2;
-    char str[MAX_STRING_LEN];
-}IOT_PARAM;
 
 void PortDataProcess( void );
 int serial_port_comm();