tdehaeze/nass-simscape
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the Rz reference: offset added after filter

Browse Source
This commit is contained in:
Thomas Dehaeze 2020-02-04 10:28:05 +01:00
parent b2ca19bf05
commit cfc4cf28f5
4 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
simscape_subsystems/index.org
View File

@ -506,12 +506,11 @@ The Simscape model of the Spindle is composed of:
:END:
#+begin_src matlab
arguments
args.rigid logical {mustBeNumericOrLogical} = false
args.x0 (1,1) double {mustBeNumeric} = 0 % [m]
args.y0 (1,1) double {mustBeNumeric} = 0 % [m]
args.z0 (1,1) double {mustBeNumeric} = 0 % [m]
args.rx0 (1,1) double {mustBeNumeric} = 0 % [rad]
args.ry0 (1,1) double {mustBeNumeric} = 0 % [rad]
args.x0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [m]
args.y0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [m]
args.z0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [m]
args.rx0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [rad]
args.ry0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [rad]
end
#+end_src
@ -1211,12 +1210,15 @@ The =sample= structure is saved.
Rzd(:) = 0;
Rzdd(:) = 0;
case 'rotating'
Rz(:) = args.Rz_amplitude+2*pi/args.Rz_period*t;
Rz(:) = 2*pi/args.Rz_period*t;
% The signal is filtered out
Rz = lsim(H_lpf, Rz, t);
Rzd = lsim(H_lpf*s, Rz, t);
Rzdd = lsim(H_lpf*s^2, Rz, t);
% We add the angle offset
Rz = Rz + args.Rz_amplitude;
otherwise
warning('Rz_type is not set correctly');
end

BIN
simscape_subsystems/spindle_D.slx
View File

Binary file not shown.

5
src/initializeReferences.m
View File

@ -122,12 +122,15 @@ switch args.Rz_type
Rzd(:) = 0;
Rzdd(:) = 0;
case 'rotating'
Rz(:) = args.Rz_amplitude+2*pi/args.Rz_period*t;
Rz(:) = 2*pi/args.Rz_period*t;
% The signal is filtered out
Rz = lsim(H_lpf, Rz, t);
Rzd = lsim(H_lpf*s, Rz, t);
Rzdd = lsim(H_lpf*s^2, Rz, t);
% We add the angle offset
Rz = Rz + args.Rz_amplitude;
otherwise
warning('Rz_type is not set correctly');
end

11
src/initializeRz.m
View File

@ -1,12 +1,11 @@
function [rz] = initializeRz(args)
arguments
args.rigid logical {mustBeNumericOrLogical} = false
args.x0 (1,1) double {mustBeNumeric} = 0 % [m]
args.y0 (1,1) double {mustBeNumeric} = 0 % [m]
args.z0 (1,1) double {mustBeNumeric} = 0 % [m]
args.rx0 (1,1) double {mustBeNumeric} = 0 % [rad]
args.ry0 (1,1) double {mustBeNumeric} = 0 % [rad]
args.x0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [m]
args.y0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [m]
args.z0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [m]
args.rx0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [rad]
args.ry0 (1,1) double {mustBeNumeric} = 0 % Equilibrium position of the Joint [rad]
end
rz = struct();