Skip to content

Commit

Permalink
Merge branch 'docs/flight-comparison-improvements' into docs/bme-2022…
Browse files Browse the repository at this point in the history
…-flight-sim
  • Loading branch information
LUCKIN13 committed Dec 15, 2024
2 parents 1e95701 + 4570fd5 commit aac5918
Show file tree
Hide file tree
Showing 19 changed files with 49,784 additions and 111 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
"Krasser",
"labelrotation",
"linalg",
"Lince",
"linestyle",
"linewidth",
"linspace",
Expand Down
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,17 @@ Attention: The newest changes should be on top -->

### Added

- DOC: flight example [#742](https://github.com/RocketPy-Team/RocketPy/pull/742)

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


### Changed

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

### Fixed

Expand Down
32 changes: 32 additions & 0 deletions data/motors/cesaroni/Cesaroni_8429M2020-P.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
; Pro-75-6G IMax Plugged
8429-M2020-IM-P 75 893 P 4.349 7.0318 CTI
0.023 2070.111
0.036 1929.889
0.053 2147.601
0.073 2369.004
0.089 2505.535
0.136 2649.446
0.182 2627.306
0.262 2608.856
0.364 2616.236
0.566 2623.616
1.387 2575.646
1.639 2538.745
1.986 2450.185
2.198 2394.834
2.457 2295.203
2.708 2206.642
2.831 2162.362
2.933 2088.561
3.036 1988.93
3.109 1800.738
3.175 1594.096
3.307 1335.793
3.45 1014.76
3.589 708.487
3.698 601.476
3.814 461.255
3.996 339.483
4.115 202.952
4.201 88.561
4.301 0.0
13 changes: 13 additions & 0 deletions data/motors/cesaroni/Cesaroni_M1101.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
0 0
0.003 281.69
0.05 1436.62
0.121 1363.38
0.366 1263.85
0.59 1230.05
1.745 1322.07
2.835 1166.2
4 974.648
4.158 839.437
4.668 82.629
4.736 0

Loading

0 comments on commit aac5918

Please sign in to comment.