Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coffee Shop AI Festival #208

Merged
merged 35 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
453d2ff
build: coffee shop
jws-1 May 16, 2024
3fda8d2
refactor: get rid of datahub shit
jws-1 May 16, 2024
51121a2
refactor: use tf2_ros.
jws-1 May 16, 2024
0744b50
refactor: remove random directory?
jws-1 May 16, 2024
006bfb4
refactor: get rid of tf wrapper service.
jws-1 May 16, 2024
e09c73d
refactor: get rid of empty subpackage.
jws-1 May 16, 2024
1ac3d46
refactor: move main.py into nodes.
jws-1 May 16, 2024
82f1d38
refactor: remove leftover markdown file.
jws-1 May 16, 2024
5dfd565
refactor: use shapely directly.
jws-1 May 16, 2024
686abe1
refactor: remove lasr_shapely.
jws-1 May 16, 2024
16f30d0
refactor: use tf2_ros again.
jws-1 May 16, 2024
53c6583
build: no need to generate_messages().
jws-1 May 16, 2024
7bcfe0d
build: aruco_service
jws-1 May 16, 2024
f8e1f52
build: no need to depend on aruco_msgs.
jws-1 May 16, 2024
6084eb7
refactor: remove leftover configs.
jws-1 May 16, 2024
ce873bb
refactor: store rviz config in its own directory.
jws-1 May 16, 2024
8e7c184
refactor: don't wait for old services.
jws-1 May 16, 2024
0d49401
refactor: check_table.
jws-1 May 16, 2024
318f5d3
refactor: get rid of commented code.
jws-1 May 16, 2024
be98d3f
demo.
jws-1 May 16, 2024
f810bde
fix: don't prefix frames with '/'
jws-1 May 16, 2024
acb3250
Update launch.
jws-1 May 16, 2024
bbbd8c9
refactor: cleaning up.
jws-1 May 16, 2024
cbb59f1
refactor: more cleaning up.
jws-1 May 16, 2024
d252b0f
refactor: more more more.
jws-1 May 16, 2024
9594787
more.
jws-1 May 16, 2024
f1f5cb2
feat: update interfaces.
jws-1 May 16, 2024
fcfdfbd
more fixes.
jws-1 May 16, 2024
ea15913
feat: GoIdle.
jws-1 May 17, 2024
03ce8de
feat: loop
jws-1 May 17, 2024
43054c3
a lot of shit.
jws-1 May 17, 2024
6cd27cc
so close.
jws-1 May 17, 2024
54eefd2
fix: reset counter.
jws-1 May 18, 2024
6cfce10
fix: only reset counter on 'correct' output.
jws-1 May 18, 2024
a204111
Final changes.
jws-1 May 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,20 @@ import { SetStateAction, useState } from "react";
type State = "edit" | "confirm";

type Item =
| "coffee"
| "biscuits"
| "sandwich"
| "orange_juice"
| "smoothie"
| "granola";
| "cup"
// | "banana"
| "bottle";

const items: Item[] = [
"coffee",
"biscuits",
"sandwich",
"orange_juice",
"smoothie",
"granola",
"cup",
// "banana",
"bottle",
];

const NAMES: { [key in Item]: string } = {
coffee: 'Coffee',
biscuits: 'Biscuits',
sandwich: 'Sandwich',
orange_juice: 'Juice',
smoothie: 'Smoothie',
granola: 'Granola'
cup: 'Coffee',
// banana: 'Banana',
bottle: 'Coca Cola'
}

export function CreateOrder({ finish }: { finish: (order: Item[]) => void }) {
Expand Down Expand Up @@ -118,14 +109,9 @@ function EditMode({
return (
<>
<div className="flex flex-row gap-4 flex-[2] min-h-0">
<Card item="coffee" order={order} setOrder={setOrder} />
<Card item="sandwich" order={order} setOrder={setOrder} />
<Card item="smoothie" order={order} setOrder={setOrder} />
</div>
<div className="flex flex-row gap-4 flex-[2] min-h-0">
<Card item="orange_juice" order={order} setOrder={setOrder} />
<Card item="granola" order={order} setOrder={setOrder} />
<Card item="biscuits" order={order} setOrder={setOrder} />
<Card item="cup" order={order} setOrder={setOrder} />
{/* <Card item="banana" order={order} setOrder={setOrder} /> */}
<Card item="bottle" order={order} setOrder={setOrder} />
</div>
<div className="flex flex-row gap-4 flex-1">
<div
Expand Down
Loading