Skip to content
Snippets Groups Projects
Commit 30076ceb authored by thomascbrs's avatar thomascbrs
Browse files

back to h_ref and not the height given by the MPC

parent 81e481ca
No related branches found
No related tags found
1 merge request!4Merge devel croco 19/08/2021
......@@ -303,7 +303,7 @@ class Controller:
if (not self.error) and (not self.joystick.stop):
self.q_wbc = np.zeros((19, 1))
self.q_wbc[2, 0] = self.x_f_mpc[2, 0] # using height from mpc ant not h_ref
self.q_wbc[2, 0] = self.h_ref # using height from mpc ant not h_ref
self.q_wbc[6, 0] = 1.0 # with orientation (0.0, 0.0, 0.0)
self.q_wbc[7:, 0] = self.wbcWrapper.qdes[:] # with reference angular positions of previous loop
......@@ -315,7 +315,7 @@ class Controller:
# Feet command position, velocity and acceleration in base frame
self.feet_a_cmd = self.footTrajectoryGenerator.getFootAccelerationBaseFrame(oRh.transpose(), self.v_ref[3:6, 0:1])
self.feet_v_cmd = self.footTrajectoryGenerator.getFootVelocityBaseFrame(oRh.transpose(), self.v_ref[0:3, 0:1], self.v_ref[3:6, 0:1])
self.feet_p_cmd = self.footTrajectoryGenerator.getFootPositionBaseFrame(oRh.transpose(), np.array([[0.0], [0.0], [self.x_f_mpc[2, 0]]]) + oTh) # using height from mpc ant not h_ref
self.feet_p_cmd = self.footTrajectoryGenerator.getFootPositionBaseFrame(oRh.transpose(), np.array([[0.0], [0.0], [self.h_ref]]) + oTh) # using height from mpc ant not h_ref
# Run InvKin + WBC QP
self.wbcWrapper.compute(self.q_wbc, self.b_v,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment