diff --git a/src/src/main/java/com/my/graphiteDigesterBg/MyDevice.java b/src/src/main/java/com/my/graphiteDigesterBg/MyDevice.java index db04db2..3be32ae 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/MyDevice.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/MyDevice.java @@ -8,17 +8,5 @@ public class MyDevice extends DiDevice { public static String ACT_TRANSFER_LR_MOTOR = "TransferArmLRMotor"; public static String ACT_TRANSFER_CLIP_SERVO = "TransferClipServeMotor"; public static String ACT_DOOR_MOTOR = "DoorMotor"; - - - - - - - - public static String ACT_HEAT_SLOT_01_COVER_SERVO = "heatSlot0CoverServo"; - public static String IO_HEAT_SLOT_01_HEATER_01 = "heatSlot1Heater1"; - public static String IO_HEAT_SLOT_01_HEATER_02 = "heatSlot1Heater2"; - public static String IO_HEAT_SLOT_01_HEATER_03 = "heatSlot1Heater3"; - public static String IO_HEAT_SLOT_01_HEATER_04 = "heatSlot1Heater4"; - public static String IO_AIR_COMPRESSOR = "airCompressor"; + public static String ACT_CAMERA = "Camera"; } diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiTaskBase.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiTaskBase.java index 338ce39..e54a6f7 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiTaskBase.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/DiTaskBase.java @@ -111,6 +111,7 @@ abstract public class DiTaskBase implements DiTask { this.execution.status = "ERROR"; this.execution.message = e.getMessage(); this.execution.save(); + this.status = TaskStatus.FINISHED; } }