Skip to content

Commit aac5918

Browse files
committed
Merge branch 'docs/flight-comparison-improvements' into docs/bme-2022-flight-sim
2 parents 1e95701 + 4570fd5 commit aac5918

19 files changed

+49784
-111
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
"Krasser",
178178
"labelrotation",
179179
"linalg",
180+
"Lince",
180181
"linestyle",
181182
"linewidth",
182183
"linspace",

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,17 @@ Attention: The newest changes should be on top -->
3232

3333
### Added
3434

35-
- DOC: flight example [#742](https://github.com/RocketPy-Team/RocketPy/pull/742)
35+
36+
- DOC: Lince Flight Example [#752](https://github.com/RocketPy-Team/RocketPy/pull/752)
37+
- DOC: Andromeda Flight Example [#754](https://github.com/RocketPy-Team/RocketPy/pull/754)
3638
- ENH: create a dataset of pre-registered motors. See #664 [#744](https://github.com/RocketPy-Team/RocketPy/pull/744)
3739
- DOC: add Defiance flight example [#742](https://github.com/RocketPy-Team/RocketPy/pull/742)
3840
- ENH: Allow for Alternative and Custom ODE Solvers. [#748](https://github.com/RocketPy-Team/RocketPy/pull/748)
3941

42+
4043
### Changed
4144

42-
-
45+
- DOC: flight comparison improvements [#755](https://github.com/RocketPy-Team/RocketPy/pull/755)
4346

4447
### Fixed
4548

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
; Pro-75-6G IMax Plugged
2+
8429-M2020-IM-P 75 893 P 4.349 7.0318 CTI
3+
0.023 2070.111
4+
0.036 1929.889
5+
0.053 2147.601
6+
0.073 2369.004
7+
0.089 2505.535
8+
0.136 2649.446
9+
0.182 2627.306
10+
0.262 2608.856
11+
0.364 2616.236
12+
0.566 2623.616
13+
1.387 2575.646
14+
1.639 2538.745
15+
1.986 2450.185
16+
2.198 2394.834
17+
2.457 2295.203
18+
2.708 2206.642
19+
2.831 2162.362
20+
2.933 2088.561
21+
3.036 1988.93
22+
3.109 1800.738
23+
3.175 1594.096
24+
3.307 1335.793
25+
3.45 1014.76
26+
3.589 708.487
27+
3.698 601.476
28+
3.814 461.255
29+
3.996 339.483
30+
4.115 202.952
31+
4.201 88.561
32+
4.301 0.0
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
0 0
2+
0.003 281.69
3+
0.05 1436.62
4+
0.121 1363.38
5+
0.366 1263.85
6+
0.59 1230.05
7+
1.745 1322.07
8+
2.835 1166.2
9+
4 974.648
10+
4.158 839.437
11+
4.668 82.629
12+
4.736 0
13+

0 commit comments

Comments
 (0)