Commit Graph

322 Commits

Author SHA1 Message Date
xinyang
ab0ddede0c 整理代码结构。 2019-07-08 20:22:48 +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
sun
adc11e6d18 Merge remote-tracking branch 'origin/master' 2019-07-06 20:16:50 +08:00
sun
07af506821 energy changed 2019-07-06 20:15:09 +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
5093e84b2f 大符:云台摄像头 2019-07-06 12:10:50 +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
aedee4b723 energy changed 2019-07-06 10:28:42 +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
da45e62806 energy changed 2019-07-05 15:53:12 +08:00
sun
1a20133ca1 energy changed 2019-07-05 14:06:40 +08:00
sun
f9fcde55ac energy changed 2019-07-05 09:39:20 +08:00
sun
4b943d97b2 energy changed 2019-07-04 22:11:02 +08:00
xinyang
9f9050e04a 更新文件权限。 2019-07-02 21:00:43 +08:00
xinyang
eb6ffd963b 补齐自动pull代码。 2019-07-02 20:58:10 +08:00
xinyang
14d1544113 更新CNN训练代码。 2019-07-02 20:56:46 +08:00
xinyang
cb6cf4b2fc 开机启动脚本现在会尝试从github上更新当前分支的最新代码并编译运行。 2019-07-02 20:55:20 +08:00
xinyang
17fe564f98 更新摄像头焦距参数。 2019-07-01 21:05:18 +08:00
xinyang
c3966c7760 log.h现在可以通过设置LOG_OUT宏决定输出位置。 2019-07-01 11:16:45 +08:00
xinyang
64bd93ec56 更新了灯条识别方法,提升了准确率。 2019-06-27 13:13:25 +08:00
xinyang
9a1e5d8882 update libMVSDK.so 2019-06-26 17:55:49 +08:00
xinyang
c0c12b24f0 2019赛季RM中部分区赛,自瞄和能量机关,完整稳定版。 2019-05-31 19:29:22 +08:00
xinyang
76bc5988c0 fix bug 2019-05-23 02:18:37 +08:00
xinyang
cb5631e3da win64 MVCAMSDK_X64.lib 2019-05-21 21:17:54 +08:00
xinyang
c84c7420cd some updates 2019-05-18 19:00:34 +08:00
xinyang
f136b8f60a some updates 2019-05-18 18:49:40 +08:00
JiatongSun
ec5c4ac97c 1 2019-05-18 18:00:59 +08:00
JiatongSun
2369834564 energy update 2019-05-18 17:58:59 +08:00
lloi7
0e19130413 add windows dll 2019-05-18 00:19:04 +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
294a20f654 update bind-monitor.sh 2019-05-17 18:38:51 +08:00
xinyang
b43fc421ae update CMakeLists 2019-05-17 18:27:52 +08:00
xinyang
9dfa6cff77 update CMakeLists 2019-05-17 18:26:59 +08:00
xinyang
1bb0536545 fix bug 2019-05-15 16:56:39 +08:00
xinyang
30dbdaac1a Merge pull request #2 from lloi7/win32
Win32
2019-05-15 16:49:03 +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