13 Commits

Include renames

Author	SHA1	Message	Date
sun	886109e3cd	energy changed	2019-08-04 14:02:59 +08:00
sun	977de37b14	energy changed	2019-08-04 01:12:51 +08:00
sun	b6f3f04b03	energy changed	2019-08-01 02:36:03 +08:00
sun	0522009d2d	energy changed	2019-07-29 22:48:01 +08:00
xinyang	c794bd1b9d	fix bug.	2019-07-24 22:56:59 +08:00
xinyang	c94909f420	fix bug	2019-07-22 12:20:14 +08:00
wanpiqiu123	bec5fb5683	fps count	2019-07-22 09:33:07 +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
sun	6f517f7853	energy change	2019-07-19 23:48:33 +08:00
xinyang	08abe70df6	fix bug.	2019-07-15 09:45:07 +08:00
xinyang	6bce312e58	增加独立config。	2019-07-13 14:02:37 +08:00
xinyang	292cd3eca0	增加独立config。	2019-07-13 13:57:52 +08:00