xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

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

Browse Source
rtmpsuck
Matthew 5 months ago
parent 680b763ff6 eb26477067
commit a29b471633
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/cpp/SensorsProtocol.cpp
Unescape Escape View File

@ -1901,7 +1901,7 @@ void CameraPhotoPortDataProcess(SIO_PARAM_SERIAL_DEF *curserial)
iNo = rtumsg.MsgData[i + 1] + rtumsg.MsgData[i] * 256; iNo = rtumsg.MsgData[i + 1] + rtumsg.MsgData[i] * 256;
if((0xFF == rtumsg.MsgData[i+2]) && (3 == datalen)) if((0xFF == rtumsg.MsgData[i+2]) && (3 == datalen))
{ {
curserial->SerialCmdidx = iNo + 1; curserial->SerialCmdidx = iNo;
break; break;
} }

2
mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
Unescape Escape View File

@ -416,7 +416,7 @@ public class MpMasterService extends Service {
long tempduration = mMpHeartbeatDuration; long tempduration = mMpHeartbeatDuration;
if(mMpHeartbeatDuration < 600000) if(mMpHeartbeatDuration < 600000)
tempduration = 300000; tempduration = 290000;
if (mPreviousMpHbTime <= ts && ts - mPreviousMpHbTime > tempduration * 2) { if (mPreviousMpHbTime <= ts && ts - mPreviousMpHbTime > tempduration * 2) {
// MpApp is not running // MpApp is not running
if (ts - mTimeToStartMpApp >= 1800000) { if (ts - mTimeToStartMpApp >= 1800000) {

Write Preview
Loading…
Cancel
Save