1

src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java

@@ -264,13 +264,11 @@ public class MotorTubeRackMoveCtrlService {
 	}
 
 	public boolean isTubeRackInEnterPos() throws HardwareException {
-		var response = this.a8kCanBusService.callcmd(ModId.FeedingModBoard, CmdId.kxymotor_read_inio, 3);
-		return response.getContentI32(0) == 1;
+		return this.a8kCanBusService.getIOState(IOId.InfeedPPS);
 	}
 
 	public boolean isTubeRackInExitPos() throws HardwareException {
-		var response = this.a8kCanBusService.callcmd(ModId.FeedingModBoard, CmdId.kxymotor_read_inio, 5);
-		return response.getContentI32(0) == 1;
+		return this.a8kCanBusService.getIOState(IOId.OutfeedPPS);
 	}
 
 	/**
@@ -279,9 +277,8 @@ public class MotorTubeRackMoveCtrlService {
 	 * @return true, 光电触发 false,光电没有触发
 	 */
 	public boolean getMoveChannelPhotoelectricState(Integer photoelectricIndex) throws HardwareException {
-		var index    = 0 == photoelectricIndex ? 2 : 1;
-		var response = this.a8kCanBusService.callcmd(ModId.FeedingModBoard, CmdId.kxymotor_read_inio, new Integer[]{index});
-		return response.getContentI32(0) == 1;
+		var io = 0 == photoelectricIndex ? IOId.THChOuterPPS : IOId.THChInterPPS;
+		return this.a8kCanBusService.getIOState(io);
 	}
 
 	//