From cad4efe57f9817b9368bb431dd12f18d05030c9f Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Tue, 2 Jan 2024 17:28:08 +0100 Subject: [PATCH] stm32/timer: add missing supertrait bounds. --- embassy-stm32/src/timer/mod.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/embassy-stm32/src/timer/mod.rs b/embassy-stm32/src/timer/mod.rs index 389666c40..d07fd2776 100644 --- a/embassy-stm32/src/timer/mod.rs +++ b/embassy-stm32/src/timer/mod.rs @@ -558,13 +558,16 @@ impl From for bool { pub trait Basic16bitInstance: sealed::Basic16bitInstance + 'static {} /// Gneral-purpose 16-bit timer instance. -pub trait GeneralPurpose16bitInstance: sealed::GeneralPurpose16bitInstance + 'static {} +pub trait GeneralPurpose16bitInstance: sealed::GeneralPurpose16bitInstance + Basic16bitInstance + 'static {} /// Gneral-purpose 32-bit timer instance. -pub trait GeneralPurpose32bitInstance: sealed::GeneralPurpose32bitInstance + 'static {} +pub trait GeneralPurpose32bitInstance: + sealed::GeneralPurpose32bitInstance + GeneralPurpose16bitInstance + 'static +{ +} /// Advanced control timer instance. -pub trait AdvancedControlInstance: sealed::AdvancedControlInstance + 'static {} +pub trait AdvancedControlInstance: sealed::AdvancedControlInstance + GeneralPurpose16bitInstance + 'static {} /// Capture/Compare 16-bit timer instance. pub trait CaptureCompare16bitInstance: @@ -574,7 +577,7 @@ pub trait CaptureCompare16bitInstance: /// Capture/Compare 16-bit timer instance with complementary pin support. pub trait ComplementaryCaptureCompare16bitInstance: - sealed::ComplementaryCaptureCompare16bitInstance + AdvancedControlInstance + 'static + sealed::ComplementaryCaptureCompare16bitInstance + CaptureCompare16bitInstance + AdvancedControlInstance + 'static { }