Skip to content

Make sure DEFAULT_I2C_DEVICE is always valid #10253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmosca merged 4 commits into from
Jul 23, 2024
Merged

Make sure DEFAULT_I2C_DEVICE is always valid #10253

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3f060d
Make sure DEFAULT_I2C_DEVICE is always valid
mmosca Jul 23, 2024
0b207ac
Use default_i2c_bus when available
mmosca Jul 23, 2024
5d2fb24
Add DEFAULT_I2C_BUS and make sure we default to a valid i2c bus
mmosca Jul 23, 2024
4c49704
Make sure all i2c devices are setup correctly
mmosca Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions src/main/target/common_post.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,41 @@ extern uint8_t __config_end;
# undef USE_OLED_UG2864
#endif


// Make sure DEFAULT_I2C_BUS is valid
#ifndef DEFAULT_I2C_BUS

#if defined(USE_I2C_DEVICE_1)
#define DEFAULT_I2C_BUS BUS_I2C1
#elif defined(USE_I2C_DEVICE_2)
#define DEFAULT_I2C_BUS BUS_I2C2
#elif defined(USE_I2C_DEVICE_3)
#define DEFAULT_I2C_BUS BUS_I2C3
#elif defined(USE_I2C_DEVICE_4)
#define DEFAULT_I2C_BUS BUS_I2C4
#endif

#endif

// Airspeed sensors
#if defined(USE_PITOT) && defined(DEFAULT_I2C_BUS)

#ifndef PITOT_I2C_BUS
#define PITOT_I2C_BUS DEFAULT_I2C_BUS
#endif

#endif

// Temperature sensors
#if !defined(TEMPERATURE_I2C_BUS) && defined(DEFAULT_I2C_BUS)
#define TEMPERATURE_I2C_BUS DEFAULT_I2C_BUS
#endif

// Rangefinder sensors
#if !defined(RANGEFINDER_I2C_BUS) && defined(DEFAULT_I2C_BUS)
#define RANGEFINDER_I2C_BUS DEFAULT_I2C_BUS
#endif

// Enable MSP_DISPLAYPORT for F3 targets without builtin OSD,
// since it's used to display CMS on MWOSD
#if !defined(USE_MSP_DISPLAYPORT) && !defined(USE_OSD)
Expand Down Expand Up @@ -67,6 +102,10 @@ extern uint8_t __config_end;

#endif // USE_MAG_ALL

#if defined(DEFAULT_I2C_BUS) && !defined(MAG_I2C_BUS)
#define MAG_I2C_BUS DEFAULT_I2C_BUS
#endif

#endif // USE_MAG

#if defined(USE_BARO)
Expand All @@ -84,6 +123,10 @@ extern uint8_t __config_end;
#define USE_BARO_SPL06
#endif

#if defined(DEFAULT_I2C_BUS) && !defined(BARO_I2C_BUS)
#define BARO_I2C_BUS DEFAULT_I2C_BUS
#endif

#endif

#ifdef USE_ESC_SENSOR
Expand Down