Skip to content

Commit

Permalink
Merge branch 'develop' into enh/sim-encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
Gui-FernandesBR authored Dec 20, 2024
2 parents 7834947 + 2218f0f commit 006f6a9
Show file tree
Hide file tree
Showing 88 changed files with 54,311 additions and 218 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
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,26 @@ Attention: The newest changes should be on top -->
### Added

- ENH: Allow for Alternative and Custom ODE Solvers. [#748](https://github.com/RocketPy-Team/RocketPy/pull/748)
- ENH: Expansion of Encoders Implementation for Full Flights. [#679](https://github.com/RocketPy-Team/RocketPy/pull/679)
- DOC: EREBUS Flight Example [#757](https://github.com/RocketPy-Team/RocketPy/pull/757))
- 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

-
- ENH: Expansion of Encoders Implementation for Full Flights. [#679](https://github.com/RocketPy-Team/RocketPy/pull/679)
- MNT: move piecewise functions to separate file [#746](https://github.com/RocketPy-Team/RocketPy/pull/746)
- DOC: flight comparison improvements [#755](https://github.com/RocketPy-Team/RocketPy/pull/755)

### Fixed

-

## [v1.7.1] - 2024-12-07


### Changed

- REL: update version to 1.7.1 in configuration files [#750](https://github.com/RocketPy-Team/RocketPy/pull/750)
Expand Down
File renamed without changes.
26 changes: 26 additions & 0 deletions data/motors/aerotech/AeroTech_HP-L1000W.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
; per AT announcement 5/8/14
L1000 54 635 18 1.4000000000000001 2.194 AT
0.004 10.664
0.011 1268.961
0.04 1322.279
0.195 1226.307
0.249 1268.961
0.296 1242.303
0.372 1252.966
0.416 1215.644
0.6 1226.307
0.788 1215.644
1.066 1183.653
1.261 1167.658
1.507 1125.004
1.746 1087.681
1.865 1050.359
1.995 1045.027
2.093 911.733
2.158 746.448
2.263 554.504
2.389 405.215
2.577 191.944
2.693 85.308
2.761 42.654
3.0 0.0
36 changes: 36 additions & 0 deletions data/motors/aerotech/AeroTech_K1000T.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
; Based on AT Instruction Sheet by C. Kobel 3/17/2010
K1000T-P 75 396 P 1.182 2.575 AT
0.0040 895.149
0.015 1119.762
0.025 1093.337
0.095 1096.640
0.200 1109.853
0.300 1116.459
0.400 1123.065
0.500 1132.975
0.600 1139.581
0.700 1136.278
0.800 1136.278
0.900 1136.278
1.000 1139.581
1.100 1132.975
1.200 1129.672
1.300 1126.369
1.400 1119.762
1.500 1109.853
1.600 1096.640
1.700 1063.609
1.800 1017.365
1.900 971.121
2.000 914.968
2.100 868.724
2.180 865.421
2.200 878.634
2.218 858.815
2.269 670.536
2.300 578.048
2.332 445.923
2.356 336.920
2.389 224.613
2.436 105.7
2.500 0.0
25 changes: 25 additions & 0 deletions data/motors/aerotech/AeroTech_K400C.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
; Aerotech K400C DMS
K400C 54 359 14 0.493 1.194 AT
0.008 376.374
0.025 526.181
0.034 548.466
0.063 500.182
0.178 527.419
0.394 522.467
0.69 502.658
1.003 487.801
1.494 446.944
2.002 402.374
2.243 377.612
2.501 363.994
2.658 354.089
2.772 337.994
2.844 304.566
2.882 268.662
2.929 177.044
2.963 116.379
3.001 99.046
3.064 94.094
3.123 61.904
3.208 18.571
3.259 0.0
44 changes: 44 additions & 0 deletions data/motors/aerotech/AeroTech_K480W.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
; From AT Instruction Sheet by C. Kobel 3/12/10
K480W-P 54 568 P 1.232 2.059 AT
0.030 535.684
0.045 860.341
0.057 915.996
0.098 830.194
0.159 832.513
0.246 795.409
0.307 811.642
0.398 793.090
0.492 809.323
0.557 823.237
0.621 811.642
0.689 779.176
0.735 795.409
0.845 767.581
0.989 718.883
1.091 707.288
1.250 684.098
1.307 667.865
1.500 653.952
1.606 656.271
1.742 651.633
1.909 628.443
2.000 605.253
2.250 586.701
2.500 565.830
2.750 547.279
2.886 544.960
3.000 524.089
3.064 491.623
3.144 417.416
3.250 394.226
3.292 338.571
3.451 271.320
3.500 231.898
3.625 178.561
3.700 143.777
3.871 132.182
4.000 88.121
4.133 41.742
4.246 23.190
4.500 18.552
4.800 0.0
34 changes: 34 additions & 0 deletions data/motors/aerotech/AeroTech_K990DM.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
; Aerotech K990DM 54/2800
K990DM 54 598 14 1.224 2.109 AT
0.016 35.558
0.024 223.805
0.028 868.03
0.036 1068.828
0.044 895.222
0.048 863.847
0.06 840.839
0.228 966.337
0.286 953.788
0.369 964.246
0.407 993.529
0.423 976.796
0.498 989.345
0.694 1024.903
0.865 1043.728
0.962 1054.186
1.117 1054.186
1.282 1029.087
1.51 983.071
1.589 960.063
1.688 953.788
1.732 968.429
1.748 1001.895
1.778 957.971
1.802 891.038
1.857 671.416
1.913 447.611
1.97 223.805
2.006 129.682
2.063 46.016
2.097 14.641
2.137 0.0
29 changes: 29 additions & 0 deletions data/motors/aerotech/AeroTech_L1040DM.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
; L1040 Dark Matter
L1040DM-P 75 681 P 2.602 4.7170000000000005 AT
0.018 1126.167
0.042 1036.413
0.053 1002.543
0.116 988.995
0.504 1049.961
0.794 1095.685
1.002 1146.489
1.252 1192.213
1.499 1237.937
1.753 1261.646
1.912 1268.42
2.095 1254.872
2.511 1134.635
2.772 1056.734
3.012 966.98
3.153 933.11
3.217 863.677
3.291 817.953
3.34 758.681
3.488 438.613
3.552 284.505
3.598 220.153
3.657 167.655
3.746 118.544
3.88 42.337
3.996 6.774
4.127 0.0
22 changes: 22 additions & 0 deletions data/motors/aerotech/AeroTech_L1940X.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
; from TMT document and posted thrust curve
L1940X 75 560.4 P 1.8234317999999998 3.855515 AT
0.02 48.137
0.04 2107.333
0.055 2289.184
0.073 2150.122
0.156 2101.985
0.397 2150.122
0.691 2155.47
0.982 2118.03
1.41 2000.362
1.696 1898.739
1.935 1839.905
2.06 1818.511
2.103 1652.705
2.116 1374.58
2.133 935.998
2.163 534.856
2.214 240.685
2.244 112.32
2.296 5.349
2.309 0.0
39 changes: 39 additions & 0 deletions data/motors/aerotech/AeroTech_L2200G.eng
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
; Curvefit of Aerotech Instructions by C. Kobel 11/19/08
L2200G 75 665 0-6-10-14-18 2.516 4.751 AT
0.011 1195.177
0.024 2029.903
0.037 2380.868
0.050 2542.122
0.100 2570.578
0.150 2561.093
0.200 2523.151
0.250 2485.208
0.300 2523.151
0.350 2570.578
0.400 2674.919
0.500 2912.057
0.600 3073.311
0.700 3073.311
0.800 3101.768
0.900 3092.282
1.000 3092.282
1.100 2959.485
1.186 2807.716
1.227 2437.781
1.270 2257.556
1.300 2162.701
1.400 1991.961
1.500 1878.135
1.600 1792.765
1.700 1688.424
1.800 1612.54
1.900 1584.083
2.000 1536.656
2.048 1498.714
2.084 1403.858
2.102 1166.72
2.134 796.784
2.186 455.305
2.237 237.138
2.300 94.855
2.400 0.0
Loading

0 comments on commit 006f6a9

Please sign in to comment.