From f59c002fc0793b82f3678d40b9cf69da166d6c0f Mon Sep 17 00:00:00 2001 From: xinyang Date: Tue, 6 Aug 2019 12:33:40 +0800 Subject: [PATCH] Merge branch 'master' of /home/sjturm/Desktop/RM_auto-aim with conflicts. --- energy/src/energy/clear/energy_init.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/energy/src/energy/clear/energy_init.cpp b/energy/src/energy/clear/energy_init.cpp index c518df5..e2711e8 100644 --- a/energy/src/energy/clear/energy_init.cpp +++ b/energy/src/energy/clear/energy_init.cpp @@ -81,8 +81,8 @@ void Energy::initEnergy() { // --------------------------------------------------------------------------------------------------------------------- void Energy::initEnergyPartParam() { // gimbal_energy_part_param_.GRAY_THRESH = 120;//home -// gimbal_energy_part_param_.GRAY_THRESH = 200;//official - gimbal_energy_part_param_.GRAY_THRESH =180;//game +// gimbal_energy_part_param_.GRAY_THRESH = 220;//official + gimbal_energy_part_param_.GRAY_THRESH = 180;//game gimbal_energy_part_param_.SPLIT_GRAY_THRESH = 180; gimbal_energy_part_param_.FAN_GRAY_THRESH = 75; gimbal_energy_part_param_.ARMOR_GRAY_THRESH = 80;