calvincao
b97be6a5d4
feat(battery): 更新电池工作站配置与物料布局
...
- 修改弹夹尺寸默认值，确保非空时使用实际值
- 调整new_cellconfig3c.json中设备位置和尺寸配置
- 更新CoinCellDeck的尺寸和原点坐标
-重新分配所有物料和弹夹的位置坐标
- 调整电解液缓存位和回收位坐标
- 更新物料板和tip box的布局位置
2025-11-10 21:40:02 +08:00
Calvin Cao
44f830cf00
Merge pull request #163 from sun7151887/yb4-fix
...
更新YB_Deck堆栈坐标位置，根据图片像素坐标映射到实际尺寸
2025-11-10 19:30:26 +08:00
dijkstra402
04b578a68b
更新YB_Deck堆栈坐标位置，根据图片像素坐标映射到实际尺寸
2025-11-10 18:57:20 +08:00
Junhan Chang
0d64563fb6
fix serialize for magazine
2025-11-10 15:40:29 +08:00
dijkstra402
538891fcbe
Update YB resources: add YB_ prefix to models and update deck configurations
2025-11-09 17:04:52 +08:00
Calvin Cao
1d77225912
Merge branch 'workstation_dev_YB4' into workstation_dev_YB3
2025-11-09 15:48:22 +08:00
Junhan Chang
f872d3ef56
add electrode_sheets definition, and fix magazines
2025-11-09 01:00:05 +08:00
dijkstra402
be429147c0
Fix infinite recursion in YB_jia_yang_tou_da by renaming carrier function to YB_jia_yang_tou_da_Carrier
2025-11-08 15:42:18 +08:00
dijkstra402
7af32b379b
Add YB_ prefix to bottle carrier model names
2025-11-08 14:53:25 +08:00
dijkstra402
200105f647
Add debug prints to create_orders and add resource_tree_transfer method
2025-11-08 13:35:47 +08:00
Junhan Chang
966b51042d
rename and fix all Yihua Materials: ClipMagazineHole→Magazine(ResourceStack), and use factory functions
2025-11-06 00:59:46 +08:00
Calvin Cao
0238a92e75
Merge pull request #144 from sun7151887/fix/yb3-material-names-and-model
...
更新YB工站deck坐标配置
2025-11-03 23:51:10 +08:00
dijkstra402
8009956326
更新YB工站deck坐标配置
...
- 根据实际布局图更新各堆栈的坐标位置
- 将粉末加样头堆栈拆分为左右两部分(10x1x1 -> 2个5x1x1)
- 将试剂替换仓库拆分为左右两部分(10x1x1 -> 2个5x1x1)
- 更新配液站内试剂仓库的坐标
- 所有坐标基于像素位置精确计算(deck原点: 206,446)
2025-11-03 23:49:02 +08:00
lixinyu1011
cd12932788
1103byxinyu
2025-11-03 22:53:37 +08:00
lixinyu1011
a2d6012080
Merge branch 'workstation_dev_YB3' of https://github.com/lixinyu1011/Uni-Lab-OS into workstation_dev_YB3
2025-11-03 19:50:04 +08:00
lixinyu1011
10adc853a5
1103-2byxinyu
2025-11-03 19:50:01 +08:00
Calvin Cao
62d08aa954
Merge branch 'workstation_dev_YB3' into workstation_dev_YB3
2025-11-03 19:46:52 +08:00
lixinyu1011
4485907df8
1103byxinyu
2025-11-03 18:46:50 +08:00
dijkstra402
727d2c2595
fix: 修正YB warehouse排列方式和物料类型映射
...
- 修改warehouse_factory为YB_warehouse_factory
- 调整warehouse排列方式：左上角为A01，竖着排ABCD，横着排01、02、03
- 修正config.py中的物料名称拼写错误(YB_fen_ye_20ml_Bottle, YB_pei_ye_xiao_Bottle)
- 添加缺失的warehouse函数(bioyond_warehouse_2x2x1, bioyond_warehouse_3x5x1, bioyond_warehouse_20x1x1)
- 更新decks.py中的warehouse位置映射
- 删除废弃的bottles.py和warehouses.py文件
2025-11-01 10:42:31 +08:00
calvincao
a97781c4eb
Merge remote-tracking branch 'origin/dev' into workstation_dev_YB3
2025-10-28 11:47:07 +08:00
dijkstra402
2d58576937
feat: 添加YB瓶子和载架配置
...
- 在YB_bottles.py中添加8种瓶子类型（100ml液体、高粘液、5ml分液瓶、20ml分液瓶、配液瓶小、配液瓶大、枪头等）
- 在YB_bottle_carriers.py中添加12个载架函数（包括新增的高粘液载架和100ml液体载架）
- 更新config.py的MATERIAL_TYPE_MAPPINGS配置，添加16种物料类型映射
- 创建YB_bottle_carriers.yaml注册文件，包含所有载架和瓶子函数
- 创建YB_bottle.yaml注册文件，包含独立的瓶子函数配置
- 移除不存在的瓶子函数引用（YB_Solid_Vial等4个函数）
2025-10-27 22:23:09 +08:00
lixinyu1011
3231d60646
1027by_Xinyu
2025-10-27 20:08:19 +08:00
lixinyu1011
d0279f63f0
Merge remote-tracking branch 'upstream/workstation_dev_YB3' into workstation_dev_YB3
2025-10-27 19:33:45 +08:00
lixinyu1011
ceef342860
1027byxinyu
2025-10-27 18:16:26 +08:00
Calvin Cao
667138baac
Merge branch 'workstation_dev_YB3' into workstation_dev_YB3
2025-10-24 13:56:00 +08:00
dijkstra402
01adf7ca92
refactor: 将 BIOYOND_PolymerStation_ 前缀统一改为 YB_
...
- 重命名 bottles.py 中所有工厂函数：BIOYOND_PolymerStation_* -> YB_*
- 重命名 bottle_carriers.py 中所有载具工厂函数和导入
- 更新 registry YAML 文件中的 module 引用
- 更新 MATERIAL_TYPE_MAPPINGS 配置中的类型字符串
- 更新测试文件和样例 JSON 中的类型引用
- 添加 YB_* 别名条目到 registry 以支持双键访问
2025-10-24 13:49:48 +08:00
lixinyu1011
7206e42bf1
xinyu1024修改
2025-10-24 11:37:36 +08:00
dijkstra402
9e850d8a81
更新载架网格布局：5ml/20ml/配液瓶(小)板改为4x2，加样头(大)板改为1x1
2025-10-23 17:42:10 +08:00
dijkstra402
d3d8ba6500
fix(yb3): 物料名称与模型对齐；YAML 去掉 BIOYOND_PolymerStation_ 前缀；修复 6StockCarrier model
2025-10-23 15:32:36 +08:00
Xuwznln
a45d841769
remove extra key
2025-10-23 11:37:26 +08:00
calvincao
5a7845d8ca
更新配置文件中的 report_ip 默认值，优化 bioyond_cell_workstation.py 中的订单状态处理逻辑，新增多个瓶子和载架类型的定义，调整仓库结构以支持更灵活的物料管理。
2025-10-23 08:34:33 +08:00
Xuwznln
3ff894feee
add invisible_slots to carriers
2025-10-21 17:51:30 +08:00
ZiWei
fa5896ffdb
fix(warehouses): 修正bioyond_warehouse_1x4x4仓库的尺寸参数
...
调整仓库的num_items_x和num_items_z值以匹配实际布局，并更新物品尺寸参数
2025-10-21 17:15:51 +08:00
Xuwznln
eb504803ac
save resource get data. allow empty value for layout and cross_section_type
2025-10-21 16:55:43 +08:00
lixinyu1011
8b0c845661
More decks&plates support for bioyond ( #115 )
2025-10-21 16:25:54 +08:00
lixinyu1011
d2352cc514
1020_YB奔耀仿真机同步对齐dev_unilab可控
...
待修改unilab的http服务
2025-10-20 12:48:19 +08:00
ZiWei
9f7c3f02f9
fix(bioyond/warehouses): 修正仓库尺寸和物品排列参数
...
调整仓库的x轴和z轴物品数量以及物品尺寸参数，使其符合4x1x4的规格要求
2025-10-19 08:36:40 +08:00
Junhan Chang
19dd80dcdb
fix warehouse serialize/deserialize
2025-10-19 08:18:18 +08:00
Junhan Chang
9d5ed627a2
fix bioyond converter
2025-10-19 05:21:41 +08:00
Junhan Chang
2d0ff87bc8
fix itemized_carrier.unassign_child_resource
2025-10-19 05:19:19 +08:00
Junhan Chang
88ae56806c
add layout serializer & converter
2025-10-18 20:53:03 +08:00
Junhan Chang
95dd8beb81
warehouseuse A1-D4; add warehouse layout
2025-10-18 20:27:50 +08:00
ZiWei
4ab3fadbec
fix(graphio): 修正bioyond到plr资源转换中的坐标计算错误
2025-10-18 19:25:23 +08:00
ZiWei
229888f834
Fix resource assignment and type mapping issues
...
Corrects resource assignment in ItemizedCarrier by using the correct spot key from _ordering. Updates graphio to use 'typeName' instead of 'name' for type mapping in resource_bioyond_to_plr. Renames DummyWorkstation to BioyondWorkstation in workstation_http_service for clarity.
2025-10-18 18:55:16 +08:00
ZiWei
2d26c3fac6
fix: 修复资源移除时的父资源检查问题
...
在BaseROS2DeviceNode中，移除资源前添加对父资源是否为None的检查，避免空指针异常
同时更新Bottle和BottleCarrier类以支持**kwargs参数
修正测试文件中Liquid_feeding_beaker的大小写拼写错误
2025-10-17 02:23:58 +08:00
Xuwznln
3757bd9c58
fix state loading for regular container
2025-10-16 14:04:03 +08:00
Xuwznln
d8f3ebac15
fix comprehensive_station.json
2025-10-16 13:46:59 +08:00
Xuwznln
4a1e703a3a
support no size init
2025-10-16 13:35:59 +08:00
Xuwznln
55d22a7c29
Update regular container method
2025-10-16 13:33:28 +08:00
Xuwznln
357fc038ef
temp fix for resource get
2025-10-16 03:15:56 +08:00
