Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 修正因 stash 添加的字符错误

Browse Source
This commit is contained in:
yarnom 2025-07-08 17:41:33 +08:00
parent 9913b8a732
commit efe8787d53
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
View File

@ -184,15 +184,11 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
DeviceChannel deviceChannel = null; DeviceChannel deviceChannel = null;
for (Device device : allDevices) { for (Device device : allDevices) {
<<<<<<< Updated upstream
if (device.getOpMode() != GnssDevice.OP_MODE_USE) continue; if (device.getOpMode() != GnssDevice.OP_MODE_USE) continue;
if ((device.getModel()==GnssDevice.MODEL_G510) && if ((device.getModel()==GnssDevice.MODEL_G510) &&
(device.getFixedNum()>100) && (device.getGnssSampleRate()>1) (device.getFixedNum()>100) && (device.getGnssSampleRate()>1)
&& (deviceBs.getD3xxCount()%device.getGnssSampleRate()) != 0) { && (deviceBs.getD3xxCount()%device.getGnssSampleRate()) != 0) {
//if(!UBXUtil.has1005(forwardBytes)) continue; //1005必推 //if(!UBXUtil.has1005(forwardBytes)) continue; //1005必推
=======
if (device.getOpMode() != GnssDevice.OP_MODE_USE) {
>>>>>>> Stashed changes
continue; continue;
} }
String deviceId = device.getDeviceId(); String deviceId = device.getDeviceId();