Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions src/actions/adjust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ impl AdjustStateAction {
settings.characteristic_type(),
)
.ok_or_else(|| anyhow::anyhow!(
"selected characteristic is no longer available; service_id='{}', characteristic_uuid='{}', characteristic_type='{}', available=[{}]",
settings.accessory_id(),
settings.characteristic_uuid(),
"selected characteristic is no longer available; characteristic_type='{}', available=[{}]",
settings.characteristic_type(),
service.available_characteristic_types(),
))?;
Expand Down Expand Up @@ -141,9 +139,7 @@ pub async fn refresh_adjust_instance(
instance,
"Missing\nstate",
format!(
"selected characteristic is no longer available; service_id='{}', characteristic_uuid='{}', characteristic_type='{}', available=[{}]",
settings.accessory_id(),
settings.characteristic_uuid(),
"selected characteristic is no longer available; characteristic_type='{}', available=[{}]",
settings.characteristic_type(),
service.available_characteristic_types(),
),
Expand Down
12 changes: 2 additions & 10 deletions src/actions/switch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@ impl SwitchAction {
}

let global = self.state.global_settings().await;
log::info!(
"Switch {}: toggle requested for service_id='{}', characteristic_uuid='{}', characteristic_type='{}'",
instance.instance_id,
settings.accessory_id(),
settings.characteristic_uuid(),
settings.characteristic_type(),
);
log::info!("Switch {}: toggle requested", instance.instance_id,);

let result: Result<SwitchDisplayState> = async {
// Always query immediately before writing so the inverse is calculated from
Expand Down Expand Up @@ -191,9 +185,7 @@ fn selected_switch_characteristic<'a>(
)
.ok_or_else(|| {
SwitchSelectionError::CharacteristicUnavailable(format!(
"service_id='{}', characteristic_uuid='{}', characteristic_type='{}', available=[{}]",
settings.accessory_id(),
settings.characteristic_uuid(),
"characteristic_type='{}', available=[{}]",
settings.characteristic_type(),
service.available_characteristic_types(),
))
Expand Down
Loading