fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 14:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into diff_press_filter

Browse Source 
Conflicts:
	src/modules/sdlog2/sdlog2.c
This commit is contained in:
Thomas Gubler
2014-03-15 12:28:29 +01:00
parent 0784ef9189 e590d96c0a
commit 07cff8e0bd
21 changed files with 2902 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sdlog2/logbuffer.c
+2 -1
View File
@@ -74,8 +74,9 @@ bool logbuffer_write(struct logbuffer_s *lb, void *ptr, int size)
// bytes available to write
int available = lb->read_ptr - lb->write_ptr - 1;
if (available < 0)
if (available < 0) {
available += lb->size;
}
if (size > available) {
// buffer overflow
src/modules/sdlog2/sdlog2.c
+426 -561
View File
File diff suppressed because it is too large Load Diff
src/modules/sdlog2/sdlog2_messages.h
+7 -7
View File
@@ -268,13 +268,13 @@ struct log_DIST_s {
/* --- TELE - TELEMETRY STATUS --- */
#define LOG_TELE_MSG 22
struct log_TELE_s {
uint8_t rssi;
uint8_t remote_rssi;
uint8_t noise;
uint8_t remote_noise;
uint16_t rxerrors;
uint16_t fixed;
uint8_t txbuf;
uint8_t rssi;
uint8_t remote_rssi;
uint8_t noise;
uint8_t remote_noise;
uint16_t rxerrors;
uint16_t fixed;
uint8_t txbuf;
};
/********** SYSTEM MESSAGES, ID > 0x80 **********/