aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AntennaTracker: build fixes for new GCS_MAVLink API

Browse Source
This commit is contained in:
Andrew Tridgell 2014-05-27 16:35:39 +10:00
parent 7e3daacda0
commit a3b91660eb
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tools/AntennaTracker/GCS_Mavlink.pde
View File

@ -1062,8 +1062,9 @@ static void gcs_update(void)
} }
} }
// Also check for messages from the remote if we are in proxy mode // Also check for messages from the remote if we are in proxy mode
if (g.proxy_mode == true && proxy_vehicle.initialised) if (g.proxy_mode == true && proxy_vehicle.initialised) {
proxy_vehicle.update(); proxy_vehicle.update(NULL);
}
} }
static void gcs_send_text_P(gcs_severity severity, const prog_char_t *str) static void gcs_send_text_P(gcs_severity severity, const prog_char_t *str)

10
Tools/AntennaTracker/system.pde
View File

@ -35,12 +35,12 @@ static void init_tracker()
check_usb_mux(); check_usb_mux();
// we have a 2nd serial port for telemetry // we have a 2nd serial port for telemetry
hal.uartC->begin(map_baudrate(g.serial1_baud, SERIAL1_BAUD), hal.uartC->begin(map_baudrate(g.serial1_baud), 128, SERIAL1_BUFSIZE);
128, SERIAL1_BUFSIZE); if (g.proxy_mode == true) {
if (g.proxy_mode == true) proxy_vehicle.setup_uart(hal.uartC, map_baudrate(g.serial1_baud), 128, SERIAL1_BUFSIZE);
proxy_vehicle.init(hal.uartC); } else {
else
gcs[1].setup_uart(hal.uartC, map_baudrate(g.serial1_baud), 128, SERIAL1_BUFSIZE); gcs[1].setup_uart(hal.uartC, map_baudrate(g.serial1_baud), 128, SERIAL1_BUFSIZE);
}
mavlink_system.sysid = g.sysid_this_mav; mavlink_system.sysid = g.sysid_this_mav;