From efe8787d533de8d07378e5861fbf628f584eaa0e Mon Sep 17 00:00:00 2001
From: yarnom <admin@yarnom.com>
Date: Tue, 8 Jul 2025 17:41:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=9B=A0=20stash=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=AD=97=E7=AC=A6=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imdroid/sideslope/executor/D331RtcmMessageExecutor.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
index 2753fe6f..0f9de5ff 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
@@ -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();