Skip to content

Commit ce5e5d2

Browse files
committed
Merge branch 'feature/pixi' of github.com:bit-bots/bitbots_main into feature/pixi
2 parents dd85941 + 897bbda commit ce5e5d2

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ alternatively, you can run individual commands inside the workspace without acti
3838
pixi run <command>
3939
```
4040

41-
To see some predefined tasks, run
41+
To see some predefined / commands, run
4242

4343
``` shell
44-
pixi run -v
44+
pixi task list
4545
```
4646

4747
## Deploy to robots

pixi.toml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,21 @@ preview = ["pixi-build"]
1212
version = "0.1.0"
1313

1414
[tasks]
15-
# Deploys the current environment
16-
deploy = "scripts/deploy_robots.py"
17-
# Runs code formatting and linting
18-
_format = "pre-commit run --all-files"
19-
format = [{ task = "_format", environment = "format" }]
15+
deploy = {cmd = "scripts/deploy_robots.py", description = "Deploys the current environment."}
16+
format = {cmd = "pre-commit run --all-files", description = "Runs code formatting and linting."}
2017

21-
# Builds all ROS 2 packages or a specific one if given
2218
[tasks.build]
23-
cmd = "colcon build --symlink-install --cmake-args -G Ninja {{ '--packages-select ' + package if package }}"
24-
args = [{ arg = "package", default = "" }]
19+
cmd = "colcon build --symlink-install --cmake-args -G Ninja "
20+
description = "Builds all ROS 2 packages. Add --packages-select <package names> to build specific packages."
2521

26-
# Cleans all build and install files or those of a specific package if given
2722
[tasks.clean]
28-
cmd = "rm -rf build/{{ package }} install/{{ package }} {{ 'log' if not package }}"
23+
cmd = "rm -rf 'build/{{ package }}' 'install/{{ package }}' {{ 'log' if not package }}"
2924
args = [{ arg = "package", default = "" }]
25+
description = "Cleans build and install files for all ROS 2 packages or a specific one if given."
3026

31-
# Runs tests for all ROS 2 packages or a specific one if given
3227
[tasks.test]
33-
cmd = "colcon test --event-handlers console_direct+ --return-code-on-test-failure {{ '--packages-select ' + package if package }}"
34-
args = [{ arg = "package", default = "" }]
28+
cmd = "colcon test --event-handlers console_direct+ --return-code-on-test-failure "
29+
description = "Runs tests for all ROS 2 packages. Add --packages-select <package names> to test specific packages."
3530

3631

3732
[dependencies]

src/bitbots_navigation/bitbots_rust_nav/src/obstacle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl RoundObstacle {
4141
let radius = self.radius + offset;
4242
Coord::from(self.center) + Coord::from((radius * angle.cos(), radius * angle.sin()))
4343
})
44-
.collect::<Vec<Coord>>()
44+
.collect()
4545
}
4646
}
4747

0 commit comments

Comments
 (0)