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
|
5b90504988
|
Merge remote-tracking branch 'origin/master'
|
2019-07-23 15:17:00 +08:00 |
|
xinyang
|
179979ec74
|
更新分类器参数。
|
2019-07-23 15:16:42 +08:00 |
|
xinyang
|
f3f11ae70a
|
fix bug.
|
2019-07-23 14:07:52 +08:00 |
|
xinyang
|
84c9fd21b1
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# armor/src/armor_finder/anti_top/anti_top.cpp
# armor/src/armor_finder/find/find_light_blobs.cpp
# main.cpp
|
2019-07-23 14:06:47 +08:00 |
|
xinyang
|
465507edb0
|
Merge branch 'master' of /home/sjturm/Desktop/RM_auto-aim with conflicts.
|
2019-07-23 14:06:32 +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 |
|
xinyang
|
999d18ea14
|
add output.
|
2019-07-22 19:04:38 +08:00 |
|
xinyang
|
c94909f420
|
fix bug
|
2019-07-22 12:20:14 +08:00 |
|
xinyang
|
bb2ccdd86b
|
fix bug
|
2019-07-22 12:19:14 +08:00 |
|
wanpiqiu123
|
4075352a70
|
update priority.
|
2019-07-22 11:53:40 +08:00 |
|
sun
|
68a642e6a6
|
energy change
|
2019-07-22 11:40:09 +08:00 |
|
wanpiqiu123
|
39c3b3e3c2
|
fix bug
|
2019-07-22 09:43:33 +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 |
|
wanpiqiu123
|
e8a0a218a8
|
fix bug
|
2019-07-22 09:29:52 +08:00 |
|
wanpiqiu123
|
67f5c2197e
|
energy send changed.
|
2019-07-22 09:28:57 +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
|
8684662536
|
反陀螺v1.2,以及识别优化。
|
2019-07-21 17:25:09 +08:00 |
|
xinyang
|
7a5a9c4c3c
|
fix bug
|
2019-07-21 17:19:49 +08:00 |
|
xinyang
|
206026b5d9
|
反陀螺v1.1。
|
2019-07-20 11:10:25 +08:00 |
|
sun
|
ccb87882f3
|
energy change
|
2019-07-20 10:03:07 +08:00 |
|
sun
|
6453a977e1
|
energy change
|
2019-07-19 23:50:08 +08:00 |
|
sun
|
6f517f7853
|
energy change
|
2019-07-19 23:48:33 +08:00 |
|
sun
|
6e864cc52d
|
Merge remote-tracking branch 'origin/anti-top' into anti-top
|
2019-07-19 23:27:42 +08:00 |
|
sun
|
39b32bf339
|
energy change
|
2019-07-19 23:27:15 +08:00 |
|
xinyang
|
d0c49f43ad
|
反陀螺v1.0
|
2019-07-19 23:18:19 +08:00 |
|
xinyang
|
35080fb4ec
|
fix bug
|
2019-07-19 18:50:21 +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 |
|
xinyang
|
d7fd85ff15
|
fix bug
|
2019-07-19 12:24:59 +08:00 |
|
sun
|
cdc58c8e67
|
Merge remote-tracking branch 'origin/anti-top' into anti-top
# Conflicts:
# others/src/additions/additions.cpp
|
2019-07-19 11:18:56 +08:00 |
|
sun
|
0001b5ccff
|
energy change
|
2019-07-19 11:17:45 +08:00 |
|
xinyang
|
282d69c220
|
energy changed
|
2019-07-18 23:34:29 +08:00 |
|
sun
|
e1c7e04138
|
energy change
|
2019-07-18 20:53:56 +08:00 |
|
sun
|
aff8d1a0d8
|
energy change
|
2019-07-18 13:07:31 +08:00 |
|
xinyang
|
6a0020ce81
|
反陀螺v1.0完成。
|
2019-07-18 11:54:36 +08:00 |
|
wanpiqiu123
|
995c436172
|
Change the parameters for judgements
|
2019-07-18 11:44:00 +08:00 |
|
wanpiqiu123
|
fdbffaaba8
|
Change the parameters for judgements
|
2019-07-18 11:42:42 +08:00 |
|
wanpiqiu123
|
f60c3ecc62
|
Change the parameters for judgements
|
2019-07-18 10:45:04 +08:00 |
|
xinyang
|
d9bfdbb2eb
|
整理代码结构。
|
2019-07-18 09:25:49 +08:00 |
|
sun
|
48c794d7bd
|
Merge remote-tracking branch 'origin/anti-top' into anti-top
|
2019-07-17 23:58:24 +08:00 |
|
sun
|
c2a92fc755
|
energy change
|
2019-07-17 23:56:45 +08:00 |
|
xinyang
|
5e3eabed93
|
fix bug
|
2019-07-17 22:51:11 +08:00 |
|
xinyang
|
5fa7843575
|
fix bug
|
2019-07-17 22:32:21 +08:00 |
|
sun
|
3258c85888
|
energy change
|
2019-07-17 16:15:34 +08:00 |
|
xinyang
|
7201dacad3
|
修改了能量机关机打大符的参数
|
2019-07-17 11:11:00 +08:00 |
|