Skip to content

Commit 0cc9564

Browse files
author
Gabriele
committed
update wbs controller and plotting scripts
1 parent 213f0bb commit 0cc9564

17 files changed

+19147
-25780
lines changed

controllers/+floatingBaseBalancingTorqueControlWithSimulator/app/robots/iCubGazeboV2_5/configRobot.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
% Frames list
3939
Frames.BASE = 'root_link';
40-
Frames.IMU = 'imu_frame';
40+
Frames.IMU = 'imu_head_0';
4141
Frames.LEFT_FOOT = 'l_sole';
4242
Frames.RIGHT_FOOT = 'r_sole';
4343
Frames.COM = 'com';
@@ -100,4 +100,4 @@
100100
Ports.NECK_POS_PORT_SIZE = 3;
101101
Ports.IMU_PORT_SIZE = 12;
102102
Ports.IMU_PORT_ORIENTATION_INDEX = [1,2,3];
103-
Ports.WRENCH_PORT_SIZE = 6;
103+
Ports.WRENCH_PORT_SIZE = 6;

controllers/+floatingBaseBalancingTorqueControlWithSimulator/app/robots/iCubGazeboV2_5/configRobotSim.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
% Robot frames list
7575
FramesSim.BASE = 'root_link';
76-
FramesSim.IMU = 'imu_frame';
76+
FramesSim.IMU = 'imu_head_0';
7777
FramesSim.LEFT_FOOT = 'l_sole';
7878
FramesSim.RIGHT_FOOT = 'r_sole';
7979
FramesSim.COM = 'com';

controllers/+floatingBaseBalancingTorqueControlWithSimulator/app/robots/iCubGazeboV2_5/gainsAndReferences.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -341,4 +341,4 @@
341341
Config.noOscillationTime = 0;
342342
Config.directionOfOscillation = [0;1;0];
343343
Config.amplitudeOfOscillation = 0.02; % [m]
344-
Config.frequencyOfOscillation = 0.2; % [Hz]
344+
Config.frequencyOfOscillation = 0.2; % [Hz]

controllers/+floatingBaseBalancingTorqueControlWithSimulator/initTorqueControlBalancingWithSimu.m

+7-7
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
%
3232
% If you are simulating the robot with Gazebo, remember that it is required
3333
% to launch Gazebo as follows:
34-
%
34+
%
3535
% gazebo -slibgazebo_yarp_clock.so
36-
%
36+
%
3737
% and properly set the environmental variable YARP_ROBOT_NAME in the .bashrc.
3838

39-
% Simulation time in seconds. For long simulations, put an high number
39+
% Simulation time in seconds. For long simulations, put an high number
4040
% (not inf) for allowing automatic code generation
4141
Config.SIMULATION_TIME = 100;
4242

@@ -50,10 +50,10 @@
5050
%
5151
% 'YOGA': the robot will perform the YOGA++ demo (highly dynamic movements
5252
% while balancing on one foot and two feet)
53-
%
53+
%
5454
% 'COORDINATOR': the robot can either balance on two feet or move from left
5555
% to right follwing a desired center-of-mass trajectory.
56-
%
56+
%
5757
DEMO_TYPE = 'YOGA';
5858

5959
% Config.SCOPES: debugging scopes activation
@@ -90,8 +90,8 @@
9090
if strcmpi(DEMO_TYPE, 'COORDINATOR')
9191

9292
Config.COORDINATOR_DEMO = true;
93-
93+
9494
elseif strcmpi(DEMO_TYPE, 'YOGA')
95-
95+
9696
Config.COORDINATOR_DEMO = false;
9797
end

controllers/+floatingBaseBalancingTorqueControlWithSimulator/src-static-gui/closeModel.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
rmpath('../../library/matlab-gui');
1818
rmpath('./src-static-gui');
1919

20-
disp('[closeModel]: done.')
20+
disp('[closeModel]: done.')

controllers/+floatingBaseBalancingTorqueControlWithSimulator/src-static-gui/compileModel.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
torqueControlBalancing([], [], [], 'term')
1313

1414
catch ME
15-
15+
1616
errorMessages = ME;
1717
end
1818

@@ -21,4 +21,4 @@
2121
disp('Compilation done.')
2222

2323
% warning about Simulink timing
24-
warning('The model will anyways start with FEW SECONDS OF DELAY after pressing the ''Start Model'' button.')
24+
warning('The model will anyways start with FEW SECONDS OF DELAY after pressing the ''Start Model'' button.')

controllers/+floatingBaseBalancingTorqueControlWithSimulator/src/EventWithEncoderSpikes.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
classdef EventWithEncoderSpikes < Simulink.IntEnumType
22
%EVENTWITHENCODERSPIKES Class for selecting a None, Warning or EmergencyStop signal
3-
%
3+
%
44
% Class for selecting a None, Warning or EmergencyStop signal triggered by an encoder spike
55
% event.
6-
6+
77
enumeration
88
None(0)
99
Warning(1)

controllers/+floatingBaseBalancingTorqueControlWithSimulator/src/EventWithJointLimits.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%
44
% Class for selecting a None, Warning or EmergencyStop signal triggered by the joints hitting
55
% the limits.
6-
6+
77
enumeration
88
None(0)
99
Warning(1)

0 commit comments

Comments
 (0)