energy changed

energy/include/energy/energy.h

@@ -76,6 +76,7 @@ private:
     float last_base_angle;//上一帧的各扇叶在0区（0°~72°）的基础角度
     float predict_rad;//预测提前角
     float attack_distance;//步兵与风车平面距离
+    float center_delta_yaw, center_delta_pitch;//对心时相差的角度
     float yaw_rotation, pitch_rotation;//云台yaw轴和pitch轴应该转到的角度
     float origin_yaw, origin_pitch;//初始的云台角度设定值
 
@@ -148,7 +149,7 @@ private:
 
     bool guessTarget();//获得猜测击打点位
     bool changeTarget();//判断目标是否改变
-    void getOrigin();//获得云台对心所需角度
+    bool getOrigin();//获得云台对心所需角度
     void getTargetPolarAngle();//获得目标装甲板极坐标角度
     void getPredictPoint(cv::Point target_point);//获取预测点位
     void getAimPoint(cv::Point target_point);//通过自瞄逻辑计算点位

energy/src/energy/get/origin_get.cpp

@@ -11,14 +11,23 @@ using namespace cv;
 //----------------------------------------------------------------------------------------------------------------------
 // 此函数用于获得云台对心得到的初始yaw和pitch（即以该yaw和pitch发射子弹，可以击中风车中心）
 // ---------------------------------------------------------------------------------------------------------------------
-void Energy::getOrigin() {
+bool Energy::getOrigin() {
     if (!auto_mark && !manual_mark) {
-        double dx = circle_center_point.x - 320;
+        double dx = -(circle_center_point.x - 320);
-        double dy = circle_center_point.y - 240;
+        double dy = -(circle_center_point.y - 240);
-        origin_yaw = atan(dx / FOCUS_PIXAL) * 180 / PI;
+        center_delta_yaw = atan(dx / FOCUS_PIXAL) * 180 / PI;
-        origin_pitch = atan(dy / FOCUS_PIXAL) * 180 / PI;
+        center_delta_pitch = atan(dy / FOCUS_PIXAL) * 180 / PI;
-
+        if (abs(center_delta_pitch) > 0.3 || abs(center_delta_pitch) > 0.3) {
-        auto_mark = true;
+            sendTarget(serial, center_delta_yaw, center_delta_pitch, false);
-        LOGM(STR_CTR(WORD_BLUE_CODE, "auto mark success!"));
+            return false;
+        } else {
+            origin_yaw = mcuData.curr_yaw;
+            origin_pitch = mcuData.curr_pitch;
+            auto_mark = true;
+            sendTarget(serial, center_delta_yaw, center_delta_pitch, true);
+            LOGM(STR_CTR(WORD_BLUE_CODE, "auto mark success!"));
+            return true;
+        }
     }
+    return true;
 }

energy/src/energy/init/energy_init.cpp

@@ -51,6 +51,8 @@ void Energy::initEnergy() {
 
     clockwise_rotation_init_cnt = 0;
     anticlockwise_rotation_init_cnt = 0;
+
+    destroyAllWindows();
 }
 
 

energy/src/energy/run.cpp

@@ -29,10 +29,10 @@ void Energy::run(cv::Mat &gimble_src, cv::Mat &chassis_src) {
         if (show_energy)showFlowStripFan("strip", gimble_src);
         if (show_energy)showCenterR("R", gimble_src);
 
+        if (!getOrigin())return;
         startChassis();
-        getOrigin();
         initEnergy();
-        destroyAllWindows();
+
     } else if (isChassis) {
         energy_part_param_ = chassis_energy_part_param_;
         clearAll();
@@ -97,7 +97,7 @@ void Energy::run(cv::Mat &gimble_src) {
     getTargetPolarAngle();
     JudgeMode();
     if (energy_mode_init)return;
-    getOrigin();
+    if (!getOrigin())return;
     if (isBig & energy_rotation_init) {
         initRotation();
         return;