Skip to content
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

Iridium: disable module for now #17837

Merged
merged 3 commits into from
Jul 2, 2021
Merged

Iridium: disable module for now #17837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d7e0a1
ModuleBase: allow configurable timeout for wait_until_running()
bkueng Jul 2, 2021
c7fb67e
fix iridiumsbd: use ModuleBase
bkueng Jul 2, 2021
bf03fe1
iridiumsbd: disable module until everything is fixed
bkueng Jul 2, 2021
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
2 changes: 1 addition & 1 deletion boards/px4/fmu-v2/fixedwing.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ px4_add_board(
pwm_out
px4io
#telemetry # all available telemetry drivers
telemetry/iridiumsbd
#telemetry/iridiumsbd
tone_alarm
#uavcan
MODULES
Expand Down
1 change: 0 additions & 1 deletion boards/px4/fmu-v2/test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ px4_add_board(
imu/lsm303d
imu/invensense/mpu6000
#imu/invensense/mpu9250
#iridiumsbd
#irlock
lights/rgbled
#magnetometer # all available magnetometer drivers
Expand Down
9 changes: 4 additions & 5 deletions platforms/common/include/px4_platform_common/module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,17 +362,16 @@ class ModuleBase
* @brief Waits until _object is initialized, (from the new thread). This can be called from task_spawn().
* @return Returns 0 iff successful, -1 on timeout or otherwise.
*/
static int wait_until_running()
static int wait_until_running(int timeout_ms = 1000)
{
int i = 0;

do {
/* Wait up to 1s. */
px4_usleep(2500);
px4_usleep(2000);

} while (!_object.load() && ++i < 400);
} while (!_object.load() && ++i < timeout_ms / 2);

if (i == 400) {
if (i >= timeout_ms / 2) {
PX4_ERR("Timed out while waiting for thread to start");
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/telemetry/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
add_subdirectory(bst)
add_subdirectory(frsky_telemetry)
add_subdirectory(hott)
add_subdirectory(iridiumsbd)
#add_subdirectory(iridiumsbd)
Loading