| @@ -144,7 +144,7 @@ pub struct DoraEvent(Option<Event>); | |||||
| fn event_type(event: &DoraEvent) -> ffi::DoraEventType { | fn event_type(event: &DoraEvent) -> ffi::DoraEventType { | ||||
| match &event.0 { | match &event.0 { | ||||
| Some(event) => match event { | Some(event) => match event { | ||||
| Event::Stop => ffi::DoraEventType::Stop, | |||||
| Event::Stop(_) => ffi::DoraEventType::Stop, | |||||
| Event::Input { .. } => ffi::DoraEventType::Input, | Event::Input { .. } => ffi::DoraEventType::Input, | ||||
| Event::InputClosed { .. } => ffi::DoraEventType::InputClosed, | Event::InputClosed { .. } => ffi::DoraEventType::InputClosed, | ||||
| Event::Error(_) => ffi::DoraEventType::Error, | Event::Error(_) => ffi::DoraEventType::Error, | ||||
| @@ -26,7 +26,7 @@ fn main() -> eyre::Result<()> { | |||||
| } | } | ||||
| other => eprintln!("Ignoring unexpected input `{other}`"), | other => eprintln!("Ignoring unexpected input `{other}`"), | ||||
| }, | }, | ||||
| Event::Stop => println!("Received manual stop"), | |||||
| Event::Stop(_) => println!("Received stop"), | |||||
| other => eprintln!("Received unexpected input: {other:?}"), | other => eprintln!("Received unexpected input: {other:?}"), | ||||
| } | } | ||||
| } | } | ||||
| @@ -24,8 +24,8 @@ fn main() -> eyre::Result<()> { | |||||
| } | } | ||||
| other => eprintln!("Ignoring unexpected input `{other}`"), | other => eprintln!("Ignoring unexpected input `{other}`"), | ||||
| }, | }, | ||||
| Event::Stop => { | |||||
| println!("Received manual stop"); | |||||
| Event::Stop(_) => { | |||||
| println!("Received stop"); | |||||
| } | } | ||||
| Event::InputClosed { id } => { | Event::InputClosed { id } => { | ||||
| println!("Input `{id}` was closed"); | println!("Input `{id}` was closed"); | ||||
| @@ -26,7 +26,7 @@ fn main() -> eyre::Result<()> { | |||||
| } | } | ||||
| other => eprintln!("Ignoring unexpected input `{other}`"), | other => eprintln!("Ignoring unexpected input `{other}`"), | ||||
| }, | }, | ||||
| Event::Stop => println!("Received manual stop"), | |||||
| Event::Stop(_) => println!("Received stop"), | |||||
| other => eprintln!("Received unexpected input: {other:?}"), | other => eprintln!("Received unexpected input: {other:?}"), | ||||
| } | } | ||||
| } | } | ||||
| @@ -25,8 +25,8 @@ fn main() -> eyre::Result<()> { | |||||
| } | } | ||||
| other => eprintln!("Ignoring unexpected input `{other}`"), | other => eprintln!("Ignoring unexpected input `{other}`"), | ||||
| }, | }, | ||||
| Event::Stop => { | |||||
| println!("Received manual stop"); | |||||
| Event::Stop(_) => { | |||||
| println!("Received stop"); | |||||
| } | } | ||||
| Event::InputClosed { id } => { | Event::InputClosed { id } => { | ||||
| println!("Input `{id}` was closed"); | println!("Input `{id}` was closed"); | ||||
| @@ -24,8 +24,8 @@ fn main() -> eyre::Result<()> { | |||||
| } | } | ||||
| other => eprintln!("Ignoring unexpected input `{other}`"), | other => eprintln!("Ignoring unexpected input `{other}`"), | ||||
| }, | }, | ||||
| Event::Stop => { | |||||
| println!("Received manual stop"); | |||||
| Event::Stop(_) => { | |||||
| println!("Received stop"); | |||||
| } | } | ||||
| Event::InputClosed { id } => { | Event::InputClosed { id } => { | ||||
| println!("Input `{id}` was closed"); | println!("Input `{id}` was closed"); | ||||
| @@ -29,7 +29,7 @@ fn main() -> eyre::Result<()> { | |||||
| } | } | ||||
| other => eprintln!("ignoring unexpected input {other}"), | other => eprintln!("ignoring unexpected input {other}"), | ||||
| }, | }, | ||||
| Event::Stop => {} | |||||
| Event::Stop(_) => {} | |||||
| Event::InputClosed { id } => { | Event::InputClosed { id } => { | ||||
| println!("input `{id}` was closed"); | println!("input `{id}` was closed"); | ||||
| if *id == "random" { | if *id == "random" { | ||||
| @@ -119,7 +119,7 @@ fn main() -> eyre::Result<()> { | |||||
| } | } | ||||
| other => eprintln!("Ignoring unexpected input `{other}`"), | other => eprintln!("Ignoring unexpected input `{other}`"), | ||||
| }, | }, | ||||
| Event::Stop => println!("Received manual stop"), | |||||
| Event::Stop(_) => println!("Received stop"), | |||||
| other => eprintln!("Received unexpected input: {other:?}"), | other => eprintln!("Received unexpected input: {other:?}"), | ||||
| }, | }, | ||||
| MergedEvent::External(pose) => { | MergedEvent::External(pose) => { | ||||
| @@ -11,6 +11,8 @@ def main(): | |||||
| node = Node() | node = Node() | ||||
| always_none = node.next(timeout=0.001) is None | always_none = node.next(timeout=0.001) is None | ||||
| always_none = node.next(timeout=0.001) is None | |||||
| print("Always None:", always_none) | |||||
| with keyboard.Events() as events: | with keyboard.Events() as events: | ||||
| while True: | while True: | ||||
| if not always_none: | if not always_none: | ||||
| @@ -19,6 +19,7 @@ def main(): | |||||
| start_recording_time = tm.time() | start_recording_time = tm.time() | ||||
| node = Node() | node = Node() | ||||
| always_none = node.next(timeout=0.001) is None | |||||
| always_none = node.next(timeout=0.001) is None | always_none = node.next(timeout=0.001) is None | ||||
| finished = False | finished = False | ||||
| @@ -46,8 +46,8 @@ async fn main() -> eyre::Result<()> { | |||||
| } | } | ||||
| other => eprintln!("Received input `{other}`"), | other => eprintln!("Received input `{other}`"), | ||||
| }, | }, | ||||
| Event::Stop => { | |||||
| println!("Received manual stop") | |||||
| Event::Stop(_) => { | |||||
| println!("Received command"); | |||||
| } | } | ||||
| Event::InputClosed { id } => { | Event::InputClosed { id } => { | ||||
| println!("input `{id}` was closed"); | println!("input `{id}` was closed"); | ||||