linbo 7fb7c4dcbe Merge branch 'dev' into linbo_dev ... # Conflicts: # cmvr-es/config/devices/motor/ethercat_motors.pb.txt # cmvr-es/devices/motor/drivers/ethercat_motor/src/vendor/eyou/eyou_motor.cpp # cmvr-es/devices/motor/drivers/ethercat_motor/src/vendor/eyou/eyou_motor_device_manager_real_test.cpp # cmvr-es/devices/motor/drivers/ethercat_motor/src/vendor/eyou/eyou_motor_real_test.cpp # dependency/x86/third_party/ethercat/v1.7.0/bin/ethercat # dependency/x86/third_party/ethercat/v1.7.0/lib/libethercat.a # dependency/x86/third_party/ethercat/v1.7.0/lib/libethercat.so.1.2.0		2026-08-03 13:39:58 +08:00
..
algorithms	merge: resolve xtkuang_dev into dev	2026-07-27 17:47:30 +08:00
common	Merge branch 'dev' into linbo_dev	2026-08-03 13:39:58 +08:00
config	Merge branch 'dev' into linbo_dev	2026-08-03 13:39:58 +08:00
devices	Merge branch 'dev' into linbo_dev	2026-08-03 13:39:58 +08:00
hardware	feat: add QUIC media transport and integrate Hikvision updates	2026-07-23 12:52:30 +08:00
manager	Add QSV hardware encoding support to FFmpeg and upgrade to v6.1	2026-07-31 10:11:09 +08:00
runtime	merge: resolve xtkuang_dev into dev	2026-07-27 17:47:30 +08:00
service	Add QSV hardware encoding support to FFmpeg and upgrade to v6.1	2026-07-31 10:11:09 +08:00
simulate	merge: resolve xtkuang_dev into dev	2026-07-27 17:47:30 +08:00
task	merge: resolve xtkuang_dev into dev	2026-07-27 17:47:30 +08:00
test	test:test all refactor code	2026-07-01 10:41:43 +08:00
CMakeLists.txt	merge: resolve xtkuang_dev into dev	2026-07-27 17:47:30 +08:00
main.cpp	Add QSV hardware encoding support to FFmpeg and upgrade to v6.1	2026-07-31 10:11:09 +08:00