SITL: add ENABLED defines for remaining simulated I2C devices #28848
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
peterbarker
requested changes
Dec 14, 2024
libraries/SITL/SIM_Airspeed_DLVR.h
Outdated
| @@ -2,6 +2,14 @@ | |||
|
|
|||
| #include "SIM_I2CDevice.h" | |||
|
|
|||
| #include <AP_HAL/AP_HAL_Boards.h> | |||
|
|
|||
| #ifndef AP_SIM_AIRSPEEDDLVR_ENABLED | |||
There was a problem hiding this comment.
These should go in SIM_config.h
Also, please add underscores in each of them:
Suggested change
| #ifndef AP_SIM_AIRSPEEDDLVR_ENABLED | |
| #ifndef AP_SIM_AIRSPEED_DLVR_ENABLED |
There was a problem hiding this comment.
Thanks for the review. Updated in 92b8e86
srmainwaring
force-pushed
the
prs/prs-sitl-i2c-defines
branch
2 times, most recently
from
a758871 to
035d4e4
Compare
Signed-off-by: Rhys Mainwaring <[email protected]>
srmainwaring
force-pushed
the
prs/prs-sitl-i2c-defines
branch
from
035d4e4 to
92b8e86
Compare
peterbarker
approved these changes
Dec 14, 2024
| @@ -1,5 +1,7 @@ | |||
| #include "SIM_Temperature_TSYS01.h" | |||
|
|
|||
| #if AP_SIM_TEMPERATURE_TSYS01_ENABLED | |||
There was a problem hiding this comment.
Our pattern is to include SIM_config.h and then check this, including the .h corresponding to the .cpp after that check has passed.
There was a problem hiding this comment.
Fixed in follow up here: #28871
|
Merged, thanks! |
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.
Adds conditional compilation defines for the remainder of the I2C sensors included in
SIM_I2C.cpp.Motivation
Aside from consistency, this reduces DRAM use for SIM on HW (esp. esp32empty and esp32s3empty where RAM limits are causing WiFi to not initialise correctly).
Before:
After:
See also: