diff --git a/src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java b/src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java index 63c45f4..08174e2 100644 --- a/src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java +++ b/src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java @@ -1,15 +1,16 @@ package a8k.extui.mgr; -import a8k.extui.page.calibration.MiniServoReferencePointIniter; -import a8k.extui.page.calibration.*; +import a8k.extui.page.pos_calibration.MiniServoReferencePointIniter; +import a8k.extui.page.pos_calibration.*; import a8k.extui.page.action_operation.*; import a8k.extui.page.debug.*; import a8k.extui.page.driver.PipetteCtrlDriverPage; -import a8k.extui.page.verification.A8kOptVerification; -import a8k.extui.page.virtual_mode_operation.FakeReactionRecordGeneratorPage; +import a8k.extui.page.opt_calibration.A8kOptVerification; +import a8k.extui.page.frond_end_test.FakeReactionRecordGeneratorPage; -import a8k.extui.page.virtual_mode_operation.VirtualEventGeneratorPage; +import a8k.extui.page.frond_end_test.VirtualEventGeneratorPage; +import a8k.extui.page.opt_calibration.OptModuleParamCalibration; import a8k.extui.type.ExtUIPageCfg; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; @@ -95,6 +96,19 @@ public class ExtApiPageGroupCfgMgr { cfgList.add(new Config(PageGroupType.Public, ExtApiPageGroupCfgMgr.class, "导航")); + page.addFunction("位置标定", this::posCalibrationRefreshPage); + cfgList.add(new Config(PageGroupType.PosCalibration, MiniServoReferencePointIniter.class, "舵机参考点设置")); + cfgList.add(new Config(PageGroupType.PosCalibration, ReactionPlatesTransmitControlerCalibration.class, "反应板相关位置校准")); + cfgList.add(new Config(PageGroupType.PosCalibration, TubeFeedingModulePosCalibration.class, "试管入料校准")); + cfgList.add(new Config(PageGroupType.PosCalibration, TubePreProcesPosCalibration.class, "试管预处理校准")); + cfgList.add(new Config(PageGroupType.PosCalibration, Hbot2DCodeScanPosCalibration.class, "耗材扫描校准")); + cfgList.add(new Config(PageGroupType.PosCalibration, HbotTipPosCalibration.class, "Tip耗材位置校准")); + cfgList.add(new Config(PageGroupType.PosCalibration, HbotLittleBSPosCalibration.class, "小瓶BS耗材位置校准")); + cfgList.add(new Config(PageGroupType.PosCalibration, HbotProbeSubstancePosCalibration.class, "探测物质位置校准")); + cfgList.add(new Config(PageGroupType.PosCalibration, HbotLargeBottleBSPosCalibration.class, "大瓶BS耗材位置校准")); + cfgList.add(new Config(PageGroupType.PosCalibration, HbotSamplePosCalibration.class, "样本位置校准")); + + page.addFunction("调试", this::debugRefreshPage); cfgList.add(new Config(PageGroupType.debug, P21AppDebugModeConfigPage.class, "设备模式配置")); cfgList.add(new Config(PageGroupType.debug, P22UserOperaionInRunOnlyModePage.class, "空转模式用户操作")); @@ -111,41 +125,30 @@ public class ExtApiPageGroupCfgMgr { cfgList.add(new Config(PageGroupType.debug, P20AppSettingDebugPage.class, "设置.系统设置")); - // - page.addFunction("驱动调试", this::driverDebugRefreshPage); - cfgList.add(new Config(PageGroupType.driverDebug, PipetteCtrlDriverPage.getPageClass(), "移液抢驱动")); - - page.addFunction("动作调试", this::actionOperationPageRefreshPage); cfgList.add(new Config(PageGroupType.actionOperation, DeviceInitTestPage.class, "设备初始化")); cfgList.add(new Config(PageGroupType.actionOperation, SamplePreProcessTestPage.class, "试管入料")); cfgList.add(new Config(PageGroupType.actionOperation, LiquidOperationTestPage.class, "液体操作")); cfgList.add(new Config(PageGroupType.actionOperation, ProjejIDCardTestPage.class, "项目卡校验")); + // + page.addFunction("驱动调试", this::driverDebugRefreshPage); + cfgList.add(new Config(PageGroupType.driverDebug, PipetteCtrlDriverPage.getPageClass(), "移液抢驱动")); + page.addFunction("光学标定与验证", this::optOptCalibrationAndVerifyRefreshPage); cfgList.add(new Config(PageGroupType.OptCalibrationAndVerify, OptModuleParamCalibration.class, "光学模块参数校准")); cfgList.add(new Config(PageGroupType.OptCalibrationAndVerify, A8kOptVerification.class, "光学模组验证")); - page.addFunction("位置标定", this::posCalibrationRefreshPage); - cfgList.add(new Config(PageGroupType.PosCalibration, MiniServoReferencePointIniter.class, "舵机参考点设置")); - cfgList.add(new Config(PageGroupType.PosCalibration, ReactionPlatesTransmitControlerCalibration.class, "反应板相关位置校准")); - cfgList.add(new Config(PageGroupType.PosCalibration, TubeFeedingModulePosCalibration.class, "试管入料校准")); - cfgList.add(new Config(PageGroupType.PosCalibration, TubePreProcesPosCalibration.class, "试管预处理校准")); - cfgList.add(new Config(PageGroupType.PosCalibration, Hbot2DCodeScanPosCalibration.class, "耗材扫描校准")); - cfgList.add(new Config(PageGroupType.PosCalibration, HbotTipPosCalibration.class, "Tip耗材位置校准")); - cfgList.add(new Config(PageGroupType.PosCalibration, HbotLittleBSPosCalibration.class, "小瓶BS耗材位置校准")); - cfgList.add(new Config(PageGroupType.PosCalibration, HbotProbeSubstancePosCalibration.class, "探测物质位置校准")); - cfgList.add(new Config(PageGroupType.PosCalibration, HbotLargeBottleBSPosCalibration.class, "大瓶BS耗材位置校准")); - cfgList.add(new Config(PageGroupType.PosCalibration, HbotSamplePosCalibration.class, "样本位置校准")); - - page.addFunction("前端测试助手", this::virtualModeOperationRefreshPage); cfgList.add(new Config(PageGroupType.VirtualModeOperation, FakeReactionRecordGeneratorPage.class, "虚拟反应记录生成")); cfgList.add(new Config(PageGroupType.VirtualModeOperation, VirtualEventGeneratorPage.class, "虚拟事件生成")); + //P00A8kVerificationMainPage + + displayRefreshPage(PageGroupType.Public); regChangePageButton(); extApiPageMgr.addPage(page); diff --git a/src/main/java/a8k/extui/page/debug/P00MainflowCtrlServiceDebugPage.java b/src/main/java/a8k/extui/page/debug/P00MainflowCtrlServiceDebugPage.java index 2478004..32caf47 100644 --- a/src/main/java/a8k/extui/page/debug/P00MainflowCtrlServiceDebugPage.java +++ b/src/main/java/a8k/extui/page/debug/P00MainflowCtrlServiceDebugPage.java @@ -4,26 +4,14 @@ import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.others.checkpoint.CheckResult; import a8k.app.a8ktype.state.DeviceWorkState; import a8k.app.a8ktype.state.SensorState; -import a8k.app.dao.db.A8kProjExtInfoCardDao; -import a8k.app.dao.db.ProjOptInfoDao; -import a8k.app.dao.db.ProjectBaseInfoDao; import a8k.app.service.background.BackgroudProcessCtrlService; import a8k.app.service.background.SensorDataUpdateService; import a8k.app.service.background.TemperatureCtrlService; -import a8k.app.service.lowerctrl.TubeFeedingCtrlService; import a8k.app.service.statemgr.*; -import a8k.app.service.mainctrl.AppConsumablesScanService; import a8k.app.service.mainctrl.AppDeviceCtrlService; -import a8k.app.service.mainctrl.TubeSettingMgrService; -import a8k.app.service.mainctrl.mainflowctrl.MainFlowCtrlScheduler; -import a8k.app.service.mainctrl.mainflowctrl.PublicAreaResourceMgr; import a8k.app.service.lowerctrl.DeviceInitCtrlService; -import a8k.app.service.lowerctrl.OptScanModuleCtrlService; -import a8k.app.hardware.driver.StepMotorCtrlDriver; -import a8k.app.hardware.extdriver.MotorEnableExDriver; import a8k.extui.factory.CurveBuilder; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.extui.page.verification.A8kTemperaturaVerfication; import a8k.extui.type.ExtApiStatu; import a8k.extui.type.ret.ExtApiCurve; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/virtual_mode_operation/FakeReactionRecordGeneratorPage.java b/src/main/java/a8k/extui/page/frond_end_test/FakeReactionRecordGeneratorPage.java similarity index 98% rename from src/main/java/a8k/extui/page/virtual_mode_operation/FakeReactionRecordGeneratorPage.java rename to src/main/java/a8k/extui/page/frond_end_test/FakeReactionRecordGeneratorPage.java index fbd25d3..256e916 100644 --- a/src/main/java/a8k/extui/page/virtual_mode_operation/FakeReactionRecordGeneratorPage.java +++ b/src/main/java/a8k/extui/page/frond_end_test/FakeReactionRecordGeneratorPage.java @@ -1,4 +1,4 @@ -package a8k.extui.page.virtual_mode_operation; +package a8k.extui.page.frond_end_test; import a8k.SpringBootBeanUtil; import a8k.app.a8ktype.device.BloodType; diff --git a/src/main/java/a8k/extui/page/virtual_mode_operation/VirtualEventGeneratorPage.java b/src/main/java/a8k/extui/page/frond_end_test/VirtualEventGeneratorPage.java similarity index 98% rename from src/main/java/a8k/extui/page/virtual_mode_operation/VirtualEventGeneratorPage.java rename to src/main/java/a8k/extui/page/frond_end_test/VirtualEventGeneratorPage.java index a31196e..5d72e1d 100644 --- a/src/main/java/a8k/extui/page/virtual_mode_operation/VirtualEventGeneratorPage.java +++ b/src/main/java/a8k/extui/page/frond_end_test/VirtualEventGeneratorPage.java @@ -1,4 +1,4 @@ -package a8k.extui.page.virtual_mode_operation; +package a8k.extui.page.frond_end_test; import a8k.app.a8ktype.appevent.*; import a8k.app.a8ktype.error.AEConsumeNotEnoughError; diff --git a/src/main/java/a8k/extui/page/verification/A8kOptVerification.java b/src/main/java/a8k/extui/page/opt_calibration/A8kOptVerification.java similarity index 99% rename from src/main/java/a8k/extui/page/verification/A8kOptVerification.java rename to src/main/java/a8k/extui/page/opt_calibration/A8kOptVerification.java index f0234ea..dba093d 100644 --- a/src/main/java/a8k/extui/page/verification/A8kOptVerification.java +++ b/src/main/java/a8k/extui/page/opt_calibration/A8kOptVerification.java @@ -1,4 +1,4 @@ -package a8k.extui.page.verification; +package a8k.extui.page.opt_calibration; import a8k.app.a8kproj.optalgo.type.OptScanResult; import a8k.app.controler.filemgr.StorageControler; diff --git a/src/main/java/a8k/extui/page/calibration/OptModuleParamCalibration.java b/src/main/java/a8k/extui/page/opt_calibration/OptModuleParamCalibration.java similarity index 99% rename from src/main/java/a8k/extui/page/calibration/OptModuleParamCalibration.java rename to src/main/java/a8k/extui/page/opt_calibration/OptModuleParamCalibration.java index 7deeef9..fdd5423 100644 --- a/src/main/java/a8k/extui/page/calibration/OptModuleParamCalibration.java +++ b/src/main/java/a8k/extui/page/opt_calibration/OptModuleParamCalibration.java @@ -1,4 +1,4 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.opt_calibration; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.IncubatorPos; diff --git a/src/main/java/a8k/extui/page/calibration/Hbot2DCodeScanPosCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/Hbot2DCodeScanPosCalibration.java similarity index 96% rename from src/main/java/a8k/extui/page/calibration/Hbot2DCodeScanPosCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/Hbot2DCodeScanPosCalibration.java index 8733213..76dfcb8 100644 --- a/src/main/java/a8k/extui/page/calibration/Hbot2DCodeScanPosCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/Hbot2DCodeScanPosCalibration.java @@ -1,8 +1,6 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; -import a8k.SpringBootBeanUtil; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.extui.type.ExtApiFn; import a8k.app.service.lowerctrl.HbotMoveCtrlService; import a8k.app.hardware.driver.HbotDriver; import a8k.app.hardware.driver.PipetteCtrlDriver; @@ -15,7 +13,6 @@ import a8k.app.a8ktype.exception.AppException; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/a8k/extui/page/calibration/HbotLargeBottleBSPosCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/HbotLargeBottleBSPosCalibration.java similarity index 97% rename from src/main/java/a8k/extui/page/calibration/HbotLargeBottleBSPosCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/HbotLargeBottleBSPosCalibration.java index 5fa72de..930bef3 100644 --- a/src/main/java/a8k/extui/page/calibration/HbotLargeBottleBSPosCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/HbotLargeBottleBSPosCalibration.java @@ -1,9 +1,7 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; -import a8k.SpringBootBeanUtil; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.extui.type.ExtApiFn; import a8k.app.service.lowerctrl.HbotMoveCtrlService; import a8k.app.a8ktype.param.HbotLargeBottleBSPos; import a8k.app.hardware.driver.HbotDriver; @@ -17,7 +15,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/a8k/extui/page/calibration/HbotLittleBSPosCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/HbotLittleBSPosCalibration.java similarity index 98% rename from src/main/java/a8k/extui/page/calibration/HbotLittleBSPosCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/HbotLittleBSPosCalibration.java index 75a8e65..fce0470 100644 --- a/src/main/java/a8k/extui/page/calibration/HbotLittleBSPosCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/HbotLittleBSPosCalibration.java @@ -1,10 +1,8 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; -import a8k.SpringBootBeanUtil; import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.constant.AppConstant; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.extui.type.ExtApiFn; import a8k.app.service.lowerctrl.HbotMoveCtrlService; import a8k.app.service.param.HbotLittleBSPosMgr; import a8k.app.a8ktype.param.HbotLittleBSPos; @@ -19,7 +17,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/a8k/extui/page/calibration/HbotProbeSubstancePosCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/HbotProbeSubstancePosCalibration.java similarity index 98% rename from src/main/java/a8k/extui/page/calibration/HbotProbeSubstancePosCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/HbotProbeSubstancePosCalibration.java index f9871c6..10119ed 100644 --- a/src/main/java/a8k/extui/page/calibration/HbotProbeSubstancePosCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/HbotProbeSubstancePosCalibration.java @@ -1,9 +1,8 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import a8k.app.constant.AppConstant; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.extui.type.ExtApiFn; import a8k.app.service.lowerctrl.HbotMoveCtrlService; import a8k.app.service.param.HbotProbeSubstancePosMgr; import a8k.app.a8ktype.param.HbotProbeSubstancePos; diff --git a/src/main/java/a8k/extui/page/calibration/HbotSamplePosCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/HbotSamplePosCalibration.java similarity index 99% rename from src/main/java/a8k/extui/page/calibration/HbotSamplePosCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/HbotSamplePosCalibration.java index f6f38e9..9fd5d2a 100644 --- a/src/main/java/a8k/extui/page/calibration/HbotSamplePosCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/HbotSamplePosCalibration.java @@ -1,4 +1,4 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import a8k.extui.mgr.ExtApiPageMgr; diff --git a/src/main/java/a8k/extui/page/calibration/HbotTipPosCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/HbotTipPosCalibration.java similarity index 98% rename from src/main/java/a8k/extui/page/calibration/HbotTipPosCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/HbotTipPosCalibration.java index f50dd01..902098c 100644 --- a/src/main/java/a8k/extui/page/calibration/HbotTipPosCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/HbotTipPosCalibration.java @@ -1,9 +1,8 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import a8k.app.constant.AppConstant; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.extui.type.ExtApiFn; import a8k.app.service.lowerctrl.HbotMoveCtrlService; import a8k.app.service.exparam.HbotConsumableParamMgr; import a8k.app.service.param.HbotTipPosMgr; diff --git a/src/main/java/a8k/extui/page/calibration/MiniServoReferencePointIniter.java b/src/main/java/a8k/extui/page/pos_calibration/MiniServoReferencePointIniter.java similarity index 97% rename from src/main/java/a8k/extui/page/calibration/MiniServoReferencePointIniter.java rename to src/main/java/a8k/extui/page/pos_calibration/MiniServoReferencePointIniter.java index 1d97d17..6d04391 100644 --- a/src/main/java/a8k/extui/page/calibration/MiniServoReferencePointIniter.java +++ b/src/main/java/a8k/extui/page/pos_calibration/MiniServoReferencePointIniter.java @@ -1,8 +1,7 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.extui.type.ExtApiFn; import a8k.app.hardware.driver.MiniServoDriver; import a8k.app.hardware.driver.type.MiniServoMId; import a8k.app.a8ktype.exception.AppException; diff --git a/src/main/java/a8k/extui/page/calibration/PipetteGunLLDParamCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/PipetteGunLLDParamCalibration.java similarity index 98% rename from src/main/java/a8k/extui/page/calibration/PipetteGunLLDParamCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/PipetteGunLLDParamCalibration.java index 072b25f..0ec7526 100644 --- a/src/main/java/a8k/extui/page/calibration/PipetteGunLLDParamCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/PipetteGunLLDParamCalibration.java @@ -1,4 +1,4 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/page/calibration/PipetteGunLLFParamCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/PipetteGunLLFParamCalibration.java similarity index 98% rename from src/main/java/a8k/extui/page/calibration/PipetteGunLLFParamCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/PipetteGunLLFParamCalibration.java index d895865..ea62c07 100644 --- a/src/main/java/a8k/extui/page/calibration/PipetteGunLLFParamCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/PipetteGunLLFParamCalibration.java @@ -1,4 +1,4 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/extui/page/calibration/ReactionPlatesTransmitControlerCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/ReactionPlatesTransmitControlerCalibration.java similarity index 99% rename from src/main/java/a8k/extui/page/calibration/ReactionPlatesTransmitControlerCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/ReactionPlatesTransmitControlerCalibration.java index 5eedc42..e8fd1d6 100644 --- a/src/main/java/a8k/extui/page/calibration/ReactionPlatesTransmitControlerCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/ReactionPlatesTransmitControlerCalibration.java @@ -1,4 +1,4 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import a8k.extui.mgr.ExtApiPageMgr; import a8k.app.service.lowerctrl.HbotMoveCtrlService; diff --git a/src/main/java/a8k/extui/page/calibration/TemperatureCtrlParamCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/TemperatureCtrlParamCalibration.java similarity index 96% rename from src/main/java/a8k/extui/page/calibration/TemperatureCtrlParamCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/TemperatureCtrlParamCalibration.java index 76985cf..b9f19a3 100644 --- a/src/main/java/a8k/extui/page/calibration/TemperatureCtrlParamCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/TemperatureCtrlParamCalibration.java @@ -1,8 +1,7 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.extui.type.ExtApiFn; import a8k.app.hardware.driver.TemperatureControlDriver; import a8k.app.service.param.TemperatureCtrlParamMgr; import a8k.app.a8ktype.param.TemperatureCtrlParam; @@ -12,7 +11,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/a8k/extui/page/calibration/TubeFeedingModulePosCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/TubeFeedingModulePosCalibration.java similarity index 99% rename from src/main/java/a8k/extui/page/calibration/TubeFeedingModulePosCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/TubeFeedingModulePosCalibration.java index 4017dfc..069e037 100644 --- a/src/main/java/a8k/extui/page/calibration/TubeFeedingModulePosCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/TubeFeedingModulePosCalibration.java @@ -1,4 +1,4 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import a8k.extui.mgr.ExtApiPageMgr; import a8k.app.hardware.basedriver.A8kCanBusService; diff --git a/src/main/java/a8k/extui/page/calibration/TubePreProcesPosCalibration.java b/src/main/java/a8k/extui/page/pos_calibration/TubePreProcesPosCalibration.java similarity index 99% rename from src/main/java/a8k/extui/page/calibration/TubePreProcesPosCalibration.java rename to src/main/java/a8k/extui/page/pos_calibration/TubePreProcesPosCalibration.java index 0d74322..9e69689 100644 --- a/src/main/java/a8k/extui/page/calibration/TubePreProcesPosCalibration.java +++ b/src/main/java/a8k/extui/page/pos_calibration/TubePreProcesPosCalibration.java @@ -1,4 +1,4 @@ -package a8k.extui.page.calibration; +package a8k.extui.page.pos_calibration; import a8k.extui.mgr.ExtApiPageMgr; import a8k.app.hardware.driver.MiniServoDriver; diff --git a/src/main/java/a8k/extui/page/verification/A8kVerificationUtils.java b/src/main/java/a8k/extui/page/verification/P00A8kVerificationMainPage.java similarity index 96% rename from src/main/java/a8k/extui/page/verification/A8kVerificationUtils.java rename to src/main/java/a8k/extui/page/verification/P00A8kVerificationMainPage.java index 6740e47..b8db274 100644 --- a/src/main/java/a8k/extui/page/verification/A8kVerificationUtils.java +++ b/src/main/java/a8k/extui/page/verification/P00A8kVerificationMainPage.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; import java.util.List; @Component -public class A8kVerificationUtils { +public class P00A8kVerificationMainPage { @Resource DeviceInitCtrlService deviceInitializationModule; diff --git a/src/main/java/a8k/extui/page/verification/PipetteGunVerification.java b/src/main/java/a8k/extui/page/verification/P01PipetteGunVerification.java similarity index 99% rename from src/main/java/a8k/extui/page/verification/PipetteGunVerification.java rename to src/main/java/a8k/extui/page/verification/P01PipetteGunVerification.java index 140caf9..d12189f 100644 --- a/src/main/java/a8k/extui/page/verification/PipetteGunVerification.java +++ b/src/main/java/a8k/extui/page/verification/P01PipetteGunVerification.java @@ -22,7 +22,7 @@ import org.springframework.stereotype.Component; @Component @Slf4j -public class PipetteGunVerification { +public class P01PipetteGunVerification { @Resource HbotTipPosMgr hbotTipPosMgr; diff --git a/src/main/java/a8k/extui/page/verification/A8kTemperaturaVerfication.java b/src/main/java/a8k/extui/page/verification/P02A8kTemperaturaVerfication.java similarity index 98% rename from src/main/java/a8k/extui/page/verification/A8kTemperaturaVerfication.java rename to src/main/java/a8k/extui/page/verification/P02A8kTemperaturaVerfication.java index 5f7c8d9..d398f81 100644 --- a/src/main/java/a8k/extui/page/verification/A8kTemperaturaVerfication.java +++ b/src/main/java/a8k/extui/page/verification/P02A8kTemperaturaVerfication.java @@ -7,7 +7,6 @@ import a8k.app.service.background.TemperatureCtrlService; import a8k.app.hardware.driver.TemperatureControlDriver; import a8k.app.a8ktype.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.extui.type.ExtUIPageCfg; import jakarta.annotation.Resource; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; @@ -23,7 +22,7 @@ import java.util.List; */ @Component @Slf4j -public class A8kTemperaturaVerfication { +public class P02A8kTemperaturaVerfication { @Resource ExtApiPageMgr extApiPageMgr;