diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index 7c0c97b7..a3eea8ac 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -1901,7 +1901,7 @@ void CameraPhotoPortDataProcess(SIO_PARAM_SERIAL_DEF *curserial) iNo = rtumsg.MsgData[i + 1] + rtumsg.MsgData[i] * 256; if((0xFF == rtumsg.MsgData[i+2]) && (3 == datalen)) { - curserial->SerialCmdidx = iNo + 1; + curserial->SerialCmdidx = iNo; break; } diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index 4e2cabe9..c599aad3 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -416,7 +416,7 @@ public class MpMasterService extends Service { long tempduration = mMpHeartbeatDuration; if(mMpHeartbeatDuration < 600000) - tempduration = 300000; + tempduration = 290000; if (mPreviousMpHbTime <= ts && ts - mPreviousMpHbTime > tempduration * 2) { // MpApp is not running if (ts - mTimeToStartMpApp >= 1800000) {