robofsm: Main program is now called competition

diff --git a/src/robofsm/Makefile.omk b/src/robofsm/Makefile.omk
index 7494ac0d2ffbe471878d2a0c48f52d80d95f25ee..c0216a402a2679859c4840c645d9208c6e25a321 100644 (file)
--- a/src/robofsm/Makefile.omk
+++ b/src/robofsm/Makefile.omk
@@ -7,8 +7,8 @@ default_CONFIG = CONFIG_LOCK_CHECKING=n HAVE_PRIO_INHERIT=y
 config_include_HEADERS = robot_config.h
 robot_config_DEFINES = CONFIG_LOCK_CHECKING HAVE_PRIO_INHERIT
 
-bin_PROGRAMS += robomain
-robomain_SOURCES = main.cc fsmmain.c
+bin_PROGRAMS += competition
+competition_SOURCES = competition.cc
 
 bin_PROGRAMS += homologation
 homologation_SOURCES = homologation.cc

diff --git a/src/robofsm/fsmmain.c b/src/robofsm/competition.cc
similarity index 97%
rename from src/robofsm/fsmmain.c
rename to src/robofsm/competition.cc
index f82c3124b2c578a385f7ecbd90e68dcaca79addf..fc0b97a8b08bccfc08dc8e6c76d10ef42b4d50df 100644 (file)
--- a/src/robofsm/fsmmain.c
+++ b/src/robofsm/competition.cc
@@ -660,3 +660,24 @@ FSM_STATE()
 }
 */
 
+
+int main()
+{
+       int rv;
+
+       rv = robot_init();
+       if (rv) error(1, errno, "robot_init() returned %d\n", rv);
+
+       robot.fsm.main.debug_states = 1;
+       robot.fsm.motion.debug_states = 1;
+       robot.fsm.act.debug_states = 1;
+
+       robot.fsm.main.state = &fsm_state_main_init;
+
+        rv = robot_start();
+       if (rv) error(1, errno, "robot_start() returned %d\n", rv);
+
+       robot_destroy();
+
+       return 0;
+}

diff --git a/src/robofsm/main.cc b/src/robofsm/main.cc
deleted file mode 100644 (file)
index 1da648b..0000000
--- a/src/robofsm/main.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <robot.h>
-#include <fsm.h>
-#include <string.h>
-#include "robodata.h"
-#include <error.h>
-
-int main()
-{
-       int rv;
-
-       rv = robot_init();
-       if (rv) error(1, errno, "robot_init() returned %d\n", rv);
-
-       robot.obstacle_avoidance_enabled = true;
-
-       robot.fsm.main.debug_states = 1;
-       robot.fsm.motion.debug_states = 1;
-       robot.fsm.act.debug_states = 1;
-
-       robot.fsm.main.state = &fsm_state_main_init;
-
-        rv = robot_start();
-       if (rv) error(1, errno, "robot_start() returned %d\n", rv);
-
-       robot_destroy();
-
-       return 0;
-}