Skip to content

Commit f2268f3

Browse files
takayuki5168takayuki5168
committed
Merge branch 'master' into arm-manipulation
2 parents 47b4970 + b762fd0 commit f2268f3

File tree

200 files changed

+8829
-4100
lines changed

Some content is hidden

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

200 files changed

+8829
-4100
lines changed

‎.github/FUNDING.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
patreon: myenigma
3+
custom: https://www.paypal.me/myenigmapay/

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
*.csv
2+
*.gif
3+
*.g2o
24

35
# Byte-compiled / optimized / DLL files
46
__pycache__/
@@ -66,3 +68,5 @@ target/
6668

6769
#Ipython Notebook
6870
.ipynb_checkpoints
71+
72+
matplotrecorder/*

‎.gitmodules‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.lgtm.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
extraction:
2+
python:
3+
python_setup:
4+
version: 3

‎.travis.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ language: python
33
matrix:
44
include:
55
- os: linux
6-
#- os: osx
7-
#python: "3.6-dev"
86

97
python:
108
- 3.6
@@ -20,14 +18,14 @@ before_install:
2018
- conda update -q conda
2119
# Useful for debugging any issues with conda
2220
- conda info -a
21+
- conda install python==3.6.8
2322

2423
install:
25-
- conda install numpy
24+
- conda install numpy==1.15
2625
- conda install scipy
2726
- conda install matplotlib
2827
- conda install pandas
29-
- conda install -c conda-forge lapack
30-
- conda install -c cvxgrp cvxpy
28+
- pip install cvxpy
3129
- conda install coveralls
3230

3331
script:

‎AerialNavigation/drone_3d_trajectory_following/Quadrotor.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ def transformation_matrix(self):
5151
yaw = self.yaw
5252
return np.array(
5353
[[cos(yaw) * cos(pitch), -sin(yaw) * cos(roll) + cos(yaw) * sin(pitch) * sin(roll), sin(yaw) * sin(roll) + cos(yaw) * sin(pitch) * cos(roll), x],
54-
[sin(yaw) * cos(pitch), cos(yaw) * cos(roll) + sin(yaw) * sin(pitch) *
55-
sin(roll), -cos(yaw) * sin(roll) + sin(yaw) * sin(pitch) * cos(roll), y],
54+
[sin(yaw) * cos(pitch), cos(yaw) * cos(roll) + sin(yaw) * sin(pitch)
55+
* sin(roll), -cos(yaw) * sin(roll) + sin(yaw) * sin(pitch) * cos(roll), y],
5656
[-sin(pitch), cos(pitch) * sin(roll), cos(pitch) * cos(yaw), z]
5757
])
5858

59-
def plot(self):
59+
def plot(self): # pragma: no cover
6060
T = self.transformation_matrix()
6161

6262
p1_t = np.matmul(T, self.p1)

‎AerialNavigation/drone_3d_trajectory_following/animation.gif‎

-12.1 MB
Binary file not shown.

‎AerialNavigation/drone_3d_trajectory_following/drone_3d_trajectory_following.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ def quad_sim(x_c, y_c, z_c):
7373
# des_x_pos = calculate_position(x_c[i], t)
7474
# des_y_pos = calculate_position(y_c[i], t)
7575
des_z_pos = calculate_position(z_c[i], t)
76-
des_x_vel = calculate_velocity(x_c[i], t)
77-
des_y_vel = calculate_velocity(y_c[i], t)
76+
# des_x_vel = calculate_velocity(x_c[i], t)
77+
# des_y_vel = calculate_velocity(y_c[i], t)
7878
des_z_vel = calculate_velocity(z_c[i], t)
7979
des_x_acc = calculate_acceleration(x_c[i], t)
8080
des_y_acc = calculate_acceleration(y_c[i], t)

‎AerialNavigation/rocket_powered_landing/animation.gif‎

-929 KB
Binary file not shown.

‎AerialNavigation/rocket_powered_landing/rocket_powered_landing.ipynb‎

Lines changed: 33 additions & 23 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)