Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
275e3a3
Update README and MQTTClient for installation instructions and code i…
Mile-Away Apr 18, 2025
bb1cac0
Merge remote-tracking branch 'origin/main' into dev
Xuwznln Apr 20, 2025
82881f5
feat: 支持local_config启动
Xuwznln Apr 20, 2025
e971424
add: registry description
Xuwznln Apr 20, 2025
5b4f580
add 3d visualization
Apr 23, 2025
279c5ed
完成在main中启动设备可视化
Apr 23, 2025
6155ec2
完成TF发布
Apr 23, 2025
1e01eae
修改模型方向,在yaml中添加变换属性
Apr 25, 2025
bed9720
添加物料tf变化时,发送topic到前端
Apr 25, 2025
ff8b75b
添加关节发布节点与物料可视化节点进入unilab
Apr 27, 2025
dbd1557
Merge branch 'refs/heads/main' into dev
Xuwznln Apr 29, 2025
bdf97be
使用json启动plr与3D模型仿真
Apr 29, 2025
09fc174
feat: node_info_update srv
Xuwznln Apr 29, 2025
e5749a8
close #12
Xuwznln Apr 29, 2025
ea6f25d
feat: show machine name
Xuwznln Apr 29, 2025
ba6a43c
feat: add hplc registry
Xuwznln Apr 29, 2025
6b649bf
feat: add hplc registry
Xuwznln Apr 29, 2025
0d2f1be
fix: hplc status typo
Xuwznln Apr 29, 2025
5038219
fix: devices/
Xuwznln Apr 29, 2025
8921bcd
完成启动OT并联动rviz
Apr 29, 2025
b7a16cd
add 3d visualization
Apr 23, 2025
2baa232
完成在main中启动设备可视化
Apr 23, 2025
0d24606
完成TF发布
Apr 23, 2025
2990e70
修改模型方向,在yaml中添加变换属性
Apr 25, 2025
111c3f4
添加物料tf变化时,发送topic到前端
Apr 25, 2025
d407423
添加关节发布节点与物料可视化节点进入unilab
Apr 27, 2025
49bb11b
使用json启动plr与3D模型仿真
Apr 29, 2025
dc197bf
完成启动OT并联动rviz
Apr 29, 2025
4dbb664
fix: device.class possible null
Xuwznln Apr 29, 2025
8ab108c
fix: HPLC additions with online service
Xuwznln Apr 30, 2025
2d034f7
fix: slave mode spin not working
Xuwznln Apr 30, 2025
7a51b2a
fix: slave mode spin not working
Xuwznln Apr 30, 2025
44c191f
Merge branch 'device_visualization' of https://github.com/q434343/Uni…
Apr 30, 2025
5212d2d
修复rviz位置问题,
Apr 30, 2025
9d2bfec
feat: 多ProtocolNode 允许子设备ID相同
Xuwznln May 1, 2025
752442c
feat: 支持env设置config
Xuwznln May 1, 2025
9eb271f
Merge remote-tracking branch 'origin/dev' into fork/q434343/device_vi…
Xuwznln May 1, 2025
2b42808
fix: running logic
Xuwznln May 1, 2025
fa5db06
fix: running logic
Xuwznln May 1, 2025
78239ab
fix: missing ot
Xuwznln May 1, 2025
5668310
在main中直接初始化republisher和物料的mesh节点
May 1, 2025
80380d1
将joint_republisher和resource_mesh_manager添加进 main_slave_run.py中
May 2, 2025
a52133b
Device visualization (#14)
q434343 May 6, 2025
1223e05
fix: missing hostname in devices_names
Xuwznln May 4, 2025
d6b8104
fix: missing paho-mqtt package
Xuwznln May 6, 2025
3c98c77
fix startup
Xuwznln May 6, 2025
65d0cbe
Merge remote-tracking branch 'origin/main' into dev
Xuwznln May 6, 2025
1a107cf
fix type hint
Xuwznln May 6, 2025
164417e
Merge remote-tracking branch 'origin/main' into dev
Xuwznln May 6, 2025
948f590
update actions
Xuwznln May 6, 2025
1949852
update actions
Xuwznln May 6, 2025
b47f67d
host node add_resource_from_outer
Xuwznln May 6, 2025
852d10d
pass device config to device class
Xuwznln May 6, 2025
32e370a
add: bind_parent_ids to resource create action
Xuwznln May 6, 2025
49a9f05
fix: host node should not be re_discovered
Xuwznln May 6, 2025
b6a3f17
feat: resource tracker support dict
Xuwznln May 6, 2025
e373220
feat: add more necessary params
Xuwznln May 6, 2025
de28c50
feat: fix boolean null in registry action data
Xuwznln May 6, 2025
ed2858a
feat: add outer resource
Xuwznln May 6, 2025
d199fda
编写mesh添加action
May 6, 2025
3dc62e3
feat: append resource
Xuwznln May 6, 2025
3d607db
add action
May 6, 2025
cd1e9a9
feat: vis 2d for plr
Xuwznln May 6, 2025
8617b12
Merge remote-tracking branch 'upstream/dev' into device_visualization
May 6, 2025
b43f232
Merge remote-tracking branch 'origin/dev' into device_visualization
Xuwznln May 6, 2025
aad2359
fix
May 6, 2025
6d5ada0
Merge remote-tracking branch 'q434343/device_visualization' into devi…
Xuwznln May 6, 2025
5df304b
fix: browser on rviz
Xuwznln May 6, 2025
3d60cb3
fix: cloud bridge error fallback to local
Xuwznln May 6, 2025
6cdd8c1
fix: salve auto run rviz
Xuwznln May 6, 2025
c12c2a8
初始化两个plate
May 6, 2025
f3637d4
Device visualization (#22)
q434343 May 6, 2025
83abf87
fix: multi channel
Xuwznln May 6, 2025
1b190ee
Merge remote-tracking branch 'upstream/dev' into device_visualization
May 6, 2025
fbff27a
fix: aspirate
Xuwznln May 6, 2025
45a73e2
fix: aspirate
Xuwznln May 6, 2025
2dde5b6
fix: aspirate
Xuwznln May 6, 2025
ad5168c
Merge branch 'dev' into device_visualization
May 6, 2025
34e03bb
fix: aspirate
Xuwznln May 6, 2025
da50e43
提交
May 6, 2025
6f97731
fix: jobadd
Xuwznln May 6, 2025
bec58e1
fix: jobadd
Xuwznln May 6, 2025
4223f9b
fix: msg converter
Xuwznln May 6, 2025
42f0994
tijiao
May 6, 2025
3d71c8b
Merge branch 'dev' into device_visualization
May 6, 2025
013c25f
Merge remote-tracking branch 'origin/dev' into fork/q434343/device_vi…
Xuwznln May 6, 2025
8e1dbb5
add resource creat easy action
Xuwznln May 13, 2025
f0576e5
identify debug msg
Xuwznln May 13, 2025
3600b6f
mq client id
Xuwznln May 13, 2025
83c765f
unify liquid_handler definition
TablewareBox May 14, 2025
4decd9a
Merge branch '24-high-level-liquidhandler' into dev
Xuwznln May 14, 2025
c2c2c2f
Merge branch 'main' into dev
Xuwznln May 29, 2025
7c71472
Merge branch 'dev' of github.com:dptech-corp/Uni-Lab-OS into dev
KCFeng425 Jun 14, 2025
3b32dcf
Update virtual_device.yaml
KCFeng425 Jun 14, 2025
6385065
更正了stir和heater的连接方式
KCFeng425 Jun 14, 2025
d058de3
区分了虚拟仪器中的八通阀和电磁阀,添加了两个阀门的驱动
KCFeng425 Jun 14, 2025
b875f86
修改了add protocol
KCFeng425 Jun 14, 2025
ff69985
修复了阀门更新版的bug
KCFeng425 Jun 15, 2025
7b04f3f
修复了添加protocol前缀导致的不能启动的bug
KCFeng425 Jun 15, 2025
5b9e135
Fix handles
TablewareBox Jun 16, 2025
47e58e1
Merge remote-tracking branch 'origin/dev' into fork/KCFeng425/device-…
Xuwznln Jun 16, 2025
a303bd7
bump version to 0.9.6
Xuwznln Jun 16, 2025
57cb120
add resource edge upload
Xuwznln Jun 16, 2025
8d56c52
update container registry and handles
TablewareBox Jun 16, 2025
9f8f6e5
add virtual_separator virtual_rotavap
Xuwznln Jun 16, 2025
e193bc4
Merge branch 'device-registry-port' of https://github.com/KCFeng425/U…
Xuwznln Jun 16, 2025
6c47155
fix container value
Xuwznln Jun 16, 2025
3199359
大图的问题都修复好了,添加了gassource和vacuum pump的驱动以及注册表
KCFeng425 Jun 16, 2025
6fd95fd
default resource upload mode is false
Xuwznln Jun 16, 2025
ee918a0
添加了icon的文件名在注册表里面
KCFeng425 Jun 17, 2025
ab7f153
Merge branch 'device-registry-port' of github.com:KCFeng425/Uni-Lab-O…
KCFeng425 Jun 17, 2025
3e6c8d6
修改了json图中link的格式
KCFeng425 Jun 17, 2025
dd7abe9
fix resource and edge upload
TablewareBox Jun 17, 2025
18c4eb3
fix device ports
TablewareBox Jun 17, 2025
678ace6
Fix edge id
TablewareBox Jun 17, 2025
183579f
移除device的父节点关联
Xuwznln Jun 17, 2025
af812d6
separate registry sync and resource_add
TablewareBox Jun 17, 2025
b1dae6d
默认不进行注册表报送,通过命令unilabos-register或者增加启动参数
Xuwznln Jun 17, 2025
2492af5
完善tip
Xuwznln Jun 17, 2025
ac88c59
protocol node不再嵌套显示
Xuwznln Jun 17, 2025
f6f9244
bump version to 0.9.7 新增一个测试PumpTransferProtocol的teststation,亲测可以运行,…
KCFeng425 Jun 17, 2025
cbe04a0
Merge branch 'device-registry-port' of github.com:KCFeng425/Uni-Lab-O…
KCFeng425 Jun 17, 2025
afc095f
protocol node 执行action不应携带自身device id
Xuwznln Jun 18, 2025
622edbd
添加了一套简易双八通阀工作站JSON,亲测能跑
KCFeng425 Jun 18, 2025
771540b
修复了很多protocol,亲测能跑
KCFeng425 Jun 19, 2025
e564d26
添加了run column和filter through的protocol,亲测能跑
KCFeng425 Jun 20, 2025
042ec2e
fix mock_reactor
TablewareBox Jun 20, 2025
844baa5
修改了大图和小图的json,但是在前端上没看到改变
KCFeng425 Jun 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ conda env update --file unilabos-[YOUR_OS].yml -n environment_name

# Currently, you need to install the `unilabos_msgs` package
# You can download the system-specific package from the Release page
conda install ros-humble-unilabos-msgs-0.9.5-xxxxx.tar.bz2
conda install ros-humble-unilabos-msgs-0.9.7-xxxxx.tar.bz2

# Install PyLabRobot and other prerequisites
git clone https://github.com/PyLabRobot/pylabrobot plr_repo
Expand Down
2 changes: 1 addition & 1 deletion README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ conda env update --file unilabos-[YOUR_OS].yml -n 环境名

# 现阶段,需要安装 `unilabos_msgs` 包
# 可以前往 Release 页面下载系统对应的包进行安装
conda install ros-humble-unilabos-msgs-0.9.5-xxxxx.tar.bz2
conda install ros-humble-unilabos-msgs-0.9.7-xxxxx.tar.bz2

# 安装PyLabRobot等前置
git clone https://github.com/PyLabRobot/pylabrobot plr_repo
Expand Down
6 changes: 3 additions & 3 deletions recipes/ros-humble-unilabos-msgs/recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: ros-humble-unilabos-msgs
version: 0.9.5
version: 0.9.7
source:
path: ../../unilabos_msgs
folder: ros-humble-unilabos-msgs/src/work
Expand Down Expand Up @@ -50,12 +50,12 @@ requirements:
- robostack-staging::ros-humble-rosidl-default-generators
- robostack-staging::ros-humble-std-msgs
- robostack-staging::ros-humble-geometry-msgs
- robostack-staging::ros2-distro-mutex=0.6.*
- robostack-staging::ros2-distro-mutex=0.5.*
run:
- robostack-staging::ros-humble-action-msgs
- robostack-staging::ros-humble-ros-workspace
- robostack-staging::ros-humble-rosidl-default-runtime
- robostack-staging::ros-humble-std-msgs
- robostack-staging::ros-humble-geometry-msgs
- robostack-staging::ros2-distro-mutex=0.6.*
# - robostack-staging::ros2-distro-mutex=0.6.*
- sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
2 changes: 1 addition & 1 deletion recipes/unilabos/recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: unilabos
version: "0.9.5"
version: "0.9.7"

source:
path: ../..
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setup(
name=package_name,
version='0.9.5',
version='0.9.7',
packages=find_packages(),
include_package_data=True,
install_requires=['setuptools'],
Expand All @@ -17,6 +17,7 @@
entry_points={
'console_scripts': [
"unilab = unilabos.app.main:main",
"unilab-register = unilabos.app.register:main"
],
},
)
Loading
Loading