Merge branch 'master' of /home/sjturm/Desktop/RM_auto-aim with conflicts.
This commit is contained in:
@@ -81,8 +81,8 @@ void Energy::initEnergy() {
|
|||||||
// ---------------------------------------------------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------------------------------------------------
|
||||||
void Energy::initEnergyPartParam() {
|
void Energy::initEnergyPartParam() {
|
||||||
// gimbal_energy_part_param_.GRAY_THRESH = 120;//home
|
// gimbal_energy_part_param_.GRAY_THRESH = 120;//home
|
||||||
// gimbal_energy_part_param_.GRAY_THRESH = 200;//official
|
// gimbal_energy_part_param_.GRAY_THRESH = 220;//official
|
||||||
gimbal_energy_part_param_.GRAY_THRESH =180;//game
|
gimbal_energy_part_param_.GRAY_THRESH = 180;//game
|
||||||
gimbal_energy_part_param_.SPLIT_GRAY_THRESH = 180;
|
gimbal_energy_part_param_.SPLIT_GRAY_THRESH = 180;
|
||||||
gimbal_energy_part_param_.FAN_GRAY_THRESH = 75;
|
gimbal_energy_part_param_.FAN_GRAY_THRESH = 75;
|
||||||
gimbal_energy_part_param_.ARMOR_GRAY_THRESH = 80;
|
gimbal_energy_part_param_.ARMOR_GRAY_THRESH = 80;
|
||||||
|
|||||||
Reference in New Issue
Block a user