VSAG/amadeus_26_fb
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
318 Commits 2 Branches 0 Tags
0db1fba0d8673cc562caddd8ee1ebd71373005fa
Commit Graph
318 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
wanpiqiu123 9fb5a9a9b2 Change the parameters for judgements 2019-07-26 10:58:22 +08:00
wanpiqiu123 39508b950e Change the parameters for judgements 2019-07-25 22:33:41 +08:00
xinyang 504d1aca86 更新ＣＮＮ参数 2019-07-25 15:06:23 +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
xinyang 75939be514 更新相机驱动。 2019-07-25 12:36:09 +08:00
sun 651676c6e6 fix bug 2019-07-25 10:07:50 +08:00
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