diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index ba7d5582..d07e171b 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -831,26 +831,7 @@ void GM_StartSerialComm() break; } // 测试查询传感器电源状态 -#if 0 - LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE)); - LOGE("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE)); - LOGE("485 state=%d", getInt(CMD_SET_485_EN_STATE)); - - set12VEnable(true); - setCam3V3Enable(true); - setRS485Enable(true); - sleep(1); - LOGV("12V state=%d", getInt(CMD_SET_12V_EN_STATE)); - LOGV("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE)); - LOGV("485 state=%d", getInt(CMD_SET_485_EN_STATE)); - set12VEnable(false); - setCam3V3Enable(false); - setRS485Enable(false); - sleep(1); - LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE)); - LOGE("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE)); - LOGE("485 state=%d", getInt(CMD_SET_485_EN_STATE)); -#endif + // 打开传感器电源 // 打开对应的485电源 // 打开串口通讯 @@ -874,7 +855,6 @@ void GM_StartSerialComm() //polltime = get_msec(); if (GM_SerialTimer() < 0) { - //LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE)); DebugLog(8, "退出采样流程!", 'V'); sleep(5); //GM_StartSerialComm(); @@ -925,10 +905,6 @@ void Gm_FindAllSensorsCommand() Gm_OpenSerialPort(curidx); if (serialport[devparam[curidx].commid].cmdlen > 0) break; - //LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE)); - //LOGE("3.3V state= %d", getInt(CMD_SET_CAM_3V3_EN_STATE)); - //LOGE("485 state=%d", getInt(CMD_SET_485_EN_STATE)); - flag = -1; switch (devparam[curidx].ProtocolIdx) @@ -3383,7 +3359,6 @@ int GM_StartSerialCameraPhoto(int phototime, unsigned char channel, int cmdidx, //polltime = get_msec(); if (GM_CameraSerialTimer(cameraport) < 0) { - //LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE)); DebugLog(8, "退出操作摄像机流程!", 'V'); //sleep(3); break; @@ -3469,7 +3444,6 @@ int QueryPtzState(PTZ_STATE *ptz_state, int cmdidx, const char *serfile, unsign flag = GM_CameraSerialTimer(cameraport); if (flag < 0) { - //LOGE("12V state=%d", getInt(CMD_SET_12V_EN_STATE)); DebugLog(8, "退出查询云台状态流程!", 'V'); memmove((void*)ptz_state, &cameraport->ptz_state, sizeof(PTZ_STATE)); if(flag == -2)