Move config and launch files to twil_bringup.

diff --git a/launch/adaptive_dynamics_linearizing.launch b/launch/adaptive_dynamics_linearizing.launch
deleted file mode 100644 (file)
index 3d601bf..0000000
--- a/launch/adaptive_dynamics_linearizing.launch
+++ /dev/null
@@ -1,5 +0,0 @@
-<launch>
-  <node name="ident" pkg="twil_ident" type="ident" output="screen">
-       <remap from="ident/dynamic_parameters" to="adaptive_linearizing_controller/dynamic_parameters"/>
-  </node>
-</launch>

diff --git a/src/dynamics_linearizing_controller.cpp b/src/dynamics_linearizing_controller.cpp
index dd594de..d0d55d6 100644 (file)
--- a/src/dynamics_linearizing_controller.cpp
+++ b/src/dynamics_linearizing_controller.cpp
@@ -27,7 +27,7 @@
 
 #include <linearizing_controllers/dynamics_linearizing_controller.h>
 
-#define sqr(x) (x*x)
+#define sqr(x) ((x)*(x))
 
 namespace effort_controllers
 {      

diff --git a/src/twist_mrac_linearizing_controller.cpp b/src/twist_mrac_linearizing_controller.cpp
index bbc1a63..bf70d93 100644 (file)
--- a/src/twist_mrac_linearizing_controller.cpp
+++ b/src/twist_mrac_linearizing_controller.cpp
@@ -27,7 +27,7 @@
 
 #include <linearizing_controllers/twist_mrac_linearizing_controller.h>
 
-#define sqr(x) (x*x)
+#define sqr(x) ((x)*(x))
 
 namespace effort_controllers
 {