lixinyu1011
c03abb341a
解决奔耀输入配方的，电解液体积为小数的问题
2025-11-16 16:24:59 +08:00
calvincao
b97be6a5d4
feat(battery): 更新电池工作站配置与物料布局
...
- 修改弹夹尺寸默认值，确保非空时使用实际值
- 调整new_cellconfig3c.json中设备位置和尺寸配置
- 更新CoinCellDeck的尺寸和原点坐标
-重新分配所有物料和弹夹的位置坐标
- 调整电解液缓存位和回收位坐标
- 更新物料板和tip box的布局位置
2025-11-10 21:40:02 +08:00
Calvin Cao
fbb9e0963d
Merge pull request #162 from sun7151887/yb4-fix
...
Fix import: change electrodesheet to electrode_sheet
2025-11-10 13:38:16 +08:00
dijkstra402
af411ddfe6
Fix import: change electrodesheet to electrode_sheet
...
修改路径
2025-11-10 13:34:49 +08:00
calvincao
f5dbcb1bfc
feat(bioyond_cell): 更新默认模板路径并添加温度字段- 更新了自动送料函数中的默认 Excel 模板路径- 在物料信息中新增 temperature 字段，默认值为0
...
- 更新了 create_orders 函数中的默认实验文件路径
- 注释掉了部分调试代码，保留关键示例和说明
- 添加了关于位置码、实验文件和物料模板的注释提示
2025-11-10 13:27:54 +08:00
calvincao
1ecf89ea27
修改excel
2025-11-10 13:21:56 +08:00
dijkstra402
e32dc55db0
Fix import: change electrodesheet to electrode_sheet
2025-11-09 22:02:17 +08:00
dijkstra402
017eaefb8d
Update coin cell assembly and YB_YH materials configuration
2025-11-09 21:43:32 +08:00
calvincao
beb90f20d2
Update coin cell assembly configuration: change CSV file reference and modify resource names; enhance workstation initialization and packing functions.
2025-11-09 20:56:12 +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
dijkstra402
5399c6c1cf
Fix warehouse mapping: use actual parent warehouse name instead of hardcoded '手动堆栈'
2025-11-09 15:13:20 +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
Xuwznln
d897d70c3e
change uuid logger to trace level
2025-11-08 13:39:09 +08:00
Xuwznln
0f341e9b4d
modify devices to use correct executor (sleep, create_task)
2025-11-08 13:39:01 +08:00
Xuwznln
4c3972820b
support sleep and create_task in node
2025-11-08 13:39: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
baa107c230
change uuid logger to trace level
2025-11-08 12:13:52 +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
Junhan Chang
966b51042d
rename and fix all Yihua Materials: ClipMagazineHole→Magazine(ResourceStack), and use factory functions
2025-11-06 00:59:46 +08:00
lixinyu1011
3c583008aa
YB4branc_bylixinyu
2025-11-04 20:19:27 +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
Calvin Cao
54f749bcdb
Merge branch 'workstation_dev_YB4' into feature/update-yb-deck-coordinates
2025-11-04 02:05:18 +08:00
dijkstra402
16ad4bbecc
更新奔耀和依华工站的Deck坐标配置
...
- 更新奔耀YB工站deck坐标（基于图片像素精确计算）
* 将粉末加样头堆栈拆分为左右两部分
* 将试剂替换仓库拆分为左右两部分
* 更新所有堆栈的坐标位置
- 更新依华扣电工站deck坐标（使用精确的像素-毫米转换）
* 修正所有子弹夹的坐标位置（铝箔、正极片、正极壳等）
* 更新料盘坐标（负极料盘、隔膜料盘）
* 更新瓶架坐标（奔耀上料瓶架、电解液缓存位、回收位）
* 更新枪头盒和废枪头盒坐标
* 确保所有坐标在deck范围内（3650×1550mm）
- 转换比例说明：
* 奔耀工站：deck左上角(206,446)，使用1.56mm/像素
* 依华工站：deck左上角(494,444)到右下角(2430,1608)
X方向：1.885mm/像素，Y方向：1.332mm/像素
2025-11-04 02:01: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
lixinyu1011
bfd415279b
Update YB_YH_materials.py
2025-11-04 00:39:39 +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
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
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
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
lixinyu1011
03745c5d08
byxinyu111
2025-11-01 10:37:45 +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
Calvin Cao
d8e9ad4413
Merge pull request #136 from sun7151887/fix/yb3-material-names-and-model
...
fix: 更新物料类型配置映射
2025-10-31 15:13:48 +08:00
dijkstra402
eb93b83415
fix: 更新物料类型配置映射
2025-10-31 15:05:47 +08:00
lixinyu1011
6df93a5db7
Merge remote-tracking branch 'upstream/workstation_dev_YB3' into workstation_dev_YB3
2025-10-31 14:02:45 +08:00
