fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-16 13:37:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

boards/platform: remove confusing override

Browse Source 
This removes the odd px4_i2c_bus_external override which was confusing
me and lead to odd and inconsistent results.

The function is now only available with an int as the argument.
This commit is contained in:
Julian Oes
2022-09-21 17:53:07 +12:00
parent 13d565d707
commit 8080ca966a
4 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/common/i2c.cpp
+10 -4
View File
@@ -38,9 +38,15 @@
#if defined(CONFIG_I2C)
#ifndef BOARD_OVERRIDE_I2C_BUS_EXTERNAL
bool px4_i2c_bus_external(const px4_i2c_bus_t &bus)
bool px4_i2c_bus_external(int bus)
{
return bus.is_external;
for (int i = 0; i < I2C_BUS_MAX_BUS_ITEMS; ++i) {
if (px4_i2c_buses[i].bus == bus) {
return px4_i2c_buses[i].is_external;
}
}
return true;
}
#endif // BOARD_OVERRIDE_I2C_BUS_EXTERNAL
@@ -72,7 +78,7 @@ bool I2CBusIterator::next()
break;
case FilterType::InternalBus:
if (!px4_i2c_bus_external(bus_data)) {
if (!px4_i2c_bus_external(bus_data.bus)) {
if (_bus == bus_data.bus || _bus == -1) {
return true;
}
@@ -81,7 +87,7 @@ bool I2CBusIterator::next()
break;
case FilterType::ExternalBus:
if (px4_i2c_bus_external(bus_data)) {
if (px4_i2c_bus_external(bus_data.bus)) {
++_external_bus_counter;
if (_bus == bus_data.bus || _bus == -1) {