Commit Graph
60 Commits
Author SHA1 Message Date
wanpiqiu123 39c3b3e3c2 fix bug 2019-07-22 09:43:33 +08:00
wanpiqiu123 e8a0a218a8 fix bug 2019-07-22 09:29:52 +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
xinyang 3de13a62ab Merge remote-tracking branch 'origin/anti-top' into anti-top 2019-07-19 13:05:33 +08:00
xinyang ad036071b0 更新反陀螺和分类器参数。 2019-07-19 13:05:19 +08:00
sun 0001b5ccff energy change 2019-07-19 11:17:45 +08:00
sun e1c7e04138 energy change 2019-07-18 20:53:56 +08:00
xinyang 6a0020ce81 反陀螺v1.0完成。 2019-07-18 11:54:36 +08:00
sun c2a92fc755 energy change 2019-07-17 23:56:45 +08:00
sun 6e87cfe4db energy change 2019-07-17 10:17:51 +08:00
sun 2614e48832 fix bug 2019-07-16 16:41:25 +08:00
sun 96e1802c9e fix bug 2019-07-16 16:38:32 +08:00
sun 170a6b9429 fix bug 2019-07-16 16:37:38 +08:00
xinyang 89344d1cd5 更新串口接收方式。 2019-07-16 12:15:14 +08:00
sun 02ea0c5c7b energy changed 2019-07-16 02:26:56 +08:00
xinyang 08abe70df6 fix bug. 2019-07-15 09:45:07 +08:00
xinyang a8d24f412e 修订拼写错误,增加独立config。 2019-07-13 13:57:26 +08:00
sun 6cafefd7bd energy changed 2019-07-12 23:07:02 +08:00
sun f40bfbf5d2 energy changed 2019-07-12 22:52:18 +08:00
sun 89e07615aa energy changed 2019-07-12 22:12:58 +08:00
sun d494182740 energy changed 2019-07-12 15:58:11 +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 3777a268b9 整理代码。 2019-07-09 09:22:53 +08:00
xinyang 13344f3e71 fix bug 2019-07-09 00:03:06 +08:00
xinyang 49cc1e242e 整理代码,添加部分注释 2019-07-08 21:53:12 +08:00
xinyang ab0ddede0c 整理代码结构。 2019-07-08 20:22:48 +08:00
sun 75ce387742 energy changed 2019-07-07 20:37:05 +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 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 64bd93ec56 更新了灯条识别方法,提升了准确率。 2019-06-27 13:13:25 +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
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 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
xinyang bc1707961c 修复串口有时打不开的bug。 2019-05-10 19:39:24 +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