Browse Source

修改光学期望阈值范围

master
zhaohe 3 months ago
parent
commit
9ac744548b
  1. 3
      src/main/java/a8k/app/constant/OptConstant.java
  2. 11
      src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java
  3. 2
      src/main/resources/application.yml
  4. BIN
      tools/20250427-F-光学光学报告.xlsx
  5. BIN
      tools/20250427-T-光学光学报告-2.xlsx
  6. BIN
      tools/20250427光学光学报告.xlsx

3
src/main/java/a8k/app/constant/OptConstant.java

@ -4,5 +4,6 @@ public class OptConstant {
static public final Integer FOPT_LASTER_GAIN = 100;
static public final Integer TOPT_LASTER_GAIN = 100;
static public final Integer OPT_RESULT_TOLERATE = 300;
static public final Integer OPT_TARGE_VAL = 1000;
static public final Integer OPT_T_TARGE_VAL = 3000;
static public final Integer OPT_F_TARGE_VAL = 2000;
}

11
src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java

@ -168,10 +168,17 @@ public class OptScanModuleCtrlService {
break;
}
Integer targetVal = 0;
if(optType == A8kOptType.TOPT) {
targetVal = OptConstant.OPT_T_TARGE_VAL;
} else if (optType == A8kOptType.FOPT) {
targetVal = OptConstant.OPT_F_TARGE_VAL;
}
//Adjustment
gainAdjuster.process(result, scanRealGain, OptConstant.OPT_TARGE_VAL, OptConstant.OPT_RESULT_TOLERATE);
gainAdjuster.process(result, scanRealGain, targetVal, OptConstant.OPT_RESULT_TOLERATE);
log.info("adjuct {}", i);
log.info(" target : {}->{}", OptConstant.OPT_TARGE_VAL, OptConstant.OPT_TARGE_VAL + OptConstant.OPT_RESULT_TOLERATE);
log.info(" target : {}->{}", targetVal, targetVal + OptConstant.OPT_RESULT_TOLERATE);
log.info(" suggestGain : {}", gainAdjuster.suggestGain);
log.info(" scanAgain : {}", gainAdjuster.scanAgain);

2
src/main/resources/application.yml

@ -8,7 +8,7 @@ device.enableCanBus: true
iflytophald:
# ip: 192.168.8.10
# ip: 192.168.8.10
# ip: 192.168.8.10
ip: 127.0.0.1
cmdch.port: 19004
datach.port: 19005

BIN
tools/20250427-F-光学光学报告.xlsx

BIN
tools/20250427-T-光学光学报告-2.xlsx

BIN
tools/20250427光学光学报告.xlsx

Loading…
Cancel
Save