change definition of px4 main function

This commit is contained in:
Thomas Gubler
2014-12-11 09:27:11 +01:00
parent d04bbf11ec
commit a1685ed6d0
3 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -49,9 +49,9 @@ bool task_should_exit = false;
}
using namespace px4;
int publisher_task_main(int argc, char *argv[]);
PX4_MAIN_FUNCTION(publisher);
PX4_MAIN_FUNCTION(publisher)
extern "C" __EXPORT int publisher_main(int argc, char *argv[])
{
px4::init(argc, argv, "publisher");
@@ -99,7 +99,7 @@ PX4_MAIN_FUNCTION(publisher)
return 1;
}
int publisher_task_main(int argc, char *argv[])
PX4_MAIN_FUNCTION(publisher)
{
warnx("starting");
PublisherExample p;
+5 -5
View File
@@ -49,12 +49,10 @@ bool task_should_exit = false;
}
using namespace px4;
int subscriber_task_main(int argc, char *argv[]);
PX4_MAIN_FUNCTION(subscriber);
PX4_MAIN_FUNCTION(subscriber)
extern "C" __EXPORT int subscriber_main(int argc, char *argv[])
{
px4::init(argc, argv, "subscriber");
if (argc < 1) {
errx(1, "usage: subscriber {start|stop|status}");
}
@@ -99,8 +97,10 @@ PX4_MAIN_FUNCTION(subscriber)
return 1;
}
int subscriber_task_main(int argc, char *argv[])
PX4_MAIN_FUNCTION(subscriber)
{
px4::init(argc, argv, "subscriber");
warnx("starting");
SubscriberExample s;
thread_running = true;