修复错误的合并

app/src/main/cpp/GPIOControl.cpp

@@ -165,67 +165,6 @@ std::string GpioControl::getString(int cmd)
     return "";
 }
 
-#ifdef USING_N938
-
-#if 0
-bool GpioControl::SetN938Cmd(int cmd, int val)
-{
-    char buf[32] = { 0 };
-    snprintf(buf, "out %d %d", cmd, val);
-
-    IOT_PARAM param;
-    int len = MAX_STRING_LEN < strlen(buf) ? MAX_STRING_LEN : strlen(buf);
-
-    param.cmd = cmd;
-    memset(param.str, 0, MAX_STRING_LEN);
-    memcpy(param.str, value.c_str(), len);
-
-    int fd = open(GPIO_NODE_MP, O_RDONLY);
-    if( fd > 0 )
-    {
-        ioctl(fd, IOT_PARAM_WRITE, &param);
-        close(fd);
-    }
-    return;
-}
-#endif
-
-bool GpioControl::OpenSensors()
-{
-
-    GpioControl::setCam3V3Enable(true);
-    GpioControl::setInt(CMD_SET_485_EN_STATE, true ? 1 : 0);
-    int     igpio;
-    GpioControl::setInt(CMD_SET_WTH_POWER, 1);
-    GpioControl::setInt(CMD_SET_PULL_POWER, 1);
-    GpioControl::setInt(CMD_SET_ANGLE_POWER, 1);
-    GpioControl::setInt(CMD_SET_OTHER_POWER, 1);
-    GpioControl::setInt(CMD_SET_PIC1_POWER, 1);
-
-    igpio = GpioControl::getInt(CMD_SET_WTH_POWER);
-    igpio = GpioControl::getInt(CMD_SET_PULL_POWER);
-    igpio = GpioControl::getInt(CMD_SET_ANGLE_POWER);
-    igpio = GpioControl::getInt(CMD_SET_OTHER_POWER);
-    igpio = GpioControl::getInt(CMD_SET_PIC1_POWER);
-
-    GpioControl::setInt(CMD_SET_SPI_POWER, 1);
-    GpioControl::setInt(CMD_SET_485_EN0, 1);
-    GpioControl::setInt(CMD_SET_485_EN1, 1);
-    GpioControl::setInt(CMD_SET_485_EN2, 1);
-    GpioControl::setInt(CMD_SET_485_EN3, 1);
-    GpioControl::setInt(CMD_SET_485_EN4, 1);
-
-    igpio = GpioControl::getInt(CMD_SET_SPI_POWER);
-    igpio = GpioControl::getInt(CMD_SET_485_EN0);
-    igpio = GpioControl::getInt(CMD_SET_485_EN1);
-    igpio = GpioControl::getInt(CMD_SET_485_EN2);
-    igpio = GpioControl::getInt(CMD_SET_485_EN3);
-    igpio = GpioControl::getInt(CMD_SET_485_EN4);
-    return 0;
-
-}
-
-#endif
 /////////////////////////// Power Control /////////////////////////////////
 
 size_t GpioControl::TurnOn(int cmd)

app/src/main/cpp/GPIOControl.h

@@ -115,9 +115,6 @@
 #endif  // USING_N938
 
 
-#ifndef USING_N938
-#define GPIO_NODE_N938          "/sys/devices/platform/1000b000.pinctrl/mt_gpio"
-#else
 #define GPIO_NODE_MP            "/dev/mtkgpioctrl"
 
 #define MAX_STRING_LEN 32
@@ -366,5 +363,4 @@ public:
 
 };
 
-#endif
 #endif //MICROPHOTO_GPIOCONTROL_H