mavlink, commander: bugs fixed

This commit is contained in:
Anton Babushkin
2014-06-30 12:31:29 +02:00
parent 1a6b2b9c1e
commit 0a159e1a24
2 changed files with 3 additions and 9 deletions
+1 -1
View File
@@ -1407,7 +1407,7 @@ int commander_thread_main(int argc, char *argv[])
/* now set navigation state according to failsafe and main state */
bool nav_state_changed = set_nav_state(&status, (bool)datalink_loss_enabled,
mission_result.mission_finished);
mission_result.finished);
// TODO handle mode changes by commands
if (main_state_changed) {
+2 -8
View File
@@ -182,7 +182,7 @@ public:
int send_statustext(const char *string);
int send_statustext(enum MAV_SEVERITY severity, const char *string);
MavlinkStream * get_streams() { return _streams; } const
MavlinkStream * get_streams() const { return _streams; }
float get_rate_mult();
@@ -193,7 +193,7 @@ public:
bool get_wait_to_transmit() { return _wait_to_transmit; }
bool should_transmit() { return (!_wait_to_transmit || (_wait_to_transmit && _received_messages)); }
bool message_buffer_write(void *ptr, int size);
bool message_buffer_write(const void *ptr, int size);
void lockMessageBufferMutex(void) { pthread_mutex_lock(&_message_buffer_mutex); }
void unlockMessageBufferMutex(void) { pthread_mutex_unlock(&_message_buffer_mutex); }
@@ -322,10 +322,6 @@ private:
void mavlink_update_system();
uint8_t get_system_id();
uint8_t get_component_id();
int mavlink_open_uart(int baudrate, const char *uart_name, struct termios *uart_config_original, bool *is_usb);
int configure_stream(const char *stream_name, const float rate);
@@ -338,8 +334,6 @@ private:
int message_buffer_is_empty();
bool message_buffer_write(const void *ptr, int size);
int message_buffer_get_ptr(void **ptr, bool *is_part);
void message_buffer_mark_read(int n);