Browse Source

修复camera空指针判断

zr-sdk-4.1.16
bin 4 years ago
parent
commit
a3005fe49c
  1. 7
      ArduCopter/mode_auto.cpp
  2. 2
      modules/mavlink

7
ArduCopter/mode_auto.cpp

@ -1172,8 +1172,11 @@ Location ModeAuto::loc_from_cmd(const AP_Mission::Mission_Command& cmd) const @@ -1172,8 +1172,11 @@ Location ModeAuto::loc_from_cmd(const AP_Mission::Mission_Command& cmd) const
void ModeAuto::do_nav_wp(const AP_Mission::Mission_Command& cmd)
{
Location target_loc = loc_from_cmd(cmd);
AP::camera()->cameras_take_enable = AP::camera()->cameras_take_enable_new;
AP::camera()->cameras_take_enable_new = cmd.content.location.cams_enable_bit;
AP_Camera *camera = AP::camera();
if (camera != nullptr) {
camera->cameras_take_enable = AP::camera()->cameras_take_enable_new;
camera->cameras_take_enable_new = cmd.content.location.cams_enable_bit;
}
//gcs().send_text(MAV_SEVERITY_INFO,"NOTICE:WP:%d,p3:%d",cmd.index,AP::camera()->cameras_take_enable_new); //TODO DEBUG!!!
// this will be used to remember the time in millis after we reach or pass the WP.
loiter_time = 0;

2
modules/mavlink

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 18cab6950986cd7b9b7a507ec35f3501d4a7e019
Subproject commit 0013b46db8cb437b6ad77d736263597d90a2262d
Loading…
Cancel
Save