fix: 修正因 stash 添加的字符错误
This commit is contained in:
parent
9913b8a732
commit
efe8787d53
@ -184,15 +184,11 @@ 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.getModel()==GnssDevice.MODEL_G510) &&
|
||||
(device.getFixedNum()>100) && (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