VSAG/amadeus_26_fb
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
394 Commits 2 Branches 0 Tags
b24542e97c81cf8cba5d703cb1d91a8bf4ecb77f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
xinyang b24542e97c update README.md 2019-09-09 23:29:48 +08:00
xinyang de94ff2242 Create LICENSE 2019-09-04 13:22:14 +08:00
xinyang d5df7ce7da Update README.md 2019-08-29 15:21:03 +08:00
xinyang ef257b7df0 Add files via upload 2019-08-29 15:18:34 +08:00
xinyang 41a31f1c18 Update README.md 2019-08-25 12:42:16 +08:00
xinyang 843c682d0b Update README.md 2019-08-18 13:45:51 +08:00
xinyang e713455e49 Add files via upload 2019-08-18 13:33:29 +08:00
xinyang 0df43490d5 更新README.md 2019-08-18 12:04:44 +08:00
xinyang b7a254dcc3 更新README.md 2019-08-18 11:59:53 +08:00
xinyang 2c64f82c9e 更新注释 2019-08-18 11:59:29 +08:00
xinyang 1163cf4c02 模型更改 2019-08-15 16:39:03 +08:00
xinyang 7a05018cd1 更新README.md 2019-08-15 16:36:46 +08:00
xinyang 9c8a9dfe72 更新README.md 2019-08-15 16:27:13 +08:00
xinyang d650907319 添加注释 2019-08-15 15:57:27 +08:00
xinyang ae059cb572 更新README.md 2019-08-15 15:28:57 +08:00
xinyang 2720646356 整理代码 2019-08-15 14:43:19 +08:00
xinyang 42943ff1e6 整理代码 2019-08-14 12:55:29 +08:00
xinyang 1fc9678177 更新systime.h 2019-08-14 12:03:30 +08:00
xinyang f6ddbc47d0 更新log.h 2019-08-14 12:00:33 +08:00
xinyang d56c698dbf 更新README.md 2019-08-14 11:53:33 +08:00
xinyang 10706aec65 添加README.md 2019-08-14 11:49:03 +08:00
xinyang 20d95b3f81 整理代码 2019-08-14 11:48:41 +08:00
xinyang 5aec098ef9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	main.cpp
 2019-08-09 01:26:08 +08:00
xinyang 65a55353d6 反陀螺v2.0 2019-08-09 01:24:58 +08:00
xinyang faae07b5b3 参数更新 2019-08-08 10:48:32 +08:00
xinyang 1507e2ec6d startup with show armor box. 2019-08-08 01:50:52 +08:00
xinyang 87846b4c08 Merge remote-tracking branch 'origin/master' 2019-08-08 01:48:44 +08:00
xinyang 8d8d172c95 fix bug 2019-08-08 01:47:52 +08:00
xinyang dcde93a608 armor small change 2019-08-08 00:22:39 +08:00
xinyang 0347182439 fix bug 2019-08-07 05:33:59 +08:00
xinyang 29121ae4dc fix bug 2019-08-07 05:28:00 +08:00
xinyang 4fc5c55f84 fix bug 2019-08-07 05:18:25 +08:00
xinyang c8b13159a2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	energy/src/energy/clear/energy_init.cpp
 2019-08-07 04:14:44 +08:00
xinyang 0257b87720 small changes. 2019-08-07 03:06:07 +08:00
xinyang e6a0b85694 something whatever. 2019-08-07 03:01:37 +08:00
xinyang 41de64dbb6 fix bug. 2019-08-07 02:59:34 +08:00
xinyang 274f67a51a Merge branch 'master' of https://github.com/lloi7/RM_auto-aim 2019-08-07 02:47:54 +08:00
xinyang 93d578085b 参数更新。 2019-08-07 02:42:54 +08:00
xinyang 19c07c441d log.h更加高级的CNT_TIME 2019-08-07 02:36:01 +08:00
xinyang 6b0edffa3b Merge remote-tracking branch 'origin/master' 2019-08-07 02:23:55 +08:00
xinyang 05b7991d57 some small change. 2019-08-07 02:18:10 +08:00
xinyang 77841bfe39 fix bug. 2019-08-07 02:11:28 +08:00
xinyang 0db1fba0d8 fix bug 2019-08-07 01:32:30 +08:00
xinyang e9d1c4e4ba Merge branch 'master' of https://github.com/lloi7/RM_auto-aim 2019-08-06 16:11:08 +08:00
xinyang 3bd4b30182 Merge branch 'master' of https://github.com/lloi7/RM_auto-aim 2019-08-06 16:00:53 +08:00
xinyang 0307a01f55 防止瞄飞天。 2019-08-06 15:49:36 +08:00
xinyang 9f94287441 Merge remote-tracking branch 'origin/master' 2019-08-06 14:14:13 +08:00
xinyang f59c002fc0 Merge branch 'master' of /home/sjturm/Desktop/RM_auto-aim with conflicts. 2019-08-06 12:33:40 +08:00
xinyang 6cdb6b4832 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	main.cpp
 2019-08-06 11:55:43 +08:00
xinyang 9392c201db 分离曝光，参数更新,取消反陀螺,数据增强。 2019-08-06 11:54:48 +08:00
xinyang 741ffdc176 Merge remote-tracking branch 'origin/master' 2019-08-06 01:32:40 +08:00
xinyang 540ddfa0a4 Merge remote-tracking branch 'origin/master' 2019-08-05 19:38:46 +08:00
xinyang e5ddc15d86 Merge remote-tracking branch 'origin/master' 2019-08-05 16:27:53 +08:00
xinyang 7337f10123 部分统一命名规范。 2019-08-05 09:54:50 +08:00
xinyang 13e1c383bc Merge remote-tracking branch 'origin/master' 2019-08-05 09:37:50 +08:00
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
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
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
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
xinyang f35c97ddd1 fix bug. 2019-08-02 18:43:48 +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
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
xinyang 2d399cc567 陀螺识别方式改变,参数更新。 2019-07-29 16:26:29 +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
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
xinyang c934aa111c fix bug. 2019-07-24 23:43:20 +08:00
xinyang c794bd1b9d fix bug. 2019-07-24 22:56:59 +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
xinyang d2a7ae53af fix bug. 2019-07-24 08:59:18 +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