aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_DAL: fixed shadowed variable

Browse Source 
found by semaphore build
This commit is contained in:
Andrew Tridgell 2020-11-07 07:25:10 +11:00
parent 50d03571da
commit bf61910c7c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/AP_DAL/AP_DAL_Beacon.cpp
View File

@ -14,33 +14,33 @@ AP_DAL_Beacon::AP_DAL_Beacon()
void AP_DAL_Beacon::start_frame()
{
const auto *beacon = AP::beacon();
const auto *bcon = AP::beacon();
_RBCH.ptr_is_nullptr = (beacon == nullptr);
_RBCH.ptr_is_nullptr = (bcon == nullptr);
const log_RBCH old = _RBCH;
if (beacon != nullptr) {
_RBCH.count = beacon->count();
_RBCH.get_vehicle_position_ned_returncode = beacon->get_vehicle_position_ned(_RBCH.vehicle_position_ned, _RBCH.accuracy_estimate);
if (bcon != nullptr) {
_RBCH.count = bcon->count();
_RBCH.get_vehicle_position_ned_returncode = bcon->get_vehicle_position_ned(_RBCH.vehicle_position_ned, _RBCH.accuracy_estimate);
_RBCH.get_origin_returncode = beacon->get_origin(_origin);
_RBCH.get_origin_returncode = bcon->get_origin(_origin);
_RBCH.origin_lat = _origin.lat;
_RBCH.origin_lng = _origin.lng;
_RBCH.origin_alt = _origin.alt;
}
WRITE_REPLAY_BLOCK_IFCHANGD(RBCH, _RBCH, old);
if (beacon == nullptr) {
if (bcon == nullptr) {
return;
}
for (uint8_t i=0; i<ARRAY_SIZE(_RBCI); i++) {
log_RBCI &RBCI = _RBCI[i];
const log_RBCI old_RBCI = RBCI;
const uint32_t last_update_ms = beacon->beacon_last_update_ms(i);
const uint32_t last_update_ms = bcon->beacon_last_update_ms(i);
_last_logged_update_ms[i] = last_update_ms;
RBCI.last_update_ms = last_update_ms;
RBCI.position = beacon->beacon_position(i);
RBCI.distance = beacon->beacon_distance(i);
RBCI.healthy = beacon->beacon_healthy(i);
RBCI.position = bcon->beacon_position(i);
RBCI.distance = bcon->beacon_distance(i);
RBCI.healthy = bcon->beacon_healthy(i);
WRITE_REPLAY_BLOCK_IFCHANGD(RBCI, RBCI, old_RBCI);
}