Calvin Cao
6413828c59
Merge pull request #183 from sun7151887/yb_fix5
...
添加新威电池测试系统设备节点到配置文件
2025-12-02 17:06:07 +08:00
dijkstra402
5072f00836
添加新威电池测试系统设备节点到配置文件
...
- 在 new_cellconfig3c.json 中新增 NewareTester 设备
- 配置 IP:127.0.0.1, Port:502, Machine_ID:1
- 修复之前的 JSON 格式错误(重复对象和数组语法错误)
- 设备位置设置为 (1500, 0, 0)，避免与其他设备重叠
- 包含功能说明: 720通道监控、2盘电池物料管理、CSV批量提交
2025-12-02 17:01:02 +08:00
Calvin Cao
9dfbe3246e
Merge pull request #182 from sun7151887/yb_fix5
...
解决前端物料显示问题
2025-12-02 16:07:55 +08:00
dijkstra402
bef69db3b6
解决前端物料显示问题
2025-12-02 15:42:07 +08:00
Calvin Cao
a061bc2942
Merge pull request #181 from sun7151887/yb_fix5
...
修复遇到的参数错误和物料转换问题
2025-12-02 11:26:54 +08:00
dijkstra402
8c9e11c04f
chore: 更新 Excel 模板文件
...
- 更新 2025092701.xlsx 配方文件
- 更新 material_template.xlsx 物料模板
2025-12-02 11:08:48 +08:00
dijkstra402
e4e3ec805a
feat: 添加三阶段工作流函数和别名映射
...
- 在 BioyondCellWorkstation 添加 run_feeding_stage, run_liquid_preparation_stage, run_transfer_stage 三个阶段函数
- 在 host_node.py 添加 JSON_COMMAND_ALIASES 映射表，支持 run_feeding_stage -> auto_feeding4to3 别名
- 修复 create_orders 中 transfer_resource_to_another 参数名错误
- 简化 run_transfer_stage，注释掉物料转换逻辑，只保留核心转运功能
2025-12-02 11:05:36 +08:00
dijkstra402
d634316bce
feat: enhance BioyondCellWorkstation and CoinCellAssembly workflows
...
- Added support for transferring resources between workstations with detailed logging.
- Introduced new methods for material conversion and resource registration.
- Updated YAML configurations to reflect new parameters and structures for workflows.
- Enhanced error handling and logging for better debugging and operational clarity.
2025-11-27 10:46:40 +08:00
Calvin Cao
f5446c6480
Merge pull request #174 from sun7151887/yb_fix5
...
奔曜实现物料流
2025-11-25 18:39:56 +08:00
dijkstra402
a98d25c16d
feat: expose workflow material outputs
2025-11-25 18:27:34 +08:00
Calvin Cao
80b9589973
Merge pull request #173 from sun7151887/yb_fix5
...
fix: 修复 BioyondCellWorkstation 和 CoinCellAssembly 工作流程
2025-11-25 18:26:26 +08:00
dijkstra402
4d4bbcbae8
fix: 修复 BioyondCellWorkstation 和 CoinCellAssembly 工作流程
...
- 修复 run 方法的函数参数语法错误（冒号改为等号）
- 将 BioyondCellWorkstation 的 run 函数移入类内部
- 添加 run_bioyond_cell_workflow 方法支持可选的 1to2 步骤
- 更新相关 YAML 配置文件
2025-11-25 15:39:07 +08:00
Calvin Cao
fa9b2a08f2
Merge pull request #171 from Andy6M/feat/merge-neware-battery-systems
...
feat: Merge Neware monitoring and submission systems into unified driver
2025-11-24 15:24:02 +08:00
Xie Qiming
929d50f954
feat: Merge Neware monitoring and submission systems into unified driver
2025-11-21 20:13:51 +08:00
calvincao
e60bf29a7f
feat(workstation): 实现奔曜与扣电池装配工作流统一配置执行接口
...
- 新增 `run_bioyond_cell_workflow` 函数以支持通过配置驱动奔曜配液与转运流程
- 新增 `run_coin_cell_packaging_workflow` 函数以支持通过配置驱动扣电池装配流程
- 两个函数均接受字典配置参数，实现初始化、操作调用及日志记录等功能的灵活控制- 提供 keep_alive机制用于持续运行场景
- 更新主程序入口逻辑，使用新工作流函数替代原有手动调用方式
- 支持从配置中读取实验样本、调度器设置以及各项操作开关和日志选项- 添加对 Excel 订单创建路径的配置化支持- 引入路径对象处理文件输入，提升跨平台兼容性- 增强错误提示信息，确保必要字段如 create_orders 的 excel_path 存在
- 封装所有设备动作至标准化函数调用结构，便于维护和扩展
2025-11-19 09:51:24 +08:00
Calvin Cao
2e17dee121
Merge pull request #167 from lixinyu1011/workstation_dev_YB4
...
解决奔耀输入配方的，电解液体积为小数的问题
2025-11-16 17:36:50 +08:00
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
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
calvincao
39a799cabd
feat(device): 更新设备配置文件路径和图标
...
- 修改 bioyond_cell.yaml 中的 xlsx 文件路径为用户目录路径- 在 bioyond_cell.yaml 中新增 warehouse_name 字段并设置默认值- 为 bioyond_cell.yaml 添加 resource_tree_transfer 参数结构定义
- 更新 bioyond_cell.yaml 中的状态类型和设备 ID 配置
- 将 coin_cell_workstation.yaml 的图标从 coin_cell_assembly_picture.webp 更改为 koudian.webp
- 移除 bioyond_cell.yaml 中冗余的 display_name 配置项
2025-11-10 18:28:38 +08:00
Junhan Chang
0d64563fb6
fix serialize for magazine
2025-11-10 15:40:29 +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
Calvin Cao
6efdf6e5a6
Merge pull request #161 from sun7151887/yb4-fix
...
Fix import: change electrodesheet to electrode_sheet
2025-11-09 22:35:10 +08:00
dijkstra402
e32dc55db0
Fix import: change electrodesheet to electrode_sheet
2025-11-09 22:02:17 +08:00
Calvin Cao
acc45b716d
Merge pull request #160 from sun7151887/yb4-fix
...
Update coin cell assembly and YB_YH materials configuration
2025-11-09 21:44:42 +08:00
dijkstra402
017eaefb8d
Update coin cell assembly and YB_YH materials configuration
2025-11-09 21:43:32 +08:00
Calvin Cao
9e8c692702
Merge pull request #159 from dptech-corp/workstation_dev_YB3
...
Update coin cell assembly configuration: change CSV file reference an…
2025-11-09 20:57:19 +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
Calvin Cao
7a284069d2
Merge pull request #158 from dptech-corp/workstation_dev_YB3
...
Workstation dev yb3
2025-11-09 17:12:41 +08:00
Calvin Cao
4a2d862333
Merge pull request #157 from sun7151887/fix/yb3-material-names-and-model
...
Update YB resources: add YB_ prefix to models and update deck configu…
2025-11-09 17:11:24 +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
a0e92b8e9b
Merge pull request #156 from dptech-corp/workstation_dev_YB3
...
Workstation dev yb3
2025-11-09 15:48:35 +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
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
