Merge branch 'develop' into env_store

src/env/tock/mod.rs

@@ -1,5 +1,5 @@
 use self::storage::{SyscallStorage, SyscallUpgradeStorage};
-use crate::ctap::hid::{ChannelID, CtapHid, KeepaliveStatus, ProcessedPacket};
+use crate::ctap::hid::{ChannelID, CtapHid, CtapHidCommand, KeepaliveStatus, ProcessedPacket};
 use crate::ctap::status_code::Ctap2StatusCode;
 use crate::env::{Env, UserPresence};
 use core::cell::Cell;
@@ -121,7 +121,7 @@ fn send_keepalive_up_needed(
                 }
                 match processed_packet {
                     ProcessedPacket::InitPacket { cmd, .. } => {
-                        if cmd == CtapHid::COMMAND_CANCEL {
+                        if cmd == CtapHidCommand::Cancel as u8 {
                             // We ignore the payload, we can't answer with an error code anyway.
                             #[cfg(feature = "debug_ctap")]
                             writeln!(Console::new(), "User presence check cancelled").unwrap();