Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing_adc

This commit is contained in:
Lorenz Meier
2013-01-06 11:25:24 +01:00
15 changed files with 142 additions and 19 deletions
+3 -2
View File
@@ -40,6 +40,7 @@
*/
#include <string.h>
#include <stdlib.h>
#include "mavlink_log.h"
@@ -51,7 +52,7 @@ void mavlink_logbuffer_init(struct mavlink_logbuffer *lb, int size) {
}
int mavlink_logbuffer_is_full(struct mavlink_logbuffer *lb) {
return lb->count == lb->size;
return lb->count == (int)lb->size;
}
int mavlink_logbuffer_is_empty(struct mavlink_logbuffer *lb) {
@@ -77,4 +78,4 @@ int mavlink_logbuffer_read(struct mavlink_logbuffer *lb, struct mavlink_logmessa
} else {
return 1;
}
}
}