From 1d3336ece502cd7737ac9fd9712d6aef818b5923 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Wed, 5 Apr 2023 17:01:40 +0700 Subject: [PATCH] Fix merge issues --- crates/core/src/bc_protocol.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/crates/core/src/bc_protocol.rs b/crates/core/src/bc_protocol.rs index 5583ebd..6461783 100644 --- a/crates/core/src/bc_protocol.rs +++ b/crates/core/src/bc_protocol.rs @@ -104,9 +104,10 @@ pub enum PrintFormat { } /// Type of connection to try -#[derive(Debug, Clone, Copy, Serialize, Deserialize)] +#[derive(Default, Debug, Clone, Copy, Serialize, Deserialize)] pub enum ConnectionProtocol { /// TCP and UDP + #[default] TcpUdp, /// TCP only Tcp, @@ -114,11 +115,6 @@ pub enum ConnectionProtocol { Udp, } -impl Default for ConnectionProtocol { - fn default() -> Self { - ConnectionProtocol::TcpUdp - } -} enum CameraLocation { Tcp(SocketAddr), @@ -348,7 +344,7 @@ impl BcCamera { abilities: Default::default(), }; me.keepalive().await?; - if let Err(e) = me.monitor_battery(aux_info_format).await { + if let Err(e) = me.monitor_battery(options.aux_printing).await { warn!("Could not monitor battery: {:?}", e); } Ok(me)