-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* readme updates for clarification * fix github alert indent
- Loading branch information
Showing
1 changed file
with
30 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -104,20 +104,26 @@ This is primarily for reference, and if you are running MacOS then you should be | |
xhost + localhost | ||
``` | ||
> [!IMPORTANT] | ||
> This must be run in the xterm window opened by default by XQuartz _every time_ XQuartz is started | ||
> [!IMPORTANT] | ||
> This must be run in the xterm window opened by default by XQuartz _every time_ XQuartz is started | ||
7. Add the following option whenever you run `docker run`: | ||
7. Run a command that invokes a GUI via `docker compose`, e.g. | ||
```text | ||
--env DISPLAY=host.docker.internal:0 | ||
docker compose run autobike python3 src/unrosified/state_pred/bike_sim.py | ||
``` | ||
This is already provided in [`docker-compose.yml`](./docker-compose.yml), so there is no need to pass any flags when using `docker compose`. Try it out with: | ||
FIXME: while we are switching over to ROS, this command probably won't work :( | ||
```text | ||
docker compose run autobike python3 src/state_pred/bike_sim.py | ||
``` | ||
> [!NOTE] | ||
> If you are using `docker run` (not recommended), you need to add the follow option: | ||
> | ||
> ```text | ||
> --env DISPLAY=host.docker.internal:0 | ||
> ``` | ||
> | ||
> This is already provided in [`docker-compose.yml`](./docker-compose.yml), so | ||
> there is no need to pass any flags when using `docker compose`. | ||
#### Linux | ||
|
@@ -164,6 +170,14 @@ No clue. | |
|
||
## Running the Software | ||
|
||
> [!NOTE] | ||
> These steps assume you are in the top level of your copy of the repository. If you | ||
> haven't already, clone the repository onto your machine: | ||
> | ||
> ```bash | ||
> git clone [email protected]:da-luce/cornell-autobike.git | ||
> ``` | ||
### 1. Build the Image | ||
If it is your first time running the code with Docker or there have been changes made to the Dockerfile, you need to build the Docker image: | ||
|
@@ -385,7 +399,7 @@ flowchart TD | |
%% Sensors Input Layer | ||
sensors:::graySubgraph | ||
subgraph sensors[Sensors] | ||
depth(ZED 2 Depth) | ||
depth(ZED 2 Depth):::orange | ||
camera(Visual Camera) | ||
gps(GPS) | ||
rtk(RTK) | ||
|
@@ -399,6 +413,7 @@ flowchart TD | |
subsystem:::graySubgraph | ||
subgraph subsystem[Bike Subsystem] | ||
end | ||
current(Currently Working On):::orange | ||
end | ||
%% Perception Layer | ||
|
@@ -420,9 +435,9 @@ flowchart TD | |
end | ||
boundary_detection(Boundary & Lane Detection) | ||
grid(Occupancy Grid) | ||
grid(Occupancy Grid):::orange | ||
localization(Localization) | ||
c_space(Configuration Space) | ||
c_space(Configuration Space):::orange | ||
object_detection -->|/perception/objects| c_space | ||
boundary_detection -->|/perception/boundaries| c_space | ||
|
@@ -439,17 +454,17 @@ flowchart TD | |
decision_making(Decision Making) | ||
ui(<a href='https://github.com/dheera/rosboard'>rosboard</a>) | ||
path_planning(Hybrid A* Planning) | ||
path_planning(Hybrid A* Planning):::orange | ||
pure_pursuit(Pure Pursuit):::orange | ||
end | ||
waypoints(Static Waypoint Routing) | ||
waypoints -->|/planning/waypoints| path_planning | ||
decision_making -->|/planning/throttle| control | ||
decision_making -->|/planning/braking| control | ||
path_planning -->|/planning/steering_angle| control | ||
path_planning -->|/planning/path| pure_pursuit | ||
pure_pursuit -->|/planning/steering_velocity| control | ||
%% Control Layer | ||
control:::graySubgraph | ||
|