Browse Source

蠕动泵修正系数增加

master
sige 1 year ago
parent
commit
1922397a6b
  1. 4
      src/main/java/com/iflytop/digester/deviceinstance/LiquidAdditionInstance.java

4
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 liquid = liquids.get((0==pumpIndex%2) ? pumpIndex/2 : (pumpIndex-1)/2);
var type = liquid.type; 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); var rotateDistance = this.convertVolumeToPumpRotationDistance(type, volume);
String pumpKey = String.format("LiquidPeristalticPump_%d_%d", pumpIndex/2, pumpIndex%2); 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 ) { 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 volumePerCircle = UfMdbOption.getDouble(String.format("PumpVolumePerCircle.%s",type), 1.0);
var circleCount = (int) (volume / volumePerCircle); var circleCount = (int) (volume / volumePerCircle);
return circleCount * oneCirclePulse; return circleCount * oneCirclePulse;

Loading…
Cancel
Save