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

AP_Frsky_Telem: change for AP::terrain as a pointer

Browse Source
This commit is contained in:
Andrew Tridgell 2021-04-07 19:49:52 +10:00
parent 5e820b203b
commit d3e3e58466
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_Frsky_Telem/AP_Frsky_SPort_Passthrough.cpp
View File

@ -206,8 +206,8 @@ bool AP_Frsky_SPort_Passthrough::is_packet_ready(uint8_t idx, bool queue_empty)
{ {
packet_ready = false; packet_ready = false;
#if AP_TERRAIN_AVAILABLE #if AP_TERRAIN_AVAILABLE
const AP_Terrain &terrain = AP::terrain(); const AP_Terrain *terrain = AP::terrain();
packet_ready = terrain.enabled(); packet_ready = terrain && terrain->enabled();
#endif #endif
} }
break; break;
@ -638,12 +638,12 @@ uint32_t AP_Frsky_SPort_Passthrough::calc_terrain(void)
{ {
uint32_t value = 0; uint32_t value = 0;
#if AP_TERRAIN_AVAILABLE #if AP_TERRAIN_AVAILABLE
AP_Terrain &terrain = AP::terrain(); AP_Terrain *terrain = AP::terrain();
if (!terrain.enabled()) { if (terrain == nullptr || !terrain->enabled()) {
return value; return value;
} }
float height_above_terrain; float height_above_terrain;
if (terrain.height_above_terrain(height_above_terrain, true)) { if (terrain->height_above_terrain(height_above_terrain, true)) {
// vehicle height above terrain // vehicle height above terrain
value |= prep_number(roundf(height_above_terrain * 10), 3, 2); value |= prep_number(roundf(height_above_terrain * 10), 3, 2);
} }