Skip to content

Commit 0926604

Browse files
alexcekayLuka Dragar
authored andcommitted
auterion autostarter: Added autostart for PWM_EXPANDER, generalized c… (PX4#25925)
* auterion autostarter: Added autostart for PWM_EXPANDER, generalized code, renamed module * auterion autostarter: Enable on v6s, robustify error handling * review comments
1 parent 36510c9 commit 0926604

3 files changed

Lines changed: 18 additions & 0 deletions

File tree

boards/px4/fmu-v5x/default.px4board

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@ CONFIG_DRIVERS_IRLOCK=y
3535
CONFIG_COMMON_LIGHT=y
3636
CONFIG_COMMON_MAGNETOMETER=y
3737
<<<<<<< HEAD
38+
<<<<<<< HEAD
3839
CONFIG_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))
4145
CONFIG_DRIVERS_OSD_MSP_OSD=y
4246
CONFIG_DRIVERS_POWER_MONITOR_INA226=y
4347
CONFIG_DRIVERS_POWER_MONITOR_INA228=y

src/drivers/auterion_autostarter/AuterionAutostarter.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@
4141
#include <builtin/builtin.h>
4242
#include <sys/wait.h>
4343

44+
<<<<<<< HEAD
4445
ModuleBase::Descriptor AuterionAutostarter::desc{task_spawn, custom_command, print_usage};
4546

47+
=======
48+
>>>>>>> 7680efc855 (auterion autostarter: Added autostart for PWM_EXPANDER, generalized c… (#25925))
4649
AuterionAutostarter::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

558561
extern "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
}

src/drivers/auterion_autostarter/AuterionAutostarter.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,19 @@ class I2CWrapper
7171
struct i2c_master_s *_i2c {nullptr};
7272
};
7373

74+
<<<<<<< HEAD
7475
class AuterionAutostarter : public ModuleBase, public px4::ScheduledWorkItem
7576
{
7677

7778
public:
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

0 commit comments

Comments
 (0)