From 7c2ab42755a82bc313d8efc3411e75ede6fc6e41 Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 5 Jan 2024 15:34:22 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81b562=E7=BB=9F=E8=AE=A1=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E7=B4=AF=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/imdroid/sideslope/bd/FocusCalculator1.java | 6 ++++++ .../java/com/imdroid/sideslope/bd/FocusCalculator2.java | 3 +++ .../imdroid/sideslope/calc/SingleLineGNSSCalcService.java | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator1.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator1.java index 84b424a3..a9512a4a 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator1.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator1.java @@ -42,6 +42,9 @@ public class FocusCalculator1 implements FocusCalculator{ this.tilt0 = tilt0; this.position0 = position0; this.isShock = false; + counterNoB562 = 0; + counterNoFixed = 0; + counterFixedResult = 0; } public FocusCalculator1(){ @@ -52,6 +55,9 @@ public class FocusCalculator1 implements FocusCalculator{ public void reset(){ list.clear(); pointList.clear(); + counterNoB562 = 0; + counterNoFixed = 0; + counterFixedResult = 0; } /** diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator2.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator2.java index a80858b9..eb2010d9 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator2.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator2.java @@ -24,6 +24,9 @@ public class FocusCalculator2 implements FocusCalculator{ public void reset(){ list.clear(); pointList.clear(); + counterNoB562 = 0; + counterNoFixed = 0; + counterFixedResult = 0; } /** diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java index e7acd9ec..af09c472 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java @@ -91,7 +91,7 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { } double[] result = focusCalculator.ekfResult(b562Result,r9250Result); Tilt tilt = calcAvgTilt(deviceId); - calculatorMap.remove(deviceId); + logger.info("测站 {} 的b562相对坐标重心:{}", deviceId, Arrays.toString(b562Result)); logger.info("测站 {} 的9250相对坐标:{}", deviceId, Arrays.toString(r9250Result)); logger.info("测站 {} 的相对坐标融合值:{}", deviceId, Arrays.toString(result)); @@ -123,6 +123,8 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { logger.error("融合值异常"); } } + focusCalculator.reset(); + calculatorMap.remove(deviceId); }