mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-19 12:33:33 +08:00
module_base: remove CRTP template pattern to reduce flash bloat (#26476)
* module_base: claude rewrite to remove CRTP bloat * module_base: apply to all drivers/modules * format * fix build errors * fix missing syntax * remove reference to module.h in files that need module_base.h * remove old ModuleBase<T> * add module_base.cpp to px4_protected_layers.cmake * fix IridiumSBD can_stop() * fix IridiumSBD.cpp * clang-tidy: downcast static cast * get_instance() template accessor, revert clang-tidy global * rename module_base.h to module.h * revert changes in zenoh/Kconfig.topics
This commit is contained in:
@@ -43,6 +43,8 @@
|
||||
|
||||
#include "sensors.hpp"
|
||||
|
||||
ModuleBase::Descriptor Sensors::desc{task_spawn, custom_command, print_usage};
|
||||
|
||||
Sensors::Sensors(bool hil_enabled) :
|
||||
ModuleParams(nullptr),
|
||||
ScheduledWorkItem(MODULE_NAME, px4::wq_configurations::nav_and_controllers),
|
||||
@@ -502,7 +504,7 @@ void Sensors::Run()
|
||||
sub.unregisterCallback();
|
||||
}
|
||||
|
||||
exit_and_cleanup();
|
||||
exit_and_cleanup(desc);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -647,8 +649,8 @@ int Sensors::task_spawn(int argc, char *argv[])
|
||||
Sensors *instance = new Sensors(hil_enabled);
|
||||
|
||||
if (instance) {
|
||||
_object.store(instance);
|
||||
_task_id = task_id_is_work_queue;
|
||||
desc.object.store(instance);
|
||||
desc.task_id = task_id_is_work_queue;
|
||||
|
||||
if (instance->init()) {
|
||||
return PX4_OK;
|
||||
@@ -659,8 +661,8 @@ int Sensors::task_spawn(int argc, char *argv[])
|
||||
}
|
||||
|
||||
delete instance;
|
||||
_object.store(nullptr);
|
||||
_task_id = -1;
|
||||
desc.object.store(nullptr);
|
||||
desc.task_id = -1;
|
||||
|
||||
return PX4_ERROR;
|
||||
}
|
||||
@@ -775,5 +777,5 @@ It runs in its own thread and polls on the currently selected gyro topic.
|
||||
|
||||
extern "C" __EXPORT int sensors_main(int argc, char *argv[])
|
||||
{
|
||||
return Sensors::main(argc, argv);
|
||||
return ModuleBase::main(Sensors::desc, argc, argv);
|
||||
}
|
||||
|
||||
@@ -91,9 +91,11 @@
|
||||
using namespace sensors;
|
||||
using namespace time_literals;
|
||||
|
||||
class Sensors : public ModuleBase<Sensors>, public ModuleParams, public px4::ScheduledWorkItem
|
||||
class Sensors : public ModuleBase, public ModuleParams, public px4::ScheduledWorkItem
|
||||
{
|
||||
public:
|
||||
static Descriptor desc;
|
||||
|
||||
explicit Sensors(bool hil_enabled);
|
||||
~Sensors() override;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user