From 39508b950eabf151c0f227b64ed7a275bbadd0d2 Mon Sep 17 00:00:00 2001 From: wanpiqiu123 <779893878@qq.com> Date: Thu, 25 Jul 2019 22:33:41 +0800 Subject: [PATCH] Change the parameters for judgements --- energy/src/energy/clear/energy_init.cpp | 2 +- main.cpp | 2 +- others/src/options/options.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/energy/src/energy/clear/energy_init.cpp b/energy/src/energy/clear/energy_init.cpp index 832c2ce..d86cc50 100644 --- a/energy/src/energy/clear/energy_init.cpp +++ b/energy/src/energy/clear/energy_init.cpp @@ -75,7 +75,7 @@ void Energy::initEnergy() { // 此函数对能量机关参数进行初始化 // --------------------------------------------------------------------------------------------------------------------- void Energy::initEnergyPartParam() { - gimbal_energy_part_param_.GRAY_THRESH = 140;//home + gimbal_energy_part_param_.GRAY_THRESH = 100;//home // gimbal_energy_part_param_.GRAY_THRESH = 200;//official // gimbal_energy_part_param_.GRAY_THRESH = 225; gimbal_energy_part_param_.SPLIT_GRAY_THRESH = 230; diff --git a/main.cpp b/main.cpp index a10e8ec..79aba0b 100644 --- a/main.cpp +++ b/main.cpp @@ -30,7 +30,7 @@ using namespace std; mcu_data mcuData = { // 单片机端回传结构体 0, // 当前云台yaw角 0, // 当前云台pitch角 - ARMOR_STATE, // 当前状态,自瞄-大符-小符 + BIG_ENERGY_STATE, // 当前状态,自瞄-大符-小符 0, // 云台角度标记位 1, // 是否启用数字识别 ENEMY_RED, // 敌方颜色 diff --git a/others/src/options/options.cpp b/others/src/options/options.cpp index 6dcaf4c..ab2542c 100644 --- a/others/src/options/options.cpp +++ b/others/src/options/options.cpp @@ -55,8 +55,6 @@ void process_options(int argc, char *argv[]) { LOGM("Enable show processed image"); show_energy = true; LOGM("Enable show energy part"); - show_info = true; - LOGM("Show information!"); } else if (strcmp(argv[i], "--run-with-camera") == 0) { run_with_camera = true; LOGM("Run with camera!");