BLHeli: fixed build without BLHeli with sim on hw #26122
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andyp1per
requested changes
Feb 2, 2024
libraries/AP_IOMCU/AP_IOMCU.cpp
Outdated
| @@ -117,7 +118,7 @@ void AP_IOMCU::thread_main(void) | |||
| uart.begin(1500*1000, 128, 128); | |||
| uart.set_unbuffered_writes(true); | |||
|
|
|||
| #if HAL_WITH_IO_MCU_BIDIR_DSHOT | |||
| #if HAVE_AP_BLHELI_SUPPORT && HAL_WITH_IO_MCU_BIDIR_DSHOT | |||
There was a problem hiding this comment.
I'd have to look more closely but I don't think this is correct - I don't think we compile blheli into iomcu
There was a problem hiding this comment.
AP_IOMCU does use AP_BLHeli, and that is the issue. It doesn't build with sim-on-hw
| @@ -33,9 +33,7 @@ | |||
| #include <AP_Baro/AP_Baro.h> | |||
| #include <AP_RTC/AP_RTC.h> | |||
| #include <AP_SerialManager/AP_SerialManager.h> | |||
| #ifdef HAVE_AP_BLHELI_SUPPORT | |||
| #include <AP_BLheli/AP_BLHeli.h> | |||
There was a problem hiding this comment.
don't you need a define guard in the header if you do this?
|
@andyp1per AP_BLHeli::telem_data doesn't exist in AP_Spektrum_Telem::calc_esc() |
|
Can't push - here is a fixup - #26554 |
tridge
force-pushed
the
pr-fixed-sim-on-hw-build
branch
from
98cec29 to
e973fea
Compare
|
@andyp1per thanks! |
andyp1per
approved these changes
Mar 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this build was failing:
Tools/scripts/sitl-on-hardware/sitl-on-hw.py --board Pixhawk6X --vehicle plane --frame QuadPlane --simclass QuadPlane