diff --git a/sw/simulator/scilab/q3d/Makefile b/sw/simulator/scilab/q3d/Makefile index c90291cce3..0fcfc631b1 100644 --- a/sw/simulator/scilab/q3d/Makefile +++ b/sw/simulator/scilab/q3d/Makefile @@ -7,4 +7,4 @@ out.mpg: ffmpeg -f image2 -i images/frame_%04d.ppm out.mpg clean: - rm images/* \ No newline at end of file + rm -f *~ \#*\# \ No newline at end of file diff --git a/sw/simulator/scilab/q6d/q6d_diff_flatness.sci b/sw/simulator/scilab/q6d/q6d_diff_flatness.sci index b7275ff83e..452d14a55b 100644 --- a/sw/simulator/scilab/q6d/q6d_diff_flatness.sci +++ b/sw/simulator/scilab/q6d/q6d_diff_flatness.sci @@ -78,7 +78,7 @@ function [state] = df_state_of_fo(fo) adv = (axpsi*adxpsi + z2dmg*fo(3,4))/av; phid = sign(z2dmg)*(adypsi*av-adv*aypsi)/(aypsi^2+av^2); - thetad = (adxpsi*z2dmg-z3d*aypsi)/(axpsi^2+z2dmg^2); + thetad = (adxpsi*z2dmg-z3d*axpsi)/(axpsi^2+z2dmg^2); cphi = cos(state(DF_REF_PHI)); sphi = sin(state(DF_REF_PHI)); diff --git a/sw/simulator/scilab/q6d/q6d_povray.sci b/sw/simulator/scilab/q6d/q6d_povray.sci new file mode 100644 index 0000000000..3382cc7713 --- /dev/null +++ b/sw/simulator/scilab/q6d/q6d_povray.sci @@ -0,0 +1,34 @@ + +function povray_draw( time, diff_flat_ref ) + + dt_display = 1/25; + + t_idx = 1; + f_idx = 1; + t = time(t_idx); + while (t_idx translate <%f,%f,%f>}",-phi,psi,-theta,x,y,z); + mclose(fid); + cmd = sprintf('povray povray/q3d.pov +Opovray/foo%04d.png Display=false +W800 +H600 +Q9 +A0.3 +R5', f_idx); + a = unix_g(cmd); + while (t_idx