xinyang
|
4004803ea0
|
修改option处理方式。
|
2019-08-05 09:36:37 +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
|
125c8d36c9
|
fix bug.
|
2019-08-04 23:53:04 +08:00 |
|
sun
|
4b8228e9fd
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
# Conflicts:
# energy/src/energy/send/send.cpp
|
2019-08-04 23:38:49 +08:00 |
|
sun
|
6e69bb0bd2
|
energy changed
|
2019-08-04 23:36:51 +08:00 |
|
wanpiqiu123
|
44812dbcfe
|
modify startup
|
2019-08-04 21:48:43 +08:00 |
|
xinyang
|
1434cee8c0
|
fix bug.
|
2019-08-04 17:23:11 +08:00 |
|
xinyang
|
8f33549e2c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# energy/src/energy/send/send.cpp
# main.cpp
|
2019-08-04 17:20:41 +08:00 |
|
xinyang
|
d0ab4342fd
|
删除不必要代码。
|
2019-08-04 17:18:32 +08:00 |
|
sun
|
6996d3f0dd
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
# Conflicts:
# main.cpp
|
2019-08-04 14:04:39 +08:00 |
|
sun
|
886109e3cd
|
energy changed
|
2019-08-04 14:02:59 +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
|
a68a051ce7
|
fix bug.
|
2019-08-04 08:05:26 +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 |
|
sun
|
04c7eea9e0
|
energy changed
|
2019-08-04 01:44:30 +08:00 |
|
sun
|
851c716153
|
energy changed
|
2019-08-04 01:24:39 +08:00 |
|
sun
|
af85869f48
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
|
2019-08-04 01:13:39 +08:00 |
|
sun
|
977de37b14
|
energy changed
|
2019-08-04 01:12:51 +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 |
|
sun
|
199feb3ba9
|
energy changed
|
2019-08-03 16:27:21 +08:00 |
|
xinyang
|
f35c97ddd1
|
fix bug.
|
2019-08-02 18:43:48 +08:00 |
|
sun
|
b6f3f04b03
|
energy changed
|
2019-08-01 02:36:03 +08:00 |
|
xinyang
|
cdd6716214
|
mac supported
|
2019-07-31 14:59:02 +08:00 |
|
xinyang
|
5212e0da73
|
fix bug.
|
2019-07-31 14:54:40 +08:00 |
|
xinyang
|
98bc5ef95b
|
统一跨平台时间函数接口。
|
2019-07-31 14:51:01 +08:00 |
|
xinyang
|
01882b97c6
|
Merge remote-tracking branch 'origin/master'
|
2019-07-31 14:20:16 +08:00 |
|
xinyang
|
62763cec60
|
fix bug.
|
2019-07-30 19:23:48 +08:00 |
|
sun
|
77bedfd448
|
energy changed
|
2019-07-30 05:30:05 +08:00 |
|
sun
|
b253c47283
|
energy changed
|
2019-07-30 05:29:18 +08:00 |
|
sun
|
49240ec1bf
|
energy changed
|
2019-07-30 03:12:40 +08:00 |
|
sun
|
0522009d2d
|
energy changed
|
2019-07-29 22:48:01 +08:00 |
|
xinyang
|
6d8597fb0b
|
Merge remote-tracking branch 'origin/new' into new
|
2019-07-29 20:09:50 +08:00 |
|
xinyang
|
7c4e6d27f6
|
参数更新。
|
2019-07-29 20:09:32 +08:00 |
|
sun
|
00351599b1
|
energy changed
|
2019-07-29 19:17:53 +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 |
|
sun
|
ffd5d74856
|
energy changed
|
2019-07-28 19:02:24 +08:00 |
|
xinyang
|
270daa8672
|
fix bug.
|
2019-07-28 16:57:21 +08:00 |
|
xinyang
|
df437b32fd
|
计算速度优化，摄像头读取逻辑改变，分类器更新。
|
2019-07-28 16:02:29 +08:00 |
|
xinyang
|
5a0fdb30af
|
计算速度优化，摄像头读取逻辑改变，分类器更新。
|
2019-07-28 15:59:01 +08:00 |
|
sun
|
a5259cbd1f
|
energy changed
|
2019-07-27 22:14:55 +08:00 |
|