From 134736f55881790a5c03dcaa661ab9a0c414f5e2 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 14 Jul 2024 10:58:41 +0800 Subject: [PATCH] update module name --- src/main/java/a8k/a8k_can_protocol/ModuleId.java | 114 ++++++++++++++------- .../a8k/service/db/dao/A8kDirectCtrlPosDao.java | 6 ++ 2 files changed, 81 insertions(+), 39 deletions(-) diff --git a/src/main/java/a8k/a8k_can_protocol/ModuleId.java b/src/main/java/a8k/a8k_can_protocol/ModuleId.java index 174a633..2b7f8ed 100644 --- a/src/main/java/a8k/a8k_can_protocol/ModuleId.java +++ b/src/main/java/a8k/a8k_can_protocol/ModuleId.java @@ -1,63 +1,99 @@ package a8k.a8k_can_protocol; public class ModuleId { - public static final int ArmXYModule = 11;//机械臂XY - public static final int ArmZModule = 81;//机械臂Z - public static final int FeederModule = 60;//出入料模块 - public static final int IdCardReaderModule = 101; //A8K读卡器 - public static final int IncubatorTempCtrlModule = 51;//温度控制 - public static final int MaterialScannerModule = 83;//物料扫码器 - public static final int MotorCardWarehouseMoveModule = 21;//板夹仓移动电机 - public static final int MotorCardWarehousePushModule = 22;//板夹仓推杆电机 - public static final int MotorIncubatorRotateModule = 71;//孵育盘旋转 - public static final int MotorTestCardPullModule = 92;//板卡推杆电机 - public static final int MotorTestCardScanModule = 91;//板卡扫描电机 + public static final int ArmXYBoardModule = 10;//机械臂板模块 + public static final int ArmXYModule = 11;//机械臂XY + + public static final int MotorCardWarehouseMoveBoardModule = 20;//板夹仓模块 + public static final int MotorCardWarehouseMoveModule = 21;//板夹仓移动电机 + public static final int MotorCardWarehousePushModule = 22;//板夹仓推杆电机 + + public static final int ShakeModuleBoard = 30;//摇匀模组板 public static final int MotorTubeScanClampModule = 31;//试管固定夹爪电机 public static final int MotorTubeMoveUpDownModule = 32;//摇匀升降电机 - public static final int MotorTubeRackExitModule = 63;//出料电机 - public static final int MotorTubeRackFeedModule = 61;//入料电机 - public static final int MotorTubeRackMoveModule = 62;//试管架平移电机 public static final int MotorTubeShakeModule = 33;//试管摇匀电机 - public static final int PipetteModule = 82;//移液枪 - public static final int ScannerModule = 93;//扫描仪 - public static final int ServoTubeCapClipModule = 35;//摇匀试管帽夹爪 public static final int ServoTubeMoveFrontBackModule = 34;//摇匀前后电机 + public static final int ServoTubeCapClipModule = 35;//摇匀试管帽夹爪 public static final int ServoTubeRackTubePushModule = 36;//试管架旋转固定舵机 public static final int ServoTubeRackTubeRotateModule = 37;//试管架旋转舵机 - public static final int TestCardWarehouseModule = 41;//测试板仓 - public static final int TrashBoxModule = 40;//废料盒 - public static final int TubeRackScannerModule = 64;//试管架扫码器 - public static final int WbTubeFanModule = 42;//气溶胶风扇 + + public static final int ReactionCardBoxTemperatureCtrlBoard = 40;//反应板夹温度控制板 + public static final int ReactionCardBoxTemperatureModule = 41;//反应板夹温度控制模块 + public static final int WbTubeFanModule = 42;//气溶胶风扇 + + public static final int IncubatorTempCtrlBoard = 50;//温度控制 + public static final int IncubatorTempCtrlModule = 51;//温度控制 + + public static final int FeederBoard = 60;//出入料模块 + public static final int MotorTubeRackFeedModule = 61;//入料电机 + public static final int MotorTubeRackMoveModule = 62;//试管架平移电机 + public static final int MotorTubeRackExitModule = 63;//出料电机 + public static final int TubeRackScannerModule = 64;//试管架扫码器 + + public static final int MotorIncubatorRotateBoard = 70;//孵育盘旋转板 + public static final int MotorIncubatorRotateModule = 71;//孵育盘旋转 + + public static final int ArmZBoard = 80;//机械臂Z轴板 + public static final int ArmZModule = 81;//机械臂Z + public static final int PipetteModule = 82;//移液枪 + public static final int MaterialScannerModule = 83;//物料扫码器 + + public static final int OptScanModuleBoard = 90;//光学模组板 + public static final int MotorTestCardScanModule = 91;//板卡扫描电机 + public static final int MotorTestCardPullModule = 92;//板卡推杆电机 + public static final int ScannerModule = 93;//扫描仪 + + public static final int IdCardReaderBoard = 100; //A8K读卡器板 + public static final int IdCardReaderModule = 101; //A8K读卡器 + public static String ModuleId2Name(int moduleId) { return switch (moduleId) { + case ArmXYBoardModule -> "ArmXYBoardModule"; case ArmXYModule -> "ArmXYModule"; - case ArmZModule -> "ArmZModule"; - case FeederModule -> "FeederModule"; - case IdCardReaderModule -> "IdCardReaderModule"; - case IncubatorTempCtrlModule -> "IncubatorTempCtrlModule"; - case MaterialScannerModule -> "MaterialScannerModule"; + + case MotorCardWarehouseMoveBoardModule -> "MotorCardWarehouseMoveBoardModule"; case MotorCardWarehouseMoveModule -> "MotorCardWarehouseMoveModule"; case MotorCardWarehousePushModule -> "MotorCardWarehousePushModule"; - case MotorIncubatorRotateModule -> "MotorIncubatorRotateModule"; - case MotorTestCardPullModule -> "MotorTestCardPullModule"; - case MotorTestCardScanModule -> "MotorTestCardScanModule"; - case MotorTubeScanClampModule -> "MotorTubeBodyClipModule"; + + case ShakeModuleBoard -> "ShakeModuleBoard"; + case MotorTubeScanClampModule -> "MotorTubeScanClampModule"; case MotorTubeMoveUpDownModule -> "MotorTubeMoveUpDownModule"; - case MotorTubeRackExitModule -> "MotorTubeRackExitModule"; - case MotorTubeRackFeedModule -> "MotorTubeRackFeedModule"; - case MotorTubeRackMoveModule -> "MotorTubeRackMoveModule"; case MotorTubeShakeModule -> "MotorTubeShakeModule"; - case PipetteModule -> "PipetteModule"; - case ScannerModule -> "ScannerModule"; - case ServoTubeCapClipModule -> "ServoTubeCapClipModule"; case ServoTubeMoveFrontBackModule -> "ServoTubeMoveFrontBackModule"; + case ServoTubeCapClipModule -> "ServoTubeCapClipModule"; case ServoTubeRackTubePushModule -> "ServoTubeRackTubePushModule"; case ServoTubeRackTubeRotateModule -> "ServoTubeRackTubeRotateModule"; - case TestCardWarehouseModule -> "TestCardWarehouseModule"; - case TrashBoxModule -> "TrashBoxModule"; - case TubeRackScannerModule -> "TubeRackScannerModule"; + + case ReactionCardBoxTemperatureCtrlBoard -> "ReactionCardBoxTemperatureCtrlBoard"; + case ReactionCardBoxTemperatureModule -> "ReactionCardBoxTemperatureModule"; case WbTubeFanModule -> "WbTubeFanModule"; + + case IncubatorTempCtrlBoard -> "IncubatorTempCtrlBoard"; + case IncubatorTempCtrlModule -> "IncubatorTempCtrlModule"; + + case FeederBoard -> "FeederBoard"; + case MotorTubeRackFeedModule -> "MotorTubeRackFeedModule"; + case MotorTubeRackMoveModule -> "MotorTubeRackMoveModule"; + case MotorTubeRackExitModule -> "MotorTubeRackExitModule"; + case TubeRackScannerModule -> "TubeRackScannerModule"; + + case MotorIncubatorRotateBoard -> "MotorIncubatorRotateBoard"; + case MotorIncubatorRotateModule -> "MotorIncubatorRotateModule"; + + case ArmZBoard -> "ArmZBoard"; + case ArmZModule -> "ArmZModule"; + case PipetteModule -> "PipetteModule"; + case MaterialScannerModule -> "MaterialScannerModule"; + + case OptScanModuleBoard -> "OptScanModuleBoard"; + case MotorTestCardScanModule -> "MotorTestCardScanModule"; + case MotorTestCardPullModule -> "MotorTestCardPullModule"; + case ScannerModule -> "ScannerModule"; + + case IdCardReaderBoard -> "IdCardReaderBoard"; + case IdCardReaderModule -> "IdCardReaderModule"; + default -> "UnknownModuleId(" + moduleId + ")"; }; } diff --git a/src/main/java/a8k/service/db/dao/A8kDirectCtrlPosDao.java b/src/main/java/a8k/service/db/dao/A8kDirectCtrlPosDao.java index 8775b8d..107b228 100644 --- a/src/main/java/a8k/service/db/dao/A8kDirectCtrlPosDao.java +++ b/src/main/java/a8k/service/db/dao/A8kDirectCtrlPosDao.java @@ -38,6 +38,12 @@ public class A8kDirectCtrlPosDao { public static final String MotorTubeScanClampModule_releasePos = "MotorTubeScanClampModule_releasePos";//试管扫码夹紧模组 释放位置 + // + // 试管预处理模块 + // + + + PosBean getPosBean(String posName) { A8kDirectCtrlPos pos = UfActiveRecord.findOne(A8kDirectCtrlPos.class, Map.of("posName", posName)); assert pos != null;