Skip to content

Commit

Permalink
AntennaTracker: remove checks for HAL_BOARD_APM2 and HAL_BOARD_APM1
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasdemarchi authored and tridge committed Nov 4, 2015
1 parent bdf92e8 commit 3b0a1ef
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 18 deletions.
5 changes: 0 additions & 5 deletions AntennaTracker/AntennaTracker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,6 @@ void Tracker::one_second_loop()
}
}

#if CONFIG_HAL_BOARD == HAL_BOARD_APM1
// needed for APM1 inertialsensor driver
AP_ADC_ADS7844 apm1_adc;
#endif

const AP_HAL::HAL& hal = AP_HAL::get_HAL();

Tracker::Tracker(void)
Expand Down
1 change: 0 additions & 1 deletion AntennaTracker/Tracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include <AP_AHRS/AP_AHRS.h> // ArduPilot Mega DCM Library
#include <Filter/Filter.h> // Filter library
#include <AP_Buffer/AP_Buffer.h> // APM FIFO Buffer
#include <AP_HAL_AVR/memcheck.h>

#include <GCS_MAVLink/GCS_MAVLink.h> // MAVLink GCS definitions
#include <AP_SerialManager/AP_SerialManager.h> // Serial manager library
Expand Down
12 changes: 0 additions & 12 deletions AntennaTracker/system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,4 @@ void Tracker::check_usb_mux(void)

// the user has switched to/from the telemetry port
usb_connected = usb_check;

#if CONFIG_HAL_BOARD == HAL_BOARD_APM2
// the APM2 has a MUX setup where the first serial port switches
// between USB and a TTL serial connection. When on USB we use
// SERIAL0_BAUD, but when connected as a TTL serial port we run it
// at SERIAL1_BAUD.
if (usb_connected) {
serial_manager.set_console_baud(AP_SerialManager::SerialProtocol_Console, 0);
} else {
serial_manager.set_console_baud(AP_SerialManager::SerialProtocol_MAVLink, 0);
}
#endif
}

0 comments on commit 3b0a1ef

Please sign in to comment.