Browse Source

AP_Beacon: remove debug and editor settings

thanks to muramura for spotting this
master
Randy Mackay 8 years ago
parent
commit
08619a96be
  1. 1
      libraries/AP_Beacon/AP_Beacon.cpp
  2. 1
      libraries/AP_Beacon/AP_Beacon.h
  3. 8
      libraries/AP_Beacon/AP_Beacon_Backend.cpp
  4. 1
      libraries/AP_Beacon/AP_Beacon_Backend.h
  5. 2
      libraries/AP_Beacon/AP_Beacon_Pozyx.cpp
  6. 1
      libraries/AP_Beacon/AP_Beacon_Pozyx.h
  7. 1
      libraries/AP_Beacon/AP_Beacon_SITL.cpp
  8. 1
      libraries/AP_Beacon/AP_Beacon_SITL.h

1
libraries/AP_Beacon/AP_Beacon.cpp

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

1
libraries/AP_Beacon/AP_Beacon.h

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

8
libraries/AP_Beacon/AP_Beacon_Backend.cpp

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -33,9 +32,6 @@ void AP_Beacon_Backend::set_vehicle_position(const Vector3f& pos, float accuracy @@ -33,9 +32,6 @@ void AP_Beacon_Backend::set_vehicle_position(const Vector3f& pos, float accuracy
_frontend.veh_pos_update_ms = AP_HAL::millis();
_frontend.veh_pos_accuracy = accuracy_estimate;
_frontend.veh_pos_ned = correct_for_orient_yaw(pos);
// debug
//::printf("vehicle x:%4.2f y:%4.2f z:%4.2f error:%4.2f\n", (double)pos.x, (double)pos.y, (double)pos.z, (double)accuracy_estimate);
}
// set individual beacon distance in meters
@ -54,8 +50,6 @@ void AP_Beacon_Backend::set_beacon_distance(uint8_t beacon_instance, float dista @@ -54,8 +50,6 @@ void AP_Beacon_Backend::set_beacon_distance(uint8_t beacon_instance, float dista
_frontend.beacon_state[beacon_instance].distance_update_ms = AP_HAL::millis();
_frontend.beacon_state[beacon_instance].distance = distance;
_frontend.beacon_state[beacon_instance].healthy = true;
//::printf("beacon %d dist:%4.2f\n", (int)beacon_instance, (double)distance);
}
// configure beacon's position in meters from origin
@ -72,8 +66,6 @@ void AP_Beacon_Backend::set_beacon_position(uint8_t beacon_instance, const Vecto @@ -72,8 +66,6 @@ void AP_Beacon_Backend::set_beacon_position(uint8_t beacon_instance, const Vecto
_frontend.num_beacons = beacon_instance+1;
}
//::printf("beacon %d x:%4.2f y:%4.2f z:%4.2f\n", (int)beacon_instance, (double)pos.x, (double)pos.y, (double)pos.z);
// set position after correcting yaw
_frontend.beacon_state[beacon_instance].position = correct_for_orient_yaw(pos);
}

1
libraries/AP_Beacon/AP_Beacon_Backend.h

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

2
libraries/AP_Beacon/AP_Beacon_Pozyx.cpp

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -46,7 +45,6 @@ void AP_Beacon_Pozyx::update(void) @@ -46,7 +45,6 @@ void AP_Beacon_Pozyx::update(void)
counter++;
if (counter > 200) {
counter = 0;
//::printf("b\n");
}
if (uart == nullptr) {

1
libraries/AP_Beacon/AP_Beacon_Pozyx.h

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
#pragma once
#include "AP_Beacon_Backend.h"

1
libraries/AP_Beacon/AP_Beacon_SITL.cpp

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

1
libraries/AP_Beacon/AP_Beacon_SITL.h

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
#pragma once
#include "AP_Beacon_Backend.h"

Loading…
Cancel
Save