Commit Graph

66 Commits

Author SHA1 Message Date
sun
6d06b4bf5c energy changed 2019-07-09 13:55:40 +08:00
sun
cc508cfec5 energy changed 2019-07-08 14:24:08 +08:00
sun
75ce387742 energy changed 2019-07-07 20:37:05 +08:00
sun
125c09b79e energy changed 2019-07-06 21:53:14 +08:00
xinyang
0ffec961da Merge energe. 2019-07-06 20:25:36 +08:00
xinyang
1abe8dec17 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	main.cpp
2019-07-06 20:22:06 +08:00
xinyang
e9a0e9ad7b 大版本更新。 2019-07-06 20:20:48 +08:00
wanpiqiu123
cec8fe4dad 调阈值+查看确定中心所用帧数 2019-07-06 17:04:39 +08:00
sun
1929c39d70 energy changed 2019-07-06 14:01:17 +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
sun
1a20133ca1 energy changed 2019-07-05 14:06:40 +08:00
sun
4b943d97b2 energy changed 2019-07-04 22:11:02 +08:00
xinyang
cb6cf4b2fc 开机启动脚本现在会尝试从github上更新当前分支的最新代码并编译运行。 2019-07-02 20:55:20 +08:00
xinyang
64bd93ec56 更新了灯条识别方法,提升了准确率。 2019-06-27 13:13:25 +08:00
xinyang
c0c12b24f0 2019赛季RM中部分区赛,自瞄和能量机关,完整稳定版。 2019-05-31 19:29:22 +08:00
xinyang
c84c7420cd some updates 2019-05-18 19:00:34 +08:00
JiatongSun
2369834564 energy update 2019-05-18 17:58:59 +08:00
xinyang
424cc724d8 some refactor 2019-05-17 22:52:35 +08:00
JiatongSun
77a58511c9 Auto Aim 2019-05-17 21:05:19 +08:00
xinyang
1bb0536545 fix bug 2019-05-15 16:56:39 +08:00
xinyang
c2d2fd9c8a Merge branch 'master' into win32 2019-05-15 16:47:45 +08:00
xinyang
0d6aae81b8 win32 ver 2019-05-15 16:32:30 +08:00
xinyang
f9eab62680 Cross plantform versiongit status ! 2019-05-14 22:22:33 +08:00
xinyang
6980145e83 win32 ver 2019-05-14 20:03:03 +08:00
JiatongSun
601bf2a510 Merge branch 'master' of https://github.com/lloi7/RM_auto-aim 2019-05-14 19:19:58 +08:00
JiatongSun
b1c4c4f862 Auto Aim 2019-05-14 19:19:07 +08:00
xinyang
d337c0b826 Merge remote-tracking branch 'origin/master' 2019-05-10 20:47:23 +08:00
xinyang
bfde0d80ad fix bug 2019-05-10 20:46:33 +08:00
xinyang
156e4e0861 fix bug 2019-05-10 19:38:26 +08:00
xinyang
15871a9289 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	tools/bind-monitor.sh
2019-05-09 20:18:28 +08:00
xinyang
52dd50ab60 something 2019-05-09 20:18:08 +08:00
xinyang
85e1df61da 更新通信协议。 2019-05-09 20:14:25 +08:00
xinyang
13ffc6efe6 fix bug. 2019-05-08 20:43:29 +08:00
xinyang
9b3178753f 更新监视脚本绑定方式。 2019-05-07 23:25:34 +08:00
JiatongSun
508004c548 Auto Aim 2019-05-07 09:33:28 +08:00
xinyang
6d115ca43c Merge branch 'master' into new 2019-05-04 14:06:04 +08:00
xinyang
37f6da5dd6 调整main函数不同模式的执行逻辑,以略微提升运行效率 2019-05-03 20:23:40 +08:00
xinyang
218a4b56c6 同步master上的bug fix。 2019-05-03 11:13:17 +08:00
xinyang
86e04d444c 修复数据接收的BUG。 2019-05-02 21:25:55 +08:00
xinyang
64d2554069 使用旧版候选区寻找方式。 2019-05-02 20:49:58 +08:00
xinyang
2f20367677 使用旧版候选区寻找方式。 2019-05-02 20:19:17 +08:00
xinyang
ee83a373d3 更新CNN参数,使用CNN判断tracking是否跟丢。 2019-04-30 20:20:35 +08:00
xinyang
25927f0b34 更新了一大堆东西,我也说不清有什么。 2019-04-29 14:42:47 +08:00
JiatongSun
2dad2d864a Auto Aim 2019-04-28 13:08:32 +08:00
JiatongSun
c2b4bdf4cd Auto Aim 2019-04-28 11:00:20 +08:00
JiatongSun
e3fc7cf05c Auto Aim 2019-04-27 17:14:50 +08:00
xinyang
4e47b38d7d 修改了摄像头读取方式 2019-04-27 16:16:53 +08:00
JiatongSun
9cfd26cc23 Auto Aim 2019-04-27 15:24:59 +08:00