Commit Graph

45 Commits

Author SHA1 Message Date
sun
0522009d2d energy changed 2019-07-29 22:48: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
xinyang
c3966c7760 log.h现在可以通过设置LOG_OUT宏决定输出位置。 2019-07-01 11:16:45 +08:00
xinyang
c0c12b24f0 2019赛季RM中部分区赛,自瞄和能量机关,完整稳定版。 2019-05-31 19:29:22 +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
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
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
xinyang
52dd50ab60 something 2019-05-09 20:18:08 +08:00
xinyang
13ffc6efe6 fix bug. 2019-05-08 20:43:29 +08:00
xinyang
ee83a373d3 更新CNN参数,使用CNN判断tracking是否跟丢。 2019-04-30 20:20:35 +08:00
JiatongSun
c2b4bdf4cd Auto Aim 2019-04-28 11:00:20 +08:00
xinyang
4e47b38d7d 修改了摄像头读取方式 2019-04-27 16:16:53 +08:00
xinyang
ecbee8b24c 重新整理文件夹结构,并添加CNN训练代码。 2019-04-25 12:39:38 +08:00