Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

5 months ago · a29b471633
parent 680b763ff6 eb26477067
commit a29b471633
2 changed files with 2 additions and 2 deletions
--- 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;
 			}

--- 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) {