Commit d2d3ec09 authored by Olivier Stasse's avatar Olivier Stasse

Changed base-estimator into talos-base-estimator

Fixe on talos-control-manager.
parent 27d49a5b
......@@ -82,10 +82,10 @@ namespace dynamicgraph {
/** Avoids singularity while taking the mean of euler angles**/
double wEulerMean(double a1, double a2, double w1, double w2);
class SOTBASEESTIMATOR_EXPORT BaseEstimator
class SOTBASEESTIMATOR_EXPORT TalosBaseEstimator
:public::dynamicgraph::Entity
{
typedef BaseEstimator EntityClassName;
typedef TalosBaseEstimator EntityClassName;
typedef pinocchio::SE3 SE3;
typedef Eigen::Vector2d Vector2;
typedef Eigen::Vector3d Vector3;
......@@ -101,7 +101,7 @@ namespace dynamicgraph {
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
/* --- CONSTRUCTOR ---- */
BaseEstimator( const std::string & name );
TalosBaseEstimator( const std::string & name );
void init(const double & dt, const std::string& urdfFile);
......@@ -249,7 +249,7 @@ namespace dynamicgraph {
Vector3 m_last_DCvel;
Vector3 m_last_DCacc;
}; // class BaseEstimator
}; // class TalosBaseEstimator
} // namespace talos_balance
} // namespace sot
......
......@@ -14,7 +14,7 @@
* with sot-talos-balance. If not, see <http://www.gnu.org/licenses/>.
*/
#include "sot/talos_balance/admittance-controller.hh"
#include "sot/talos_balance/simple-admittance-controller.hh"
#include <sot/core/debug.hh>
#include <dynamic-graph/factory.h>
......
......@@ -14,7 +14,7 @@
* with sot-torque-control. If not, see <http://www.gnu.org/licenses/>.
*/
#include <sot/talos_balance/base-estimator.hh>
#include <sot/talos_balance/talos-base-estimator.hh>
#include <sot/core/debug.hh>
#include <dynamic-graph/factory.h>
#include <dynamic-graph/all-commands.h>
......
......@@ -14,7 +14,7 @@
* with sot-torque-control. If not, see <http://www.gnu.org/licenses/>.
*/
#include <sot/talos_balance/control-manager.hh>
#include <sot/talos_balance/talos-control-manager.hh>
#include <sot/core/debug.hh>
#include <dynamic-graph/factory.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment