1、b562统计不应累加
This commit is contained in:
parent
2cb142fd3d
commit
7c2ab42755
@ -42,6 +42,9 @@ public class FocusCalculator1 implements FocusCalculator{
|
|||||||
this.tilt0 = tilt0;
|
this.tilt0 = tilt0;
|
||||||
this.position0 = position0;
|
this.position0 = position0;
|
||||||
this.isShock = false;
|
this.isShock = false;
|
||||||
|
counterNoB562 = 0;
|
||||||
|
counterNoFixed = 0;
|
||||||
|
counterFixedResult = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public FocusCalculator1(){
|
public FocusCalculator1(){
|
||||||
@ -52,6 +55,9 @@ public class FocusCalculator1 implements FocusCalculator{
|
|||||||
public void reset(){
|
public void reset(){
|
||||||
list.clear();
|
list.clear();
|
||||||
pointList.clear();
|
pointList.clear();
|
||||||
|
counterNoB562 = 0;
|
||||||
|
counterNoFixed = 0;
|
||||||
|
counterFixedResult = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -24,6 +24,9 @@ public class FocusCalculator2 implements FocusCalculator{
|
|||||||
public void reset(){
|
public void reset(){
|
||||||
list.clear();
|
list.clear();
|
||||||
pointList.clear();
|
pointList.clear();
|
||||||
|
counterNoB562 = 0;
|
||||||
|
counterNoFixed = 0;
|
||||||
|
counterFixedResult = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -91,7 +91,7 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService {
|
|||||||
}
|
}
|
||||||
double[] result = focusCalculator.ekfResult(b562Result,r9250Result);
|
double[] result = focusCalculator.ekfResult(b562Result,r9250Result);
|
||||||
Tilt tilt = calcAvgTilt(deviceId);
|
Tilt tilt = calcAvgTilt(deviceId);
|
||||||
calculatorMap.remove(deviceId);
|
|
||||||
logger.info("测站 {} 的b562相对坐标重心:{}", deviceId, Arrays.toString(b562Result));
|
logger.info("测站 {} 的b562相对坐标重心:{}", deviceId, Arrays.toString(b562Result));
|
||||||
logger.info("测站 {} 的9250相对坐标:{}", deviceId, Arrays.toString(r9250Result));
|
logger.info("测站 {} 的9250相对坐标:{}", deviceId, Arrays.toString(r9250Result));
|
||||||
logger.info("测站 {} 的相对坐标融合值:{}", deviceId, Arrays.toString(result));
|
logger.info("测站 {} 的相对坐标融合值:{}", deviceId, Arrays.toString(result));
|
||||||
@ -123,6 +123,8 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService {
|
|||||||
logger.error("融合值异常");
|
logger.error("融合值异常");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
focusCalculator.reset();
|
||||||
|
calculatorMap.remove(deviceId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user