diff --git a/unilabos/app/mq.py b/unilabos/app/mq.py
index c569c04..1b72190 100644
--- a/unilabos/app/mq.py
+++ b/unilabos/app/mq.py
@@ -166,7 +166,7 @@ class MQTTClient:
status = {"data": device_status.get(device_id, {}), "device_id": device_id, "timestamp": time.time()}
address = f"labs/{MQConfig.lab_id}/devices/"
self.client.publish(address, json.dumps(status), qos=2)
- logger.info(f"Device status published: address: {address}, {status}")
+ logger.info(f"Device {device_id} status published: address: {address}, {status}")
def publish_job_status(self, feedback_data: dict, job_id: str, status: str, return_info: Optional[str] = None):
if self.mqtt_disable:
diff --git a/unilabos/device_mesh/devices/elite_robot/config/cs66/default_kinematics.yaml b/unilabos/device_mesh/devices/elite_robot/config/cs66/default_kinematics.yaml
index 04fece1..57b8482 100644
--- a/unilabos/device_mesh/devices/elite_robot/config/cs66/default_kinematics.yaml
+++ b/unilabos/device_mesh/devices/elite_robot/config/cs66/default_kinematics.yaml
@@ -5,7 +5,7 @@ kinematics:
z: 0.1625
roll: 0
pitch: 0
- yaw: 0
+ yaw: -0.16
upperarm:
x: 0
y: 0
@@ -26,7 +26,7 @@ kinematics:
z: 0.1475
roll: 0
pitch: 0
- yaw: 0
+ yaw: 0.04
wrist_2:
x: 0
y: -0.0965
@@ -39,5 +39,5 @@ kinematics:
y: 0.0920
z: 0
roll: -1.570796326589793
- pitch: 0
+ pitch: -0.59
yaw: 0
diff --git a/unilabos/device_mesh/devices/elite_robot/macro_device.xacro b/unilabos/device_mesh/devices/elite_robot/macro_device.xacro
index e5171a6..d9b71fc 100644
--- a/unilabos/device_mesh/devices/elite_robot/macro_device.xacro
+++ b/unilabos/device_mesh/devices/elite_robot/macro_device.xacro
@@ -145,7 +145,7 @@
type="fixed">
+ rpy="0 0 -1.570796326589793" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/unilabos/device_mesh/devices/hplc_station/meshes/mt_base.STL b/unilabos/device_mesh/devices/hplc_station/meshes/mt_base.STL
new file mode 100644
index 0000000..489334c
Binary files /dev/null and b/unilabos/device_mesh/devices/hplc_station/meshes/mt_base.STL differ
diff --git a/unilabos/registry/devices/robot_arm.yaml b/unilabos/registry/devices/robot_arm.yaml
index 10a06fd..f85d231 100644
--- a/unilabos/registry/devices/robot_arm.yaml
+++ b/unilabos/registry/devices/robot_arm.yaml
@@ -147,6 +147,7 @@ robotic_arm.UR:
handles: []
icon: ''
init_param_schema:
+ additionalProperties: false
config:
properties:
host:
@@ -172,5 +173,66 @@ robotic_arm.UR:
- gripper_pose
- arm_status
- gripper_status
- additionalProperties: false
- type: object
\ No newline at end of file
+ type: object
+ version: 1.0.0
+robotic_arm.elite:
+ category:
+ - robot_arm
+ class:
+ action_value_mappings:
+ modbus_task_cmd:
+ feedback: {}
+ goal:
+ command: command
+ goal_default:
+ command: ''
+ handles: []
+ result: {}
+ schema:
+ description: ''
+ properties:
+ feedback:
+ properties:
+ status:
+ type: string
+ required:
+ - status
+ title: SendCmd_Feedback
+ type: object
+ goal:
+ properties:
+ command:
+ type: string
+ required:
+ - command
+ title: SendCmd_Goal
+ type: object
+ result:
+ properties:
+ return_info:
+ type: string
+ success:
+ type: boolean
+ required:
+ - return_info
+ - success
+ title: SendCmd_Result
+ type: object
+ required:
+ - goal
+ title: SendCmd
+ type: object
+ type: SendCmd
+ module: unilabos.devices.arm.elite_robot:EliteRobot
+ status_types:
+ arm_pose: Float64MultiArray
+ type: python
+ config_info: []
+ description: Elite robot arm
+ handles: []
+ icon: ''
+ init_param_schema: {}
+ model:
+ mesh: elite_robot
+ type: device
+ version: 1.0.0
diff --git a/unilabos/registry/resources/opentrons/deck.yaml b/unilabos/registry/resources/opentrons/deck.yaml
index 961b6e6..e2e9b4b 100644
--- a/unilabos/registry/resources/opentrons/deck.yaml
+++ b/unilabos/registry/resources/opentrons/deck.yaml
@@ -15,3 +15,13 @@ OTDeck:
type: device
registry_type: resource
version: 1.0.0
+
+
+hplc_station:
+ description: Opentrons deck
+ class:
+ module: pylabrobot.resources.opentrons.deck:OTDeck
+ type: pylabrobot
+ model:
+ type: device
+ mesh: hplc_station
\ No newline at end of file