diff --git a/src/drivers/telemetry/iridiumsbd/CMakeLists.txt b/src/drivers/telemetry/iridiumsbd/CMakeLists.txt index ec289764b9..fa2da626c6 100644 --- a/src/drivers/telemetry/iridiumsbd/CMakeLists.txt +++ b/src/drivers/telemetry/iridiumsbd/CMakeLists.txt @@ -1,6 +1,6 @@ ############################################################################ # -# Copyright (c) 2016 PX4 Development Team. All rights reserved. +# Copyright (c) 2016-2023 PX4 Development Team. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -33,10 +33,10 @@ px4_add_module( MODULE drivers__iridiumsbd MAIN iridiumsbd - STACK 1024 COMPILE_FLAGS SRCS IridiumSBD.cpp + IridiumSBD.h MODULE_CONFIG module.yaml DEPENDS diff --git a/src/drivers/telemetry/iridiumsbd/IridiumSBD.cpp b/src/drivers/telemetry/iridiumsbd/IridiumSBD.cpp index 95b72e4562..5fddd4ac46 100644 --- a/src/drivers/telemetry/iridiumsbd/IridiumSBD.cpp +++ b/src/drivers/telemetry/iridiumsbd/IridiumSBD.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2016-2018, 2021 PX4 Development Team. All rights reserved. + * Copyright (c) 2016-2023 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -53,9 +53,9 @@ static constexpr const char *satcom_state_string[4] = {"STANDBY", "SIGNAL CHECK" #define IRIDIUMSBD_DEVICE_PATH "/dev/iridium" -IridiumSBD::IridiumSBD() - : CDev(IRIDIUMSBD_DEVICE_PATH) +IridiumSBD::IridiumSBD() : CDev(IRIDIUMSBD_DEVICE_PATH) { + _iridiumsbd_status_pub.advertise(); } IridiumSBD::~IridiumSBD() @@ -1110,7 +1110,7 @@ int IridiumSBD::custom_command(int argc, char *argv[]) return print_usage("unknown command"); } -int iridiumsbd_main(int argc, char *argv[]) +extern "C" __EXPORT int iridiumsbd_main(int argc, char *argv[]) { if (argc >= 2 && !strcmp(argv[1], "stop") && IridiumSBD::is_running()) { if (!IridiumSBD::can_stop()) { diff --git a/src/drivers/telemetry/iridiumsbd/IridiumSBD.h b/src/drivers/telemetry/iridiumsbd/IridiumSBD.h index efc2a5cf47..3d628440e6 100644 --- a/src/drivers/telemetry/iridiumsbd/IridiumSBD.h +++ b/src/drivers/telemetry/iridiumsbd/IridiumSBD.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2016-2018, 2021, 2021 PX4 Development Team. All rights reserved. + * Copyright (c) 2016-2023 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -84,7 +84,6 @@ typedef enum { SATCOM_STATE_TEST, } satcom_state; -extern "C" __EXPORT int iridiumsbd_main(int argc, char *argv[]); #define SATCOM_TX_BUF_LEN 340 // TX buffer size - maximum for a SBD MO message is 340, but billed per 50 #define SATCOM_MAX_MESSAGE_LENGTH 50 // Maximum length of the expected messages sent over this link diff --git a/src/modules/logger/logged_topics.cpp b/src/modules/logger/logged_topics.cpp index f727cc8d43..9dfa49c6b5 100644 --- a/src/modules/logger/logged_topics.cpp +++ b/src/modules/logger/logged_topics.cpp @@ -74,6 +74,7 @@ void LoggedTopics::add_default_topics() add_topic("hover_thrust_estimate", 100); add_topic("input_rc", 500); add_optional_topic("internal_combustion_engine_status", 10); + add_optional_topic("iridiumsbd_status", 1000); add_optional_topic("irlock_report", 1000); add_topic("landing_gear_wheel", 10); add_optional_topic("landing_target_pose", 1000);