Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp

app/src/main/cpp/GPIOControl.cpp

@@ -70,7 +70,7 @@ size_t GpioControl::turnOnImpl(const IOT_PARAM& param)
             res = ioctl(fd, IOT_PARAM_WRITE, &param);
             close(fd);
 #ifdef OUTPUT_DBG_INFO
-            XYLOG(XYLOG_SEVERITY_INFO, "setInt cmd=%d,value=%d,result=%d\r\n",param.cmd, param.value, param.result);
+            XYLOG(XYLOG_SEVERITY_INFO, "setInt cmd=%d,value=%d,result=%d",param.cmd, param.value, param.result);
 #endif
 
         }

app/src/main/cpp/GPIOControl.h

@@ -544,6 +544,7 @@ public:
 #ifdef USING_PLZ
     PowerControl(CMD_SET_OTG_STATE, CMD_SET_100M_ENABLE, CMD_SET_100M_SWITCH_PWR_ENABLE, CMD_SET_12V_EN_STATE, closeDelayTime)
 #else // USING_PLZ
+    // MicroPhoto
     PowerControl(CMD_SET_OTG_STATE, CMD_SET_12V_EN_STATE, CMD_SET_485_EN_STATE, closeDelayTime)
 #endif // USING_PLZ
 #endif // USING_N938