xinyang 6cdb6b4832 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	main.cpp

2019-08-06 11:55:43 +08:00

..

include

Merge remote-tracking branch 'origin/master'

2019-08-06 11:55:43 +08:00

src

分离曝光，参数更新,取消反陀螺,数据增强。

2019-08-06 11:54:48 +08:00

armor.Config

Cross plantform versiongit status !

2019-05-14 22:22:33 +08:00

energy.Config

win32 ver

2019-05-15 16:32:30 +08:00

libmvsdk.dylib

大符：云台摄像头

2019-07-06 12:10:50 +08:00

libMVSDK.so

更新相机驱动。

2019-07-25 12:36:09 +08:00

MVCAMSDK_X64.lib

win64 MVCAMSDK_X64.lib

2019-05-21 21:17:54 +08:00