Commit Graph

101 Commits

Author SHA1 Message Date
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
xinyang
bfde0d80ad fix bug 2019-05-10 20:46:33 +08:00
xinyang
bc1707961c 修复串口有时打不开的bug。 2019-05-10 19:39:24 +08:00
xinyang
156e4e0861 fix bug 2019-05-10 19:38:26 +08:00
xinyang
6225abf161 fix bug 2019-05-09 21:50:52 +08:00
xinyang
1db78ef53b 定时退出追踪模式。 2019-05-09 21:46:39 +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
xinyang
bd52fc33fc Merge remote-tracking branch 'origin/master' 2019-05-07 23:11:58 +08:00
xinyang
3cee0ea926 CNN参数更新。 2019-05-07 22:42:50 +08:00
JiatongSun
6fef2b5193 Merge branch 'master' of https://github.com/lloi7/RM_auto-aim 2019-05-07 17:26:06 +08:00
JiatongSun
508004c548 Auto Aim 2019-05-07 09:33:28 +08:00
xinyang
937fced215 添加绑定monitor与运行参数到可执行文件的cmake target。 2019-05-06 23:14:53 +08:00
xinyang
5f36004fe6 添加绑定monitor与运行参数到可执行文件的cmake target。 2019-05-06 23:14:09 +08:00
JiatongSun
7fcd8e6c84 Merge remote-tracking branch 'origin/master' 2019-05-06 21:13:13 +08:00
xinyang
7749bb1368 Data analysis tool 2019-05-05 19:07:21 +08:00
xinyang
c09f0d3a2d 更新CNN参数 2019-05-05 18:37:30 +08:00
xinyang
479e43d2af Merge remote-tracking branch 'origin/master'
# Conflicts:
#	main.cpp
#	tools/TrainCNN/forward.py
2019-05-04 14:11:07 +08:00
xinyang
0bdfbc84ce Merge branch 'new'
# Conflicts:
#	main.cpp
#	tools/TrainCNN/forward.py
2019-05-04 14:10:45 +08:00