sun
|
39f2cd6818
|
energy changed
|
2019-07-15 15:43:44 +08:00 |
|
xinyang
|
819127ab93
|
update startup
|
2019-07-15 09:56:05 +08:00 |
|
xinyang
|
b71748c616
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# main.cpp
# others/src/camera/camera_wrapper.cpp
|
2019-07-15 09:47:19 +08:00 |
|
xinyang
|
08abe70df6
|
fix bug.
|
2019-07-15 09:45:07 +08:00 |
|
sun
|
f8c3eb19fd
|
energy changed
|
2019-07-15 09:27:32 +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
|
95eb65e6f0
|
energy changed
|
2019-07-13 10:27:27 +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
|
6aafbfd546
|
energy changed
|
2019-07-12 21:33:38 +08:00 |
|
sun
|
6615bda7a9
|
energy changed
|
2019-07-12 21:26:01 +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
|
1e9924be93
|
更新分类器参数.
|
2019-07-12 13:28:00 +08:00 |
|
xinyang
|
eefee82f18
|
fix bug.
|
2019-07-12 12:47:15 +08:00 |
|
sun
|
1c295e14ac
|
energy changed
|
2019-07-12 12:01:06 +08:00 |
|
sun
|
d65093216a
|
energy changed
|
2019-07-11 23:22:23 +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
|
4582e997f1
|
整理代码。
|
2019-07-10 19:25:54 +08:00 |
|
xinyang
|
342944d492
|
自瞄和能量机关使用不同摄像头亮度。
|
2019-07-10 18:42:56 +08:00 |
|
sun
|
92295793d5
|
energy changed
|
2019-07-10 18:40:47 +08:00 |
|
sun
|
403d267ff3
|
energy changed
|
2019-07-10 15:23:43 +08:00 |
|
xinyang
|
747fb58eb8
|
添加单目估距。
|
2019-07-10 13:09:42 +08:00 |
|
sun
|
5c6d96425b
|
energy changed
|
2019-07-09 21:08:10 +08:00 |
|
sun
|
44c8c4e91b
|
xMerge branch 'master' of https://github.com/lloi7/RM_auto-aim
|
2019-07-09 21:04:30 +08:00 |
|
sun
|
0f6ede086d
|
energy changed
|
2019-07-09 21:04:01 +08:00 |
|
xinyang
|
b545b4d712
|
添加ｌｏｇｏ。
|
2019-07-09 19:02:00 +08:00 |
|
xinyang
|
60747629a0
|
添加ｌｏｇｏ图案。
|
2019-07-09 18:45:22 +08:00 |
|
xinyang
|
cd5528cfb7
|
fix bug.
|
2019-07-09 18:45:00 +08:00 |
|
xinyang
|
cdef78ddde
|
merge
|
2019-07-09 14:16:01 +08:00 |
|
sun
|
8866f43b56
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
# Conflicts:
# main.cpp
|
2019-07-09 13:59:02 +08:00 |
|
sun
|
6d06b4bf5c
|
energy changed
|
2019-07-09 13:55:40 +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
|
960769689b
|
fix bug
|
2019-07-08 22:34:56 +08:00 |
|
xinyang
|
49cc1e242e
|
整理代码，添加部分注释
|
2019-07-08 21:53:12 +08:00 |
|
xinyang
|
ab0ddede0c
|
整理代码结构。
|
2019-07-08 20:22:48 +08:00 |
|
sun
|
cc508cfec5
|
energy changed
|
2019-07-08 14:24:08 +08:00 |
|
sun
|
75ce387742
|
energy changed
|
2019-07-07 20:37:05 +08:00 |
|
sun
|
125c09b79e
|
energy changed
|
2019-07-06 21:53:14 +08:00 |
|
xinyang
|
0ffec961da
|
Merge energe.
|
2019-07-06 20:25:36 +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 |
|
sun
|
adc11e6d18
|
Merge remote-tracking branch 'origin/master'
|
2019-07-06 20:16:50 +08:00 |
|
sun
|
07af506821
|
energy changed
|
2019-07-06 20:15:09 +08:00 |
|