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

energy changed

Browse Source
This commit is contained in:
sun
2019-07-27 22:14:55 +08:00
parent 9fb5a9a9b2
commit a5259cbd1f
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
energy/src/energy/clear/energy_init.cpp
View File

@@ -38,6 +38,7 @@ void Energy::initEnergy() {
last_mode = -1;//既不是大符也不是小符
manual_delta_x = 0;
manual_delta_y = 0;
extra_delta_y = 0;
target_polar_angle = -1000;
last_target_polar_angle = -1000;
@@ -75,7 +76,7 @@ void Energy::initEnergy() {
// 此函数对能量机关参数进行初始化
// ---------------------------------------------------------------------------------------------------------------------
void Energy::initEnergyPartParam() {
gimbal_energy_part_param_.GRAY_THRESH = 100;//home
gimbal_energy_part_param_.GRAY_THRESH = 90;//home
// gimbal_energy_part_param_.GRAY_THRESH = 200;//official
// gimbal_energy_part_param_.GRAY_THRESH = 225;
gimbal_energy_part_param_.SPLIT_GRAY_THRESH = 230;

11
energy/src/energy/get/aim_point_get.cpp
View File

@@ -14,9 +14,14 @@ extern mcu_data mcuData;
//----------------------------------------------------------------------------------------------------------------------
// 此函数通过自瞄逻辑击打目标点，用于大符的自动对心和小符直接打击
// ---------------------------------------------------------------------------------------------------------------------
void Energy::getAimPoint(cv::Point target_point) {
double dx = -(target_point.x - 320 - COMPENSATE_YAW - mcuData.delta_x - manual_delta_x);
double dy = -(target_point.y - 240 - COMPENSATE_PITCH - mcuData.delta_y - manual_delta_y);
void Energy::getAimPoint(cv::Point target_point_) {
float target_polar_angle_ = static_cast<float>(180 / PI * atan2(-1 * (target_point_.y - circle_center_point.y),
(target_point_.x - circle_center_point.x)));
if (target_polar_angle_ > 50 && target_polar_angle_ < 130)extra_delta_y = -16;
else extra_delta_y = 0;
double dx = -(target_point_.x - 320 - COMPENSATE_YAW - mcuData.delta_x - manual_delta_x);
double dy = -(target_point_.y - 240 - COMPENSATE_PITCH - mcuData.delta_y - manual_delta_y - extra_delta_y);
yaw_rotation = atan(dx / FOCUS_PIXAL) * 180 / PI;
pitch_rotation = atan(dy / FOCUS_PIXAL) * 180 / PI;
// cout << "yaw: " << yaw_rotation << '\t' << "pitch: " << pitch_rotation << endl;