Skip to content

Commit 006f6a9

Browse files
Gui-FernandesBRGui-FernandesBR
authored
Merge branch 'develop' into enh/sim-encoding
2 parents 7834947 + 2218f0f commit 006f6a9

File tree

88 files changed

+54311
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+54311
-218
lines changed

‎.vscode/settings.json

+1
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

+10-2
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,26 @@ Attention: The newest changes should be on top -->
3333
### Added
3434

3535
- ENH: Allow for Alternative and Custom ODE Solvers. [#748](https://github.com/RocketPy-Team/RocketPy/pull/748)
36-
- ENH: Expansion of Encoders Implementation for Full Flights. [#679](https://github.com/RocketPy-Team/RocketPy/pull/679)
36+
- DOC: EREBUS Flight Example [#757](https://github.com/RocketPy-Team/RocketPy/pull/757))
37+
- DOC: Lince Flight Example [#752](https://github.com/RocketPy-Team/RocketPy/pull/752)
38+
- DOC: Andromeda Flight Example [#754](https://github.com/RocketPy-Team/RocketPy/pull/754)
39+
- ENH: create a dataset of pre-registered motors. See #664 [#744](https://github.com/RocketPy-Team/RocketPy/pull/744)
40+
- DOC: add Defiance flight example [#742](https://github.com/RocketPy-Team/RocketPy/pull/742)
41+
- ENH: Allow for Alternative and Custom ODE Solvers. [#748](https://github.com/RocketPy-Team/RocketPy/pull/748)
3742

3843
### Changed
3944

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

4249
### Fixed
4350

4451
-
4552

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

55+
4856
### Changed
4957

5058
- REL: update version to 1.7.1 in configuration files [#750](https://github.com/RocketPy-Team/RocketPy/pull/750)

‎.github/CITATION.cff ‎CITATION.cff

File renamed without changes.

‎data/motors/aerotech/AeroTech_HP-L1000W.eng

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
; per AT announcement 5/8/14
2+
L1000 54 635 18 1.4000000000000001 2.194 AT
3+
0.004 10.664
4+
0.011 1268.961
5+
0.04 1322.279
6+
0.195 1226.307
7+
0.249 1268.961
8+
0.296 1242.303
9+
0.372 1252.966
10+
0.416 1215.644
11+
0.6 1226.307
12+
0.788 1215.644
13+
1.066 1183.653
14+
1.261 1167.658
15+
1.507 1125.004
16+
1.746 1087.681
17+
1.865 1050.359
18+
1.995 1045.027
19+
2.093 911.733
20+
2.158 746.448
21+
2.263 554.504
22+
2.389 405.215
23+
2.577 191.944
24+
2.693 85.308
25+
2.761 42.654
26+
3.0 0.0

‎data/motors/aerotech/AeroTech_K1000T.eng

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
; Based on AT Instruction Sheet by C. Kobel 3/17/2010
2+
K1000T-P 75 396 P 1.182 2.575 AT
3+
0.0040 895.149
4+
0.015 1119.762
5+
0.025 1093.337
6+
0.095 1096.640
7+
0.200 1109.853
8+
0.300 1116.459
9+
0.400 1123.065
10+
0.500 1132.975
11+
0.600 1139.581
12+
0.700 1136.278
13+
0.800 1136.278
14+
0.900 1136.278
15+
1.000 1139.581
16+
1.100 1132.975
17+
1.200 1129.672
18+
1.300 1126.369
19+
1.400 1119.762
20+
1.500 1109.853
21+
1.600 1096.640
22+
1.700 1063.609
23+
1.800 1017.365
24+
1.900 971.121
25+
2.000 914.968
26+
2.100 868.724
27+
2.180 865.421
28+
2.200 878.634
29+
2.218 858.815
30+
2.269 670.536
31+
2.300 578.048
32+
2.332 445.923
33+
2.356 336.920
34+
2.389 224.613
35+
2.436 105.7
36+
2.500 0.0

‎data/motors/aerotech/AeroTech_K400C.eng

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
; Aerotech K400C DMS
2+
K400C 54 359 14 0.493 1.194 AT
3+
0.008 376.374
4+
0.025 526.181
5+
0.034 548.466
6+
0.063 500.182
7+
0.178 527.419
8+
0.394 522.467
9+
0.69 502.658
10+
1.003 487.801
11+
1.494 446.944
12+
2.002 402.374
13+
2.243 377.612
14+
2.501 363.994
15+
2.658 354.089
16+
2.772 337.994
17+
2.844 304.566
18+
2.882 268.662
19+
2.929 177.044
20+
2.963 116.379
21+
3.001 99.046
22+
3.064 94.094
23+
3.123 61.904
24+
3.208 18.571
25+
3.259 0.0

‎data/motors/aerotech/AeroTech_K480W.eng

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
; From AT Instruction Sheet by C. Kobel 3/12/10
2+
K480W-P 54 568 P 1.232 2.059 AT
3+
0.030 535.684
4+
0.045 860.341
5+
0.057 915.996
6+
0.098 830.194
7+
0.159 832.513
8+
0.246 795.409
9+
0.307 811.642
10+
0.398 793.090
11+
0.492 809.323
12+
0.557 823.237
13+
0.621 811.642
14+
0.689 779.176
15+
0.735 795.409
16+
0.845 767.581
17+
0.989 718.883
18+
1.091 707.288
19+
1.250 684.098
20+
1.307 667.865
21+
1.500 653.952
22+
1.606 656.271
23+
1.742 651.633
24+
1.909 628.443
25+
2.000 605.253
26+
2.250 586.701
27+
2.500 565.830
28+
2.750 547.279
29+
2.886 544.960
30+
3.000 524.089
31+
3.064 491.623
32+
3.144 417.416
33+
3.250 394.226
34+
3.292 338.571
35+
3.451 271.320
36+
3.500 231.898
37+
3.625 178.561
38+
3.700 143.777
39+
3.871 132.182
40+
4.000 88.121
41+
4.133 41.742
42+
4.246 23.190
43+
4.500 18.552
44+
4.800 0.0

‎data/motors/aerotech/AeroTech_K990DM.eng

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
; Aerotech K990DM 54/2800
2+
K990DM 54 598 14 1.224 2.109 AT
3+
0.016 35.558
4+
0.024 223.805
5+
0.028 868.03
6+
0.036 1068.828
7+
0.044 895.222
8+
0.048 863.847
9+
0.06 840.839
10+
0.228 966.337
11+
0.286 953.788
12+
0.369 964.246
13+
0.407 993.529
14+
0.423 976.796
15+
0.498 989.345
16+
0.694 1024.903
17+
0.865 1043.728
18+
0.962 1054.186
19+
1.117 1054.186
20+
1.282 1029.087
21+
1.51 983.071
22+
1.589 960.063
23+
1.688 953.788
24+
1.732 968.429
25+
1.748 1001.895
26+
1.778 957.971
27+
1.802 891.038
28+
1.857 671.416
29+
1.913 447.611
30+
1.97 223.805
31+
2.006 129.682
32+
2.063 46.016
33+
2.097 14.641
34+
2.137 0.0

‎data/motors/aerotech/AeroTech_L1040DM.eng

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
; L1040 Dark Matter
2+
L1040DM-P 75 681 P 2.602 4.7170000000000005 AT
3+
0.018 1126.167
4+
0.042 1036.413
5+
0.053 1002.543
6+
0.116 988.995
7+
0.504 1049.961
8+
0.794 1095.685
9+
1.002 1146.489
10+
1.252 1192.213
11+
1.499 1237.937
12+
1.753 1261.646
13+
1.912 1268.42
14+
2.095 1254.872
15+
2.511 1134.635
16+
2.772 1056.734
17+
3.012 966.98
18+
3.153 933.11
19+
3.217 863.677
20+
3.291 817.953
21+
3.34 758.681
22+
3.488 438.613
23+
3.552 284.505
24+
3.598 220.153
25+
3.657 167.655
26+
3.746 118.544
27+
3.88 42.337
28+
3.996 6.774
29+
4.127 0.0

‎data/motors/aerotech/AeroTech_L1940X.eng

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
; from TMT document and posted thrust curve
2+
L1940X 75 560.4 P 1.8234317999999998 3.855515 AT
3+
0.02 48.137
4+
0.04 2107.333
5+
0.055 2289.184
6+
0.073 2150.122
7+
0.156 2101.985
8+
0.397 2150.122
9+
0.691 2155.47
10+
0.982 2118.03
11+
1.41 2000.362
12+
1.696 1898.739
13+
1.935 1839.905
14+
2.06 1818.511
15+
2.103 1652.705
16+
2.116 1374.58
17+
2.133 935.998
18+
2.163 534.856
19+
2.214 240.685
20+
2.244 112.32
21+
2.296 5.349
22+
2.309 0.0

‎data/motors/aerotech/AeroTech_L2200G.eng

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
; Curvefit of Aerotech Instructions by C. Kobel 11/19/08
2+
L2200G 75 665 0-6-10-14-18 2.516 4.751 AT
3+
0.011 1195.177
4+
0.024 2029.903
5+
0.037 2380.868
6+
0.050 2542.122
7+
0.100 2570.578
8+
0.150 2561.093
9+
0.200 2523.151
10+
0.250 2485.208
11+
0.300 2523.151
12+
0.350 2570.578
13+
0.400 2674.919
14+
0.500 2912.057
15+
0.600 3073.311
16+
0.700 3073.311
17+
0.800 3101.768
18+
0.900 3092.282
19+
1.000 3092.282
20+
1.100 2959.485
21+
1.186 2807.716
22+
1.227 2437.781
23+
1.270 2257.556
24+
1.300 2162.701
25+
1.400 1991.961
26+
1.500 1878.135
27+
1.600 1792.765
28+
1.700 1688.424
29+
1.800 1612.54
30+
1.900 1584.083
31+
2.000 1536.656
32+
2.048 1498.714
33+
2.084 1403.858
34+
2.102 1166.72
35+
2.134 796.784
36+
2.186 455.305
37+
2.237 237.138
38+
2.300 94.855
39+
2.400 0.0

0 commit comments

Comments
 (0)