diff --git a/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java b/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java index 42de08e..775031b 100644 --- a/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java +++ b/src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java @@ -150,6 +150,8 @@ public class LiquidAdditionInstance { var liquid = liquids.get((0==pumpIndex%2) ? pumpIndex/2 : (pumpIndex-1)/2); var type = liquid.type; + Double pumpCf = UfMdbOption.getDouble(String.format("PumpCorrectionFactor.%d", pumpIndex), 0.0); + volume = (int) (volume + volume * (pumpCf / 100.0)); var rotateDistance = this.convertVolumeToPumpRotationDistance(type, volume); String pumpKey = String.format("LiquidPeristalticPump_%d_%d", pumpIndex/2, pumpIndex%2); @@ -232,7 +234,7 @@ public class LiquidAdditionInstance { // 转换体积为蠕动泵旋转距离 private Integer convertVolumeToPumpRotationDistance( String type, int volume ) { - var oneCirclePulse = 100; + var oneCirclePulse = 1000; var volumePerCircle = UfMdbOption.getDouble(String.format("PumpVolumePerCircle.%s",type), 1.0); var circleCount = (int) (volume / volumePerCircle); return circleCount * oneCirclePulse;