Skip to content

Commit 0a5c75d

Browse files
committed
Merge branch 'Reexport' into attitude-control
2 parents 362c9c2 + e8af10d commit 0a5c75d

File tree

3 files changed

+34
-21
lines changed

3 files changed

+34
-21
lines changed

.devcontainer/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@ RUN apt-get install -y libxt6 libxrender1 libxext6 libgl1-mesa-glx libqt5widgets
1616

1717
# Install `Plots.jl and precompile it`
1818
RUN julia -e 'using Pkg; Pkg.REPLMode.pkgstr("add Plots;precompile");using Plots'
19+
20+
# Install `Reexport.jl`
21+
RUN julia -e 'import Pkg; Pkg.add("Reexport")'
22+

main.jl

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
using LinearAlgebra
2-
3-
# Include module `AttitudeDynamics`
4-
include("src/AttitudeDynamics.jl")
5-
import .AttitudeDynamics
6-
7-
# Include module `TimeLine`
8-
include("src/TimeLine.jl")
9-
import .TimeLine as tl
10-
11-
# Include module `PlotGenerator`
12-
include("src/PlotGenerator.jl")
13-
import .PlotGenerator as plt
14-
1+
include("src/FlexibleSpacecraft.jl")
2+
using .FlexibleSpacecraft
153

164
# Inertia matrix
175
Inertia = diagm([1.0, 1.0, 2.0])
@@ -35,18 +23,18 @@ time = 0:Ts:simulationTime
3523
simDataNum = round(Int, simulationTime/Ts) + 1;
3624

3725
# Coordinate system of a
38-
coordinateA = tl.CoordinateVector(
26+
coordinateA = TimeLine.CoordinateVector(
3927
[1, 0, 0],
4028
[0, 1, 0],
4129
[0, 0, 1]
4230
)
4331

4432
# Coordinate system of b
45-
coordinateB = tl.initBodyCoordinate(simDataNum, coordinateA)
33+
coordinateB = TimeLine.initBodyCoordinate(simDataNum, coordinateA)
4634

47-
omegaBA = tl.initAngularVelocity(simDataNum, [0, 0, 1])
35+
omegaBA = TimeLine.initAngularVelocity(simDataNum, [0, 0, 1])
4836

49-
quaternion = tl.initQuaternion(simDataNum, [0, 0, 0, 1])
37+
quaternion = TimeLine.initQuaternion(simDataNum, [0, 0, 0, 1])
5038

5139
println("Begin simulation!")
5240
for loopCounter = 1:simDataNum-1
@@ -68,13 +56,13 @@ for loopCounter = 1:simDataNum-1
6856
end
6957
println("Simulation is completed!")
7058

71-
# fig1 = plt.plotAngularVelocity(time, omegaBA)
59+
# fig1 = PlotGenerator.plotAngularVelocity(time, omegaBA)
7260
# display(fig1)
7361

7462

75-
fig2 = plt.getCoordinateGif(time, Ts, coordinateA, coordinateB)
63+
fig2 = PlotGenerator.getCoordinateGif(time, Ts, coordinateA, coordinateB)
7664
display(fig2)
7765

7866
# bodyCoordinate = TimeLine.extractCoordinateVector(10, Ts, coordinateB)
79-
# fig3 = plt.plotCoordinate(10, coordinateA, bodyCoordinate)
67+
# fig3 = PlotGenerator.plotCoordinate(10, coordinateA, bodyCoordinate)
8068
# display(fig3)

src/FlexibleSpacecraft.jl

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
module FlexibleSpacecraft
2+
3+
using Reexport
4+
5+
@reexport using LinearAlgebra
6+
7+
8+
# Include module `AttitudeDynamics`
9+
include("AttitudeDynamics.jl")
10+
@reexport using .AttitudeDynamics
11+
12+
13+
# Include module `TimeLine`
14+
include("TimeLine.jl")
15+
@reexport using .TimeLine
16+
17+
# Include module `PlotGenerator`
18+
include("PlotGenerator.jl")
19+
@reexport using .PlotGenerator
20+
21+
end # module

0 commit comments

Comments
 (0)