File tree Expand file tree Collapse file tree
src/drivers/auterion_autostarter Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -35,9 +35,13 @@ CONFIG_DRIVERS_IRLOCK=y
3535CONFIG_COMMON_LIGHT=y
3636CONFIG_COMMON_MAGNETOMETER=y
3737<<<<<<< HEAD
38+ <<<<<<< HEAD
3839CONFIG_DRIVERS_AUTERION_AUTOSTARTER=y
3940=======
4041>>>>>>> 0bae03e4dd (boards: remove CONFIG_COMMON_OPTICAL_FLOW from all non-CANnode hardware (#26315))
42+ =======
43+ CONFIG_DRIVERS_AUTERION_AUTOSTARTER=y
44+ >>>>>>> 7680efc855 (auterion autostarter: Added autostart for PWM_EXPANDER, generalized c… (#25925))
4145CONFIG_DRIVERS_OSD_MSP_OSD=y
4246CONFIG_DRIVERS_POWER_MONITOR_INA226=y
4347CONFIG_DRIVERS_POWER_MONITOR_INA228=y
Original file line number Diff line number Diff line change 4141#include < builtin/builtin.h>
4242#include < sys/wait.h>
4343
44+ <<<<<<< HEAD
4445ModuleBase::Descriptor AuterionAutostarter::desc{task_spawn, custom_command, print_usage};
4546
47+ =======
48+ >>>>>>> 7680efc855 (auterion autostarter: Added autostart for PWM_EXPANDER, generalized c… (#25925 ))
4649AuterionAutostarter::AuterionAutostarter () :
4750 ScheduledWorkItem(MODULE_NAME, px4::wq_configurations::hp_default)
4851{
@@ -557,5 +560,9 @@ Driver for starting and auto-detecting different power monitors.
557560
558561extern " C" __EXPORT int auterion_autostarter_main (int argc, char *argv[])
559562{
563+ <<<<<<< HEAD
560564 return ModuleBase::main (AuterionAutostarter::desc, argc, argv);
565+ =======
566+ return AuterionAutostarter::main (argc, argv);
567+ >>>>>>> 7680efc855 (auterion autostarter: Added autostart for PWM_EXPANDER, generalized c… (#25925 ))
561568}
Original file line number Diff line number Diff line change @@ -71,12 +71,19 @@ class I2CWrapper
7171 struct i2c_master_s *_i2c {nullptr };
7272};
7373
74+ <<<<<<< HEAD
7475class AuterionAutostarter : public ModuleBase , public px4 ::ScheduledWorkItem
7576{
7677
7778public:
7879 static Descriptor desc;
7980
81+ =======
82+ class AuterionAutostarter : public ModuleBase <AuterionAutostarter>, public px4::ScheduledWorkItem
83+ {
84+
85+ public:
86+ >>>>>>> 7680efc855 (auterion autostarter: Added autostart for PWM_EXPANDER, generalized c… (#25925 ))
8087 AuterionAutostarter ();
8188 virtual ~AuterionAutostarter ();
8289
You can’t perform that action at this time.
0 commit comments