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
Calvin Cao
06e6ab0b7f
Merge pull request #155 from sun7151887/fix/yb3-material-names-and-model
...
Fix warehouse mapping: use actual parent warehouse name instead of ha…
2025-11-09 15:15:55 +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
Calvin Cao
85c6f4e688
Merge pull request #154 from lixinyu1011/workstation_dev_YB3
...
修改pymodbus和websocket的报送信息
2025-11-08 15:59:22 +08:00
lixinyu1011
442b759397
修改pymodbus和websocket的报送信息
2025-11-08 15:56:39 +08:00
Calvin Cao
47ecb154c8
Merge pull request #153 from sun7151887/fix/yb3-material-names-and-model
...
规范堆栈和瓶子的名称
2025-11-08 15:49:59 +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
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
Xuwznln
9bba4620b7
fix resource_get param
2025-11-08 14:39:36 +08:00
Xuwznln
d7494ca458
fix json dumps
2025-11-08 13:39:15 +08:00
Xuwznln
85dc46cd38
support name change during materials change
2025-11-08 13:39:13 +08:00
Xuwznln
5a0c2f9850
enable slave mode
2025-11-08 13:39:11 +08:00
Xuwznln
d897d70c3e
change uuid logger to trace level
2025-11-08 13:39:09 +08:00
Xuwznln
d9dffc6bf8
correct remove_resource stats
2025-11-08 13:39:07 +08:00
Xuwznln
30b202bea0
disable slave connect websocket
2025-11-08 13:39:05 +08:00
Xuwznln
1b2c0dbcd7
adjust with_children param
2025-11-08 13:39:04 +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
Xuwznln
a2a8ee9088
fix run async execution error
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
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
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
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
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
