diff --git a/src/main/java/a8k/app/constant/OptConstant.java b/src/main/java/a8k/app/constant/OptConstant.java index 5304fee..18138c0 100644 --- a/src/main/java/a8k/app/constant/OptConstant.java +++ b/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; } diff --git a/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java index 75528bf..109be56 100644 --- a/src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java +++ b/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); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4318976..a24f8d4 100644 --- a/src/main/resources/application.yml +++ b/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 diff --git a/tools/20250427-F-光学光学报告.xlsx b/tools/20250427-F-光学光学报告.xlsx new file mode 100644 index 0000000..f08366c Binary files /dev/null and b/tools/20250427-F-光学光学报告.xlsx differ diff --git a/tools/20250427-T-光学光学报告-2.xlsx b/tools/20250427-T-光学光学报告-2.xlsx new file mode 100644 index 0000000..1bde0b2 Binary files /dev/null and b/tools/20250427-T-光学光学报告-2.xlsx differ diff --git a/tools/20250427光学光学报告.xlsx b/tools/20250427光学光学报告.xlsx deleted file mode 100644 index a2c2427..0000000 Binary files a/tools/20250427光学光学报告.xlsx and /dev/null differ