Commit Graph

302 Commits

Author SHA1 Message Date
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
sun
6e87cfe4db energy change 2019-07-17 10:17:51 +08:00
sun
0814522e46 Merge remote-tracking branch 'origin/master' into anti-top 2019-07-16 18:46:07 +08:00
wanpiqiu23
a791046752 change the parameters 2019-07-16 17:33:08 +08:00
sun
2614e48832 fix bug 2019-07-16 16:41:25 +08:00
sun
96e1802c9e fix bug 2019-07-16 16:38:32 +08:00
sun
170a6b9429 fix bug 2019-07-16 16:37:38 +08:00
xinyang
73230d91f1 反小陀螺前置代码已完成。 2019-07-16 16:31:58 +08:00
xinyang
298c4c9114 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	others/src/additions/additions.cpp
2019-07-16 12:16:12 +08:00
xinyang
89344d1cd5 更新串口接收方式。 2019-07-16 12:15:14 +08:00
sun
96c5936fd9 Merge remote-tracking branch 'origin/master' 2019-07-16 02:27:29 +08:00
sun
02ea0c5c7b energy changed 2019-07-16 02:26:56 +08:00
xinyang
829fb85b0c 参数更新。 2019-07-15 19:17:46 +08:00
sun
1a096979f7 energy changed 2019-07-15 16:07:33 +08:00
sun
0d75846c60 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	main.cpp
2019-07-15 15:45:08 +08:00
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