Merge branch 'master' into px4dev_new_param

This commit is contained in:
Lorenz Meier
2012-08-22 08:56:33 +02:00
29 changed files with 1243 additions and 117 deletions

View File

@@ -96,7 +96,7 @@ static int buzzer;
static int mavlink_fd;
static bool commander_initialized = false;
static struct vehicle_status_s current_status; /**< Main state machine */
static int stat_pub;
static orb_advert_t stat_pub;
static uint16_t nofix_counter = 0;
static uint16_t gotfix_counter = 0;