VSAG/vision_sjtu_19
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
322 Commits 3 Branches 0 Tags
e38ad3857204d5294fb9742ec4a6cb08306498be
Commit Graph
64 Commits
Author SHA1 Message Date
xinyang 6cdb6b4832 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	main.cpp
 2019-08-06 11:55:43 +08:00
xinyang 9392c201db 分离曝光，参数更新,取消反陀螺,数据增强。 2019-08-06 11:54:48 +08:00
sun 00fe7bbab9 energy changed 2019-08-05 23:51:41 +08:00
sun b27bb48ca5 energy changed 2019-08-05 17:29:31 +08:00
xinyang 7337f10123 部分统一命名规范。 2019-08-05 09:54:50 +08:00
xinyang 13e1c383bc Merge remote-tracking branch 'origin/master' 2019-08-05 09:37:50 +08:00
xinyang 4004803ea0 修改option处理方式。 2019-08-05 09:36:37 +08:00
sun 4b8228e9fd Merge branch 'master' of https://github.com/lloi7/RM_auto-aim 
# Conflicts:
#	energy/src/energy/send/send.cpp
 2019-08-04 23:38:49 +08:00
sun 6e69bb0bd2 energy changed 2019-08-04 23:36:51 +08:00
xinyang 8f33549e2c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	energy/src/energy/send/send.cpp
#	main.cpp
 2019-08-04 17:20:41 +08:00
sun 886109e3cd energy changed 2019-08-04 14:02:59 +08:00
sun 977de37b14 energy changed 2019-08-04 01:12:51 +08:00
xinyang ef32b54761 新版反陀螺。 2019-08-03 19:00:46 +08:00
sun b6f3f04b03 energy changed 2019-08-01 02:36:03 +08:00
xinyang cdd6716214 mac supported 2019-07-31 14:59:02 +08:00
xinyang 98bc5ef95b 统一跨平台时间函数接口。 2019-07-31 14:51:01 +08:00
xinyang 01882b97c6 Merge remote-tracking branch 'origin/master' 2019-07-31 14:20:16 +08:00
sun 0522009d2d energy changed 2019-07-29 22:48:01 +08:00
xinyang 2d399cc567 陀螺识别方式改变,参数更新。 2019-07-29 16:26:29 +08:00
xinyang 5a0fdb30af 计算速度优化，摄像头读取逻辑改变，分类器更新。 2019-07-28 15:59:01 +08:00
sun b8c6a1671c energy change 2019-07-25 09:21:08 +08:00
xinyang c794bd1b9d fix bug. 2019-07-24 22:56:59 +08:00
sun 0b7f6e6fd9 Merge remote-tracking branch 'origin/master' 2019-07-23 16:03:16 +08:00
sun e62c53d343 energy change 2019-07-23 16:02:50 +08:00
xinyang c94909f420 fix bug 2019-07-22 12:20:14 +08:00
sun 68a642e6a6 energy change 2019-07-22 11:40:09 +08:00
wanpiqiu123 bec5fb5683 fps count 2019-07-22 09:33:07 +08:00
wanpiqiu123 c8085fa161 Merge remote-tracking branch 'origin/anti-top' 
# Conflicts:
#	armor/src/armor_finder/send_target/send_target.cpp
#	energy/src/energy/clear/energy_init.cpp
#	energy/src/energy/find/energy_finder.cpp
#	energy/src/energy/judge/judge_contour.cpp
#	energy/src/energy/run.cpp
#	main.cpp
#	others/src/camera/camera_wrapper.cpp
 2019-07-22 09:27:16 +08:00
wanpiqiu123 e9df99447e camera gain strategy 2019-07-22 09:23:48 +08:00
sun 6f517f7853 energy change 2019-07-19 23:48:33 +08:00
xinyang 6a0020ce81 反陀螺v1.0完成。 2019-07-18 11:54:36 +08:00
xinyang 08abe70df6 fix bug. 2019-07-15 09:45:07 +08:00
xinyang 6bce312e58 增加独立config。 2019-07-13 14:02:37 +08:00
xinyang 292cd3eca0 增加独立config。 2019-07-13 13:57:52 +08:00
xinyang a8d24f412e 修订拼写错误，增加独立config。 2019-07-13 13:57:26 +08:00
sun 89e07615aa energy changed 2019-07-12 22:12:58 +08:00
sun 7ac1f82769 Merge branch 'master' of https://github.com/lloi7/RM_auto-aim 
# Conflicts:
#	main.cpp
 2019-07-12 16:00:21 +08:00
sun d494182740 energy changed 2019-07-12 15:58:11 +08:00
xinyang eefee82f18 fix bug. 2019-07-12 12:47:15 +08:00
sun a2f08e9674 energy changed 2019-07-11 21:49:44 +08:00
sun 9e8ebe7a32 Merge branch 'master' of https://github.com/lloi7/RM_auto-aim 2019-07-10 21:37:42 +08:00
sun 2e1538902a energy changed 2019-07-10 21:37:08 +08:00
xinyang 342944d492 自瞄和能量机关使用不同摄像头亮度。 2019-07-10 18:42:56 +08:00
xinyang cdef78ddde merge 2019-07-09 14:16:01 +08:00
xinyang 49cc1e242e 整理代码，添加部分注释 2019-07-08 21:53:12 +08:00
xinyang ab0ddede0c 整理代码结构。 2019-07-08 20:22:48 +08:00
wanpiqiu123 370114db37 verified something and made it possible to run on a OSX machine (videos input only) 2019-07-06 10:42:23 +08:00
sun 5fb6db440b energy changed 2019-07-05 23:13:18 +08:00
sun ba85a1e27f energy changed 2019-07-05 16:34:03 +08:00
xinyang cb6cf4b2fc 开机启动脚本现在会尝试从github上更新当前分支的最新代码并编译运行。 2019-07-02 20:55:20 +08:00