Commit 842836f0 authored by Olivier Stasse's avatar Olivier Stasse
Browse files

Revert "Adapt to parameter-server modification."

This reverts commit a26a533d.
parent 5dec4545
......@@ -536,7 +536,9 @@ def create_dcm_com_controller(Kp, Ki, dt, robot, dcmSignal):
return controller
def fill_parameter_server(param_server,conf, dt, robot_name='robot'):
def create_parameter_server(conf, dt, robot_name='robot'):
param_server = ParameterServer("param_server")
# Init should be called before addCtrlMode
# because the size of state vector must be known.
param_server.init(dt, conf.urdfFileName, robot_name)
......@@ -573,9 +575,6 @@ def fill_parameter_server(param_server,conf, dt, robot_name='robot'):
return param_server
def create_parameter_server(conf, dt, robot_name='robot'):
param_server = ParameterServer("param_server")
fill_parameter_server(param_server,conf,dt,robot_name)
def create_example(robot_name='robot', firstAdd=0., secondAdd=0.):
example = Example('example')
......@@ -697,3 +696,4 @@ def reload_folder(robot, folder, zmp=False):
set_trigger(robot, False)
load_folder(robot, folder, zmp)
set_trigger(robot, True)
......@@ -31,7 +31,7 @@ g = 9.81
omega = sqrt(g / h)
# --- Parameter server
fill_parameter_server(robot.param_server,param_server_conf, dt)
robot.param_server = create_parameter_server(param_server_conf, dt)
# --- Initial feet and waist
robot.dynamic.createOpPoint('LF', robot.OperationalPointsMap['left-ankle'])
......
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