Commit Graph
397 Commits
Author SHA1 Message Date
sun 6c5ee59843 energy change 2019-07-25 09:24:19 +08:00
sun b8c6a1671c energy change 2019-07-25 09:21:08 +08:00
xinyang c934aa111c fix bug. 2019-07-24 23:43:20 +08:00
xinyang c794bd1b9d fix bug. 2019-07-24 22:56:59 +08:00
sun 1875ccd560 Merge remote-tracking branch 'origin/master' 2019-07-24 22:49:46 +08:00
sun 23f12425d6 energy change 2019-07-24 22:49:14 +08:00
xinyang 662f8b5a22 更新分类器参数。 2019-07-24 16:56:57 +08:00
xinyang 7bb90af06a Merge remote-tracking branch 'origin/master' 2019-07-24 16:31:09 +08:00
xinyang a9a0d1e3ae fix bug. 2019-07-24 16:30:42 +08:00
xinyang 085b3e0b3d fix bug. 2019-07-24 11:32:45 +08:00
sun 11f7c8b469 energy change 2019-07-24 11:15:21 +08:00
xinyang d2a7ae53af fix bug. 2019-07-24 08:59:18 +08:00
sun b3fc773222 Merge remote-tracking branch 'origin/master' 2019-07-23 22:26:52 +08:00
sun 4a012f0fc4 energy change 2019-07-23 22:26:21 +08:00
xinyang 07b74d6d27 use cpu performance in startup-run. 2019-07-23 17:02:13 +08:00
xinyang 9122226ab3 Merge remote-tracking branch 'origin/master' 2019-07-23 16:10:35 +08:00
xinyang efb700325f fix bug. 2019-07-23 16:10:20 +08:00
sun d04a45cdef Merge remote-tracking branch 'origin/master' 2019-07-23 16:04:45 +08:00
sun 0b7f6e6fd9 Merge remote-tracking branch 'origin/master' 2019-07-23 16:03:16 +08:00
xinyang a6925112f5 fix bug. 2019-07-23 16:03:08 +08:00
sun e62c53d343 energy change 2019-07-23 16:02:50 +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