Commit Graph

97 Commits

Author SHA1 Message Date
xinyang
87846b4c08 Merge remote-tracking branch 'origin/master' 2019-08-08 01:48:44 +08:00
xinyang
8d8d172c95 fix bug 2019-08-08 01:47:52 +08:00
xinyang
dcde93a608 armor small change 2019-08-08 00:22:39 +08:00
xinyang
0257b87720 small changes. 2019-08-07 03:06:07 +08:00
xinyang
e6a0b85694 something whatever. 2019-08-07 03:01:37 +08:00
xinyang
41de64dbb6 fix bug. 2019-08-07 02:59:34 +08:00
xinyang
6b0edffa3b Merge remote-tracking branch 'origin/master' 2019-08-07 02:23:55 +08:00
xinyang
05b7991d57 some small change. 2019-08-07 02:18:10 +08:00
xinyang
0db1fba0d8 fix bug 2019-08-07 01:32:30 +08:00
xinyang
3bd4b30182 Merge branch 'master' of https://github.com/lloi7/RM_auto-aim 2019-08-06 16:00:53 +08:00
xinyang
0307a01f55 防止瞄飞天。 2019-08-06 15:49:36 +08:00
xinyang
9f94287441 Merge remote-tracking branch 'origin/master' 2019-08-06 14:14:13 +08:00
xinyang
9392c201db 分离曝光,参数更新,取消反陀螺,数据增强。 2019-08-06 11:54:48 +08:00
xinyang
e5ddc15d86 Merge remote-tracking branch 'origin/master' 2019-08-05 16:27:53 +08:00
xinyang
7337f10123 部分统一命名规范。 2019-08-05 09:54:50 +08:00
xinyang
63e326f883 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	armor/src/armor_finder/anti_top/anti_top.cpp
#	energy/src/energy/find/energy_finder.cpp
2019-08-05 01:16:30 +08:00
xinyang
d0ab4342fd 删除不必要代码。 2019-08-04 17:18:32 +08:00
xinyang
3b4927d275 Merge remote-tracking branch 'origin/anti-top-test' into anti-top-test
# Conflicts:
#	armor/src/armor_finder/anti_top/anti_top.cpp
2019-08-04 12:34:50 +08:00
xinyang
50e925dbb2 参数更新。 2019-08-04 12:32:13 +08:00
xinyang
cbadab7f83 Merge branch 'master' of /home/sjturm/Desktop/RM_auto-aim with conflicts. 2019-08-04 08:17:38 +08:00
xinyang
4e8adbb671 small change 2019-08-04 01:46:37 +08:00
xinyang
bbe05a7db8 small change 2019-08-04 01:45:55 +08:00
xinyang
0b24c6a5af fix bug. 2019-08-04 00:37:41 +08:00
xinyang
2b83305eb9 fix bug. 2019-08-03 23:16:32 +08:00
xinyang
81ab17afa5 fix bug. 2019-08-03 23:11:42 +08:00
xinyang
04496ae99b fix bug. 2019-08-03 22:53:27 +08:00
xinyang
b67ef4b475 fix bug. 2019-08-03 22:49:46 +08:00
xinyang
ef32b54761 新版反陀螺。 2019-08-03 19:00:46 +08:00
xinyang
98bc5ef95b 统一跨平台时间函数接口。 2019-07-31 14:51:01 +08:00
wanpiqiu123
af9a254dc1 fix bug 2019-07-29 17:37:47 +08:00
xinyang
2d399cc567 陀螺识别方式改变,参数更新。 2019-07-29 16:26:29 +08:00
wanpiqiu123
550d51049d optimize anti-top 2019-07-28 21:23:35 +08:00
xinyang
270daa8672 fix bug. 2019-07-28 16:57:21 +08:00
xinyang
5a0fdb30af 计算速度优化,摄像头读取逻辑改变,分类器更新。 2019-07-28 15:59:01 +08:00
wanpiqiu123
9fb5a9a9b2 Change the parameters for judgements 2019-07-26 10:58:22 +08:00
xinyang
453670308c 距离单位改为cm 2019-07-25 12:50:41 +08:00
xinyang
8a5cfd8869 Merge remote-tracking branch 'origin/master' 2019-07-25 12:48:26 +08:00
xinyang
2896fe5086 小幅修改。 2019-07-25 12:48:11 +08:00
sun
b8c6a1671c energy change 2019-07-25 09:21:08 +08:00
xinyang
d2a7ae53af fix bug. 2019-07-24 08:59:18 +08:00
xinyang
efb700325f fix bug. 2019-07-23 16:10:20 +08:00
xinyang
a6925112f5 fix bug. 2019-07-23 16:03:08 +08:00
xinyang
ece612c968 fix bug 2019-07-23 15:29:23 +08:00
xinyang
f3f11ae70a fix bug. 2019-07-23 14:07:52 +08:00
xinyang
a8bf844bff fix bug 2019-07-23 13:12:49 +08:00
xinyang
243d12d089 fix bug. 2019-07-23 12:54:06 +08:00
wanpiqiu123
4075352a70 update priority. 2019-07-22 11:53:40 +08:00
wanpiqiu123
0082c365fb fix bug 2019-07-22 09:35:22 +08:00
wanpiqiu123
bec5fb5683 fps count 2019-07-22 09:33:07 +08:00
xinyang
8684662536 反陀螺v1.2,以及识别优化。 2019-07-21 17:25:09 +08:00