Skip to content

Commit

Permalink
fix broken things
Browse files Browse the repository at this point in the history
  • Loading branch information
jjshoots committed Aug 9, 2023
1 parent 5e8e5c7 commit 7bd591d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
3 changes: 2 additions & 1 deletion CrazyFlyt/models/cf2x/cf2x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ motor_params:
tau: 0.01

drag_params:
drag_coef_xyz: 1.0e-3
drag_coef_xyz: 3.0
drag_area_xyz: 4.0e-4
drag_coef_pqr: 1.0e-4

control_params:
Expand Down
2 changes: 1 addition & 1 deletion CrazyFlyt/simulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def __init__(self, start_pos: np.ndarray, start_orn: np.ndarray):
# we use a custom drone that is accurate to the real model
drone_options = dict()
drone_options["model_dir"] = os.path.join(
os.path.dirname(os.path.realpath(__file__)), "../models/"
os.path.dirname(os.path.realpath(__file__)), "./models/"
)
drone_options["drone_model"] = "cf2x"

Expand Down
2 changes: 1 addition & 1 deletion examples/sim_cube.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def shutdown_handler(*_):
signal(SIGINT, shutdown_handler)

# the cube is made up of 3x3x3 drones
dim_drones = 3
dim_drones = 2

# use meshgrid to form the coordinates for drones to form the cube
lin_range = np.array([-0.4, 0.4])
Expand Down
2 changes: 1 addition & 1 deletion examples/sim_n_fly_cube_from_scratch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from CrazyFlyt import Simulator, SwarmController

global DIM_DRONES
DIM_DRONES = 3
DIM_DRONES = 2


def shutdown_handler(*_):
Expand Down
8 changes: 3 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[build-system]
requires = ["setuptools>=61.0"]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta"

[project]
name = "CrazyFlyt"
version = "0.0.1"
version = "0.0.2"
authors = [
{ name="Jet", email="[email protected]" },
]
Expand All @@ -27,9 +27,7 @@ include-package-data = true
include = ["CrazyFlyt", "CrazyFlyt.*"]

[tool.setuptools.package-data]
crazyflyt = [
"models/**",
]
CrazyFlyt = ["models/**"]

[project.urls]
Repository = "https://github.com/jjshoots/CrazyFlyt"
Expand Down

0 comments on commit 7bd591d

Please sign in to comment.