Correct builds where no POI_LOCK is in but terrain is out

[peterbarker]

Summary

Corrects compilation where an attempt was made to enable POI_LOCK but terrain's not available.

Classification & Testing (check all that apply and add your own)

• Checked by a human programmer
• Non-functional change
• No-binary change
• Infrastructure change (e.g. unit tests, helper scripts)
• Automated test(s) verify changes (e.g. unit test, autotest)
• Tested manually, description below (e.g. SITL)
• Tested on hardware
• Logs attached
• Logs available on request

Board                    AP_Periph  antennatracker  blimp  bootloader  copter  heli  iofirmware  plane  rover  sub
CubeOrange-periph-heavy  *                                 *                                                   
Durandal                            *               *      *           8       8                 0      8      0
Hitec-Airspeed           *                                 *                                                   
KakuteH7-bdshot                     *               *      *           0       8                 8      8      0
MatekF405                           *               *      *           *       *                 *      *      *
Pixhawk1-1M-bdshot                  *               *                  *       *                 *      *      *
SITL_x86_64_linux_gnu               *               *                  0       0                 0      0      0
YJUAV_A6SE                          *               *      *           8       0                 8      8      8
f103-QiotekPeriph        *                                 *                                                   
f303-MatekGPS            *                                 *                                                   
f303-Universal           *                                 *                                                   
iomcu                                                                                *                         
revo-mini                           *               *      *           *       *                 *      *      *
skyviper-v2450                                                         *                                       
speedybeef4                         *               *      *           *       *                 *      *      *

BEASTH7 compiles afterwards.

Description

Sometimes boards can POI-lock their mount, but can't use terrain as they don't have anywhere to store the tiles (that's what the AP_TERRAIN_AVAILABLE is all about).

rejig things so that you can still poi-lock and it will use home rather than terrain altitude.

We should consider rejigging these defines to be the "correct way up" - so the dependent feature requires the base feature rather than enabling it.

[Hwurzburg]

Whats missing from this??? #32010

pretty sure it worked for me when terrain was not compiled in....could be imagining I suppose

[Hwurzburg]

You're right, I must have only tested with terrain disabled, not missing...tried to compile with terrain library missing on CubeOrange and it failed...then tried your PR with terrain not compiled in and the build succeeded...mea cupa

[peterbarker]

You're right, I must have only tested with terrain disabled, not missing...tried to compile with terrain library missing on CubeOrange and it failed...then tried your PR with terrain not compiled in and the build succeeded...mea cupa

Thanks for re-testing!

... and I think I approved the original, so we're all at fault here :-)

I would still like to look at upending the deps at some stage, because I think that's going to bite us at some stage.

[tpwrules]

There's a secret bug fix commit here, has it been studied?

[rmackay9]

this looks correct to me