VSAG/vision_sjtu_19
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/lloi7/RM_auto-aim

Browse Source 
# Conflicts:
#	energy/src/energy/send/send.cpp
This commit is contained in:
sun
2019-08-04 23:38:49 +08:00
parent 6e69bb0bd2 44812dbcfe
commit 4b8228e9fd
28 changed files with 17997 additions and 17980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
others/include/additions.h
View File

@@ -10,7 +10,7 @@
#include <serial.h>
#include <opencv2/core.hpp>
struct mcu_data {
struct McuData {
float curr_yaw;
float curr_pitch;
uint8_t state;
@@ -21,7 +21,7 @@ struct mcu_data {
int delta_y;
};
extern mcu_data mcuData;
extern McuData mcu_data;
void uartReceive(Serial *pSerial);
@@ -43,6 +43,8 @@ void extract(cv::Mat &gimbal_src);
float getTimeIntervalms(const systime &now, const systime &last);
double getPointLength(const cv::Point2f &p);
template<class type, int length>
class RoundQueue {
private: