mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
cleanup qr code capture behavior
goes to blank screen after capture instead of previous ui state also cleans up transitions between camera and run mode
This commit is contained in:
parent
ee9bec19a1
commit
4f9584ec9e
1 changed files with 11 additions and 4 deletions
|
|
@ -444,7 +444,7 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
#[cfg(not(feature = "hosted-baosec"))]
|
#[cfg(not(feature = "hosted-baosec"))]
|
||||||
GfxOpcode::AcquireQr => {
|
GfxOpcode::AcquireQr => {
|
||||||
if qr_request.is_none() {
|
if qr_request.is_none() {
|
||||||
display.stash(); // save a copy of the UI
|
// display.stash(); // save a copy of the UI
|
||||||
// this will defer response until later
|
// this will defer response until later
|
||||||
qr_request = msg_opt.take();
|
qr_request = msg_opt.take();
|
||||||
|
|
||||||
|
|
@ -589,6 +589,7 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
);
|
);
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -624,10 +625,18 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
Mono::White.into(),
|
Mono::White.into(),
|
||||||
Mono::Black.into(),
|
Mono::Black.into(),
|
||||||
);
|
);
|
||||||
|
display.draw().unwrap_or_else(|_| {
|
||||||
|
display_timeout_handler(&udma_global, &mut display)
|
||||||
|
});
|
||||||
// this take will cause the QR response to be routed to the sender since
|
// this take will cause the QR response to be routed to the sender since
|
||||||
// the Message `Drop`s. It will also cause the sampling of the camera to
|
// the Message `Drop`s. It will also cause the sampling of the camera to
|
||||||
// stop on the next frame.
|
// stop on the next frame.
|
||||||
if let Some(mut envelope) = qr_request.take() {
|
if let Some(mut envelope) = qr_request.take() {
|
||||||
|
/*
|
||||||
|
display.pop().unwrap_or_else(|_| {
|
||||||
|
display_timeout_handler(&udma_global, &mut display)
|
||||||
|
})
|
||||||
|
*/
|
||||||
let metadata = format!("{:?}", meta);
|
let metadata = format!("{:?}", meta);
|
||||||
#[cfg(not(feature = "hosted-baosec"))]
|
#[cfg(not(feature = "hosted-baosec"))]
|
||||||
if content.starts_with("test://") {
|
if content.starts_with("test://") {
|
||||||
|
|
@ -646,11 +655,9 @@ pub fn wrapped_main(main_thread_token: MainThreadToken) -> ! {
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
response.replace(acquisition).unwrap();
|
response.replace(acquisition).unwrap();
|
||||||
display.pop().unwrap_or_else(|_| {
|
|
||||||
display_timeout_handler(&udma_global, &mut display)
|
|
||||||
});
|
|
||||||
#[cfg(not(feature = "hosted-baosec"))]
|
#[cfg(not(feature = "hosted-baosec"))]
|
||||||
hal.set_preemption(true);
|
hal.set_preemption(true);
|
||||||
|
continue;
|
||||||
} else {
|
} else {
|
||||||
log::info!("meta: {:?}", meta);
|
log::info!("meta: {:?}", meta);
|
||||||
log::info!("************ {} ***********", content);
|
log::info!("************ {} ***********", content);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue