lixinyu1011
442b759397
修改pymodbus和websocket的报送信息
2025-11-08 15:56:39 +08:00
Calvin Cao
123c69e97a
Merge pull request #152 from lixinyu1011/workstation_dev_YB3
...
修改减少modbus报警信息，以及websocket报警信息
2025-11-08 15:21:33 +08:00
Calvin Cao
04004c9b6f
Merge branch 'workstation_dev_YB3' into workstation_dev_YB3
2025-11-08 15:21:25 +08:00
lixinyu1011
45a778b928
修改减少modbus报警信息，以及websocket报警信息
2025-11-08 15:18:52 +08:00
Calvin Cao
c44ae32070
Merge pull request #151 from sun7151887/fix/yb3-material-names-and-model
...
Add debug prints to create_orders and add resource_tree_transfer method
2025-11-08 15:01:42 +08:00
dijkstra402
7af32b379b
Add YB_ prefix to bottle carrier model names
2025-11-08 14:53:25 +08:00
Xuwznln
48d429ae00
fix resource_get param
2025-11-08 14:40:00 +08:00
dijkstra402
200105f647
Add debug prints to create_orders and add resource_tree_transfer method
2025-11-08 13:35:47 +08:00
Xuwznln
8b5653d801
fix json dumps
2025-11-08 12:13:57 +08:00
Xuwznln
5f859917d4
support name change during materials change
2025-11-08 12:13:56 +08:00
Xuwznln
af2fb7f34a
enable slave mode
2025-11-08 12:13:54 +08:00
Xuwznln
baa107c230
change uuid logger to trace level
2025-11-08 12:13:52 +08:00
Xuwznln
83854a741d
correct remove_resource stats
2025-11-08 12:13:50 +08:00
Xuwznln
86c7880b5c
disable slave connect websocket
2025-11-08 12:13:48 +08:00
Xuwznln
6d934e354c
adjust with_children param
2025-11-08 12:13:46 +08:00
Xuwznln
bed453034f
modify devices to use correct executor (sleep, create_task)
2025-11-08 12:13:44 +08:00
Xuwznln
5331d7bfba
support sleep and create_task in node
2025-11-08 12:13:41 +08:00
Xuwznln
38ab7d3e78
fix run async execution error
2025-11-08 12:13:41 +08:00
Calvin Cao
9a85bfddcd
Merge pull request #147 from lixinyu1011/workstation_dev_YB3
...
1104_byxinyu
2025-11-04 03:57:57 +08:00
lixinyu1011
d4e1286df7
1104_byxinyu
2025-11-04 03:42:00 +08:00
calvincao
765038a136
Revert "Update YB_YH_materials.py"
...
This reverts commit bfd415279b
2025-11-04 02:18:44 +08:00
calvincao
0ad2eaafea
Fix BottleRack references in CoincellDeck setup
...
- Updated references from bottle_rack_2x6 to bottle_rack_6x2 to align with the new configuration.
- Adjusted the loop for assigning ElectrodeSheets to use the correct BottleRack dimensions.
2025-11-04 01:57:30 +08:00
calvincao
1477384c1a
Update CoinCellAssembly and YB_YH_materials configurations
...
- Adjusted CoincellDeck dimensions and origin coordinates for improved layout.
- Replaced CoincellDeck references with specific ClipMagazine instances in YB_YH_materials.py.
- Updated BottleRack configurations to reflect new item arrangements and dimensions.
2025-11-04 01:19:42 +08:00
Calvin Cao
8149a175d9
Merge pull request #145 from lixinyu1011/workstation_dev_YB3
...
Update YB_YH_materials.py
2025-11-04 00:41:17 +08:00
lixinyu1011
bfd415279b
Update YB_YH_materials.py
2025-11-04 00:39:39 +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
Calvin Cao
68fc4dd61e
Merge pull request #143 from lixinyu1011/workstation_dev_YB3
...
1103-3byxinyu
2025-11-03 23:02:17 +08:00
lixinyu1011
cd12932788
1103byxinyu
2025-11-03 22:53:37 +08:00
calvincao
f230028558
feat: Enhance CoincellDeck setup with new ClipMagazine and BottleRack configurations
...
- Refactored ClipMagazine class to inherit from ItemizedResource and updated hole dimensions.
- Introduced ClipMagazine_four class for a new 2x2 hole layout.
- Expanded CoincellDeck setup to include multiple ClipMagazines and MaterialPlates with ElectrodeSheets.
- Improved BottleRack initialization with dynamic item positioning and resource assignment.
- Added serialization methods for new classes to maintain state consistency.
2025-11-03 21:30:27 +08:00
Calvin Cao
1c1a6b16c8
Merge pull request #142 from lixinyu1011/workstation_dev_YB3
...
11103-2byxinyu
2025-11-03 19:51:56 +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
69ec034623
Merge pull request #141 from lixinyu1011/workstation_dev_YB3
...
1103byxinyu
2025-11-03 19:47:13 +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
calvincao
b5b2358967
fix: 更新HTTP服务配置和物料类型映射
...
- 修改BIOYOND_HTTP_HOST的默认值为新的IP地址172.21.32.91
- 调整物料类型映射中“加样头(大)”的UUID顺序，并注释掉“加样头(大)板”配置
2025-11-03 18:20:50 +08:00
lixinyu1011
11f4f44bf9
Update coin_cell_assembly.py
2025-11-03 16:51:28 +08:00
lixinyu1011
f52fbd650e
Update bioyond_cell_workstation.py
2025-11-03 16:50:59 +08:00
calvincao
e561c818b8
feat: 添加多个新仓库配置到config.py
...
- 新增多个仓库配置，包括大分液瓶堆栈、小分液瓶堆栈、站内Tip头盒堆栈等
- 每个仓库配置包含UUID和站点UUID映射
2025-11-03 14:31:50 +08:00
Calvin Cao
5cbd880e5a
Merge pull request #140 from sun7151887/fix/yb3-material-names-and-model
...
fix: 修正YB warehouse排列方式和物料类型映射
2025-11-01 11:16:00 +08:00
Calvin Cao
41e7251f62
Merge branch 'workstation_dev_YB3' into fix/yb3-material-names-and-model
2025-11-01 11:14:45 +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
Calvin Cao
202a2667fd
Merge pull request #139 from lixinyu1011/workstation_dev_YB3
...
byxinyu111
2025-11-01 10:41:13 +08:00
lixinyu1011
03745c5d08
byxinyu111
2025-11-01 10:37:45 +08:00
Calvin Cao
385a495e21
Merge pull request #138 from lixinyu1011/workstation_dev_YB3
...
新建入库物料系统
2025-10-31 19:04:28 +08:00
lixinyu1011
91513a5f4c
Delete button_battery_station.py
2025-10-31 19:02:06 +08:00
lixinyu1011
a62896eda2
1031_byxinyu
2025-10-31 18:57:38 +08:00
lixinyu1011
a82d1b7bdb
Merge remote-tracking branch 'upstream/workstation_dev_YB3' into workstation_dev_YB3
2025-10-31 15:30:28 +08:00
lixinyu1011
6d7c39da9e
1031
2025-10-31 15:29:59 +08:00
