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

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

Browse Source
This commit is contained in:
Thomas Gubler
2014-10-05 13:17:37 +02:00
parent 7f9a231b40 c0eefc983a
commit c6de36d683
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/dataman/module.mk
+2
View File
@@ -40,3 +40,5 @@ MODULE_COMMAND = dataman
SRCS = dataman.c SRCS = dataman.c
MODULE_STACKSIZE = 1200 MODULE_STACKSIZE = 1200
MAXOPTIMIZATION = -Os
src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp
+5 -5
View File
@@ -265,7 +265,7 @@ bool MavlinkFtpTest::_open_badfile_test(void)
MavlinkFTP::PayloadHeader *reply; MavlinkFTP::PayloadHeader *reply;
const char *dir = "/foo"; // non-existent file const char *dir = "/foo"; // non-existent file
payload.opcode = MavlinkFTP::kCmdOpenFile; payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0; payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header bool success = _send_receive_msg(&payload, // FTP payload header
@@ -295,7 +295,7 @@ bool MavlinkFtpTest::_open_terminate_test(void)
struct stat st; struct stat st;
const ReadTestCase *test = &_rgReadTestCases[i]; const ReadTestCase *test = &_rgReadTestCases[i];
payload.opcode = MavlinkFTP::kCmdOpenFile; payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0; payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header bool success = _send_receive_msg(&payload, // FTP payload header
@@ -342,7 +342,7 @@ bool MavlinkFtpTest::_terminate_badsession_test(void)
MavlinkFTP::PayloadHeader *reply; MavlinkFTP::PayloadHeader *reply;
const char *file = _rgReadTestCases[0].file; const char *file = _rgReadTestCases[0].file;
payload.opcode = MavlinkFTP::kCmdOpenFile; payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0; payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header bool success = _send_receive_msg(&payload, // FTP payload header
@@ -400,7 +400,7 @@ bool MavlinkFtpTest::_read_test(void)
// Test case data files are created for specific boundary conditions // Test case data files are created for specific boundary conditions
ut_compare("Test case data files are out of date", test->length, st.st_size); ut_compare("Test case data files are out of date", test->length, st.st_size);
payload.opcode = MavlinkFTP::kCmdOpenFile; payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0; payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header bool success = _send_receive_msg(&payload, // FTP payload header
@@ -463,7 +463,7 @@ bool MavlinkFtpTest::_read_badsession_test(void)
MavlinkFTP::PayloadHeader *reply; MavlinkFTP::PayloadHeader *reply;
const char *file = _rgReadTestCases[0].file; const char *file = _rgReadTestCases[0].file;
payload.opcode = MavlinkFTP::kCmdOpenFile; payload.opcode = MavlinkFTP::kCmdOpenFileRO;
payload.offset = 0; payload.offset = 0;
bool success = _send_receive_msg(&payload, // FTP payload header bool success = _send_receive_msg(&payload, // FTP payload header
src/modules/navigator/mission.cpp
+3 -3
View File
@@ -234,7 +234,7 @@ Mission::update_offboard_mission()
_current_offboard_mission_index = 0; _current_offboard_mission_index = 0;
} }
report_current_offboard_mission_item(); set_current_offboard_mission_item();
} }
@@ -396,7 +396,7 @@ Mission::set_mission_items()
_navigator->set_can_loiter_at_sp(pos_sp_triplet->current.type == SETPOINT_TYPE_LOITER); _navigator->set_can_loiter_at_sp(pos_sp_triplet->current.type == SETPOINT_TYPE_LOITER);
reset_mission_item_reached(); reset_mission_item_reached();
report_mission_finished(); set_mission_finished();
_navigator->set_position_setpoint_triplet_updated(); _navigator->set_position_setpoint_triplet_updated();
return; return;
@@ -476,7 +476,7 @@ Mission::set_mission_items()
reset_mission_item_reached(); reset_mission_item_reached();
if (_mission_type == MISSION_TYPE_OFFBOARD) { if (_mission_type == MISSION_TYPE_OFFBOARD) {
report_current_offboard_mission_item(); set_current_offboard_mission_item();
} }
// TODO: report onboard mission item somehow // TODO: report onboard mission item somehow
src/modules/navigator/module.mk
+2
View File
@@ -62,3 +62,5 @@ INCLUDE_DIRS += $(MAVLINK_SRC)/include/mavlink
MODULE_STACKSIZE = 1200 MODULE_STACKSIZE = 1200
EXTRACXXFLAGS = -Weffc++ EXTRACXXFLAGS = -Weffc++
MAXOPTIMIZATION = -Os