robofsm: servos control is a part of the Eurobot 2007 FSM library. A header included.

diff --git a/src/robofsm/Makefile.omk b/src/robofsm/Makefile.omk
index 0ab94d830441da9ce5283c1be24595904a5148ee..393cd52ea1704da8b2e73f08ce95b962315583a5 100644 (file)
--- a/src/robofsm/Makefile.omk
+++ b/src/robofsm/Makefile.omk
@@ -38,10 +38,10 @@ homologation_SOURCES = homologation.cc
 
 # Library with general support functions for the robot
 lib_LIBRARIES += robot_eb2007
-robot_eb2007_SOURCES = serva.c robot_eb2007.c roboorte.c fsmmove.cc \
+robot_eb2007_SOURCES = servos_eb2007.h robot_eb2007.c roboorte.c fsmmove.cc \
                fsmpickup.c fsmdet.c fsmjoy.c \
                movehelper.cc roboevent_eb2007.c fsmdisplay.cc
-include_HEADERS += robot_eb2007.h
+include_HEADERS += robot_eb2007.h servos_eb2007.h
 
 #bin_PROGRAMS += test_timer
 #test_timer_SOURCES = test_timer.c

diff --git a/src/robofsm/follower.cc b/src/robofsm/follower.cc
index 8772f46e5df4cd1f2119b6afc977059c9d12bfa6..562094febe0f091f1303048aa2a7cbb5a60099cd 100644 (file)
--- a/src/robofsm/follower.cc
+++ b/src/robofsm/follower.cc
@@ -5,7 +5,7 @@
 #include <robomath.h>
 #include <map.h>
 #include "sharp.h"
-#include "serva.h"
+#include <servos_eb2007.h>
 
 #define HOMOLOGACE
 /**

diff --git a/src/robofsm/fsmdet.c b/src/robofsm/fsmdet.c
index af2f190c9cc948d641ac6ce0a289db6c08ffc81f..90ad4400d23d0207efea26e32c144aa2edcdbcc3 100644 (file)
--- a/src/robofsm/fsmdet.c
+++ b/src/robofsm/fsmdet.c
@@ -13,7 +13,7 @@
 #include <robot_eb2007.h>
 #include <fsm.h>
 #include "movehelper.h"
-#include "serva.h"
+#include <servos_eb2007.h>
 #include <math.h>
 
 #define WASTE_STACK_EMPTYm             0xe0

diff --git a/src/robofsm/fsmjoy.c b/src/robofsm/fsmjoy.c
index 5497d66c78cbbdfc3c9144eb564b31c3f65503fc..bad22d7a0a11dcbf924225750c8fb64f5ce374b5 100644 (file)
--- a/src/robofsm/fsmjoy.c
+++ b/src/robofsm/fsmjoy.c
@@ -13,7 +13,7 @@
 #include <robot_eb2007.h>
 #include <fsm.h>
 #include "movehelper.h"
-#include "serva.h"
+#include <servos_eb2007.h>
 #include <math.h>
 
 #define CLOSE_LIMIT 850

diff --git a/src/robofsm/fsmpickup.c b/src/robofsm/fsmpickup.c
index 8e47e7d474e6bfaf27137d0a7d7d2ea133a338b4..b4421012acc4a9b80efdea6e1dca778ce8d95257 100644 (file)
--- a/src/robofsm/fsmpickup.c
+++ b/src/robofsm/fsmpickup.c
@@ -4,7 +4,7 @@
 #include <robot_eb2007.h>
 #include <fsm.h>
 #include <sharp.h>
-#include "serva.h"
+#include <servos_eb2007.h>
 
 /* bad attempts counter. pickup tries to pickup until the limit is exceeded */
 int pickup_bad_attemp_cnt = 0;

diff --git a/src/robofsm/homologation.cc b/src/robofsm/homologation.cc
index 9efd1603efedf3b5078ff7d31d073de2f2072102..ae8357912b63429414a8e80ee07e4c9081d7ce7b 100644 (file)
--- a/src/robofsm/homologation.cc
+++ b/src/robofsm/homologation.cc
@@ -18,7 +18,7 @@
 #include <robot_eb2007.h>
 #include <fsm.h>
 #include <unistd.h>
-#include "serva.h"
+#include <servos_eb2007.h>
 #include <math.h>
 #include "trgen.h"
 #include "movehelper.h"

diff --git a/src/robofsm/joystick.cc b/src/robofsm/joystick.cc
index 3c7f91c5a4a1cc148cfd5f02eaa294888a4d6747..949fb9c2a01eb95848bb3ef92ef249efeab06a54 100644 (file)
--- a/src/robofsm/joystick.cc
+++ b/src/robofsm/joystick.cc
@@ -12,7 +12,7 @@
 #include "robot.h"
 #include <fsm.h>
 #include <unistd.h>
-#include "serva.h"
+#include <servos_eb2007.h>
 #include <math.h>
 #include "trgen.h"
 #include "movehelper.h"

diff --git a/src/robofsm/obsolete/competition.cc b/src/robofsm/obsolete/competition.cc
index 129f952e21e9ec8bc5a8152aa0434d0924883df5..5dfbeb9120b49e71f4906ce50124383fcc50f76a 100644 (file)
--- a/src/robofsm/obsolete/competition.cc
+++ b/src/robofsm/obsolete/competition.cc
@@ -14,7 +14,7 @@
 #include "robot.h"
 #include <fsm.h>
 #include <unistd.h>
-#include "serva.h"
+#include <servos_eb2007.h>
 #include <math.h>
 #include "trgen.h"
 #include "movehelper.h"

diff --git a/src/robofsm/obsolete/fsmmain.cc b/src/robofsm/obsolete/fsmmain.cc
index e5574ba03badd7af98915d3faa7e805a8a992c13..e3198d13c9d63f9724c6ce424d8bf983d8d50e90 100644 (file)
--- a/src/robofsm/obsolete/fsmmain.cc
+++ b/src/robofsm/obsolete/fsmmain.cc
@@ -14,7 +14,7 @@
 #include "robot.h"
 #include <fsm.h>
 #include <unistd.h>
-#include "serva.h"
+#include <servos_eb2007.h>
 #include <math.h>
 #include "trgen.h"
 #include "movehelper.h"

diff --git a/src/robofsm/robot_eb2007.c b/src/robofsm/robot_eb2007.c
index c98c5e66f2429cb3bb0ddd260cdc742123ce9694..3480a00587dba0085c684e656ccd6be2a2e3158d 100644 (file)
--- a/src/robofsm/robot_eb2007.c
+++ b/src/robofsm/robot_eb2007.c
@@ -1,7 +1,7 @@
 #include <robot_eb2007.h>
 #include <signal.h>
 #include <unistd.h>
-#include "serva.h"
+#include <servos_eb2007.h>
 #include "movehelper.h"
 
 static int thread_priorities[] = {

diff --git a/src/robofsm/robot_eb2007.h b/src/robofsm/robot_eb2007.h
index 7dab009aa172d6ef7263249383e854da70d130cf..1f8cdf39ea2a99c20e19bb44e073f0b7fc315536 100644 (file)
--- a/src/robofsm/robot_eb2007.h
+++ b/src/robofsm/robot_eb2007.h
@@ -20,6 +20,7 @@
 #include <robodim_eb2007.h>
 #include <roboevent_eb2007.h>
 #include <fsm.h>
+#include <servos_eb2007.h>
 
 /* Select robot color. If we are BLUE, no coordinate transformation will
  * be performed. */

diff --git a/src/robofsm/serva.c b/src/robofsm/servos_eb2007.c
similarity index 88%
rename from src/robofsm/serva.c
rename to src/robofsm/servos_eb2007.c
index 153f5abe3196a9d749003bf940b45db223858a98..c44c6bfdaf3323338b979fd9295037394c4d5026 100644 (file)
--- a/src/robofsm/serva.c
+++ b/src/robofsm/servos_eb2007.c
@@ -1,4 +1,15 @@
-#include "serva.h"
+/*
+ * servos_eb2007.c                     07/04/18
+ *
+ * Robot's servos control.
+ *
+ * Copyright: (c) 2007 DCE Eurobot Dragon Team
+ *            CTU FEE - Department of Control Engineering
+ * License: GNU GPL v.2
+ */
+
+#include <robot_eb2007.h>
+#include <servos_eb2007.h>
 
 void releaseFront(void) {
        robot.serva.release = FRONT_LAUNCH_OPEN;

diff --git a/src/robofsm/serva.h b/src/robofsm/servos_eb2007.h
similarity index 78%
rename from src/robofsm/serva.h
rename to src/robofsm/servos_eb2007.h
index 2df1767895149d8450b1402507e561b12268ca93..5e3901bd4c8eeff8ca848d38319b51be070ffa30 100644 (file)
--- a/src/robofsm/serva.h
+++ b/src/robofsm/servos_eb2007.h
@@ -1,4 +1,15 @@
-#include <robot_eb2007.h>
+/*
+ * servos_eb2007.h                     07/04/18
+ *
+ * Robot's servos control.
+ *
+ * Copyright: (c) 2007 DCE Eurobot Dragon Team
+ *            CTU FEE - Department of Control Engineering
+ * License: GNU GPL v.2
+ */
+
+#ifndef SERVOS_EB2007_H
+#define SERVOS_EB2007_H
 
 #define FRONT_DOOR_UP 20
 #define FRONT_DOOR_DOWN 251
@@ -41,3 +52,5 @@ void innerTransporterRight(void);
 #ifdef __cplusplus
 }
 #endif 
+
+#endif /* SERVOS_EB2007_H */

diff --git a/src/robofsm/testcollavoid.cc b/src/robofsm/testcollavoid.cc
index b178fff33d9d0d0bc10b78d3012069872f53b583..b5a2c324a144bf83d997adb44e0271a8179ab05a 100644 (file)
--- a/src/robofsm/testcollavoid.cc
+++ b/src/robofsm/testcollavoid.cc
@@ -12,7 +12,7 @@
 #include "robot.h"
 #include <fsm.h>
 #include <unistd.h>
-#include "serva.h"
+#include <servos_eb2007.h>
 #include <math.h>
 #include "trgen.h"
 #include "movehelper.h"

diff --git a/src/robofsm/testpickup.cc b/src/robofsm/testpickup.cc
index d4657332429519e6628be25abcfea924c920f655..b58776880c6ed121e17e7a875623aaf0971f3f21 100644 (file)
--- a/src/robofsm/testpickup.cc
+++ b/src/robofsm/testpickup.cc
@@ -12,7 +12,7 @@
 #include "robot.h"
 #include <fsm.h>
 #include <unistd.h>
-#include "serva.h"
+#include <servos_eb2007.h>
 #include <math.h>
 #include "trgen.h"
 #include "movehelper.h"