fix: 修正因 stash 添加的字符错误
This commit is contained in:
parent
e7c6b36f6d
commit
bc89ccca79
@ -184,14 +184,10 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
|
||||
|
||||
DeviceChannel deviceChannel = null;
|
||||
for (Device device : allDevices) {
|
||||
<<<<<<< Updated upstream
|
||||
if (device.getOpMode() != GnssDevice.OP_MODE_USE) continue;
|
||||
if (device.getFixedNum()>0 && device.getGnssSampleRate()>1
|
||||
&& (deviceBs.getD3xxCount()%device.getGnssSampleRate()) != 0) {
|
||||
//if(!UBXUtil.has1005(forwardBytes)) continue; //1005必推
|
||||
=======
|
||||
if (device.getOpMode() != GnssDevice.OP_MODE_USE) {
|
||||
>>>>>>> Stashed changes
|
||||
continue;
|
||||
}
|
||||
String deviceId = device.getDeviceId();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user