diff --git a/.ci/build_deps.sh b/.ci/build_deps.sh
index 581215c82..5059b321c 100755
--- a/.ci/build_deps.sh
+++ b/.ci/build_deps.sh
@@ -91,9 +91,8 @@ cmake --build . --config ${TRAVIS_BUILD_TYPE} --target install
# Build and install osqp
cd $GIT_FOLDER
rm -rf osqp
-git clone --recursive https://github.com/robotology-dependencies/osqp.git
+git clone --recursive https://github.com/oxfordcontrol/osqp.git
cd osqp
-git checkout fix-lf-problems
mkdir -p build && cd build
cmake -G"${TRAVIS_CMAKE_GENERATOR}" \
-DCMAKE_BUILD_TYPE=${TRAVIS_BUILD_TYPE} \
@@ -106,7 +105,6 @@ cd $GIT_FOLDER
rm -rf OsqpEigen
git clone https://github.com/robotology/osqp-eigen.git OsqpEigen
cd OsqpEigen
-git checkout v0.4.1
mkdir -p build && cd build
cmake -G"${TRAVIS_CMAKE_GENERATOR}" \
-DCMAKE_BUILD_TYPE=${TRAVIS_BUILD_TYPE} \
diff --git a/conf/xml/RobotStateProvider_Atlas.xml b/conf/xml/RobotStateProvider_Atlas.xml
index 798071622..6f0f35d10 100644
--- a/conf/xml/RobotStateProvider_Atlas.xml
+++ b/conf/xml/RobotStateProvider_Atlas.xml
@@ -26,6 +26,7 @@
1.0
1.0
0.001
+ Atlas
- QP
+ sparseRobustCholeskyDecomposition
0.0
1.0
diff --git a/conf/xml/RobotStateProvider_Baxter.xml b/conf/xml/RobotStateProvider_Baxter.xml
index a1dccad24..9f6e0f925 100644
--- a/conf/xml/RobotStateProvider_Baxter.xml
+++ b/conf/xml/RobotStateProvider_Baxter.xml
@@ -26,6 +26,7 @@
1.0
1.0
0.001
+ Baxter
- QP
+ sparseRobustCholeskyDecomposition
0.0
1.0
diff --git a/conf/xml/RobotStateProvider_Nao.xml b/conf/xml/RobotStateProvider_Nao.xml
index f9d9370d5..decf2a6b5 100644
--- a/conf/xml/RobotStateProvider_Nao.xml
+++ b/conf/xml/RobotStateProvider_Nao.xml
@@ -26,6 +26,7 @@
1.0
1.0
0.001
+ Nao
- QP
+ sparseRobustCholeskyDecomposition
0.0
1.0
@@ -131,7 +132,7 @@
/Walkman/base_link
/Walkman/joint_states
walkman
- (0.0 5.0 0.0)
+ (0.0 8.0 0.0)
diff --git a/conf/xml/RobotStateProvider_iCub.xml b/conf/xml/RobotStateProvider_iCub.xml
index adcfc581b..3613d703c 100644
--- a/conf/xml/RobotStateProvider_iCub.xml
+++ b/conf/xml/RobotStateProvider_iCub.xml
@@ -26,6 +26,7 @@
1.0
1.0
0.001
+ iCub