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

@@ -184,11 +184,15 @@ 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();