set_conv_command_config returns Result instead of panic if index > 7

Signed-off-by: Mathis Deroo <[email protected]>

3 files changed, 14 insertions, 4 deletions

diff --git a/embassy-mcxa/src/adc.rs b/embassy-mcxa/src/adc.rs
index 16b40fa45..af7191573 100644
--- a/embassy-mcxa/src/adc.rs
+++ b/embassy-mcxa/src/adc.rs
@@ -435,9 +435,17 @@ impl<'a, I: Instance, M: ModeAdc> Adc<'a, I, M> {
     /// # Arguments
     /// * `index` - Command index
     /// * `config` - Command configuration
-    pub fn set_conv_command_config(&self, index: u32, config: &ConvCommandConfig) {
+    /// 
+    /// # Returns
+    /// * `Ok(())` if the command was configured successfully
+    /// * `Err(Error::InvalidConfig)` if the index is out of range
+    pub fn set_conv_command_config(&self, index: u32, config: &ConvCommandConfig) -> Result<()> {
         let adc = I::ptr();
 
+        if index < 1 || index > 7 {
+            return Err(Error::InvalidConfig);
+        }
+
         macro_rules! write_cmd {
             ($idx:expr) => {{
                 paste! {
@@ -475,8 +483,10 @@ impl<'a, I: Instance, M: ModeAdc> Adc<'a, I, M> {
             5 => write_cmd!(5),
             6 => write_cmd!(6),
             7 => write_cmd!(7),
-            _ => panic!("Invalid command index: must be between 1 and 7"),
+            _ => unreachable!(),
         }
+
+        Ok(())
     }
 
     /// Get default conversion trigger configuration.
diff --git a/examples/mcxa/src/bin/adc_interrupt.rs b/examples/mcxa/src/bin/adc_interrupt.rs
index 67fcf6361..257e04491 100644
--- a/examples/mcxa/src/bin/adc_interrupt.rs
+++ b/examples/mcxa/src/bin/adc_interrupt.rs
@@ -52,7 +52,7 @@ async fn main(_spawner: Spawner) {
     let mut conv_command_config = adc.get_default_conv_command_config();
     conv_command_config.channel_number = Adch::SelectCorrespondingChannel8;
     conv_command_config.conversion_resolution_mode = Mode::Data16Bits;
-    adc.set_conv_command_config(1, &conv_command_config);
+    adc.set_conv_command_config(1, &conv_command_config).unwrap();
 
     let mut conv_trigger_config = adc.get_default_conv_trigger_config();
     conv_trigger_config.target_command_id = Tcmd::ExecuteCmd1;
diff --git a/examples/mcxa/src/bin/adc_polling.rs b/examples/mcxa/src/bin/adc_polling.rs
index 14d47329a..b11b8957f 100644
--- a/examples/mcxa/src/bin/adc_polling.rs
+++ b/examples/mcxa/src/bin/adc_polling.rs
@@ -47,7 +47,7 @@ async fn main(_spawner: Spawner) {
     let mut conv_command_config = adc.get_default_conv_command_config();
     conv_command_config.channel_number = Adch::SelectCorrespondingChannel8;
     conv_command_config.conversion_resolution_mode = Mode::Data16Bits;
-    adc.set_conv_command_config(1, &conv_command_config);
+    adc.set_conv_command_config(1, &conv_command_config).unwrap();
 
     let mut conv_trigger_config = adc.get_default_conv_trigger_config();
     conv_trigger_config.target_command_id = Tcmd::ExecuteCmd1;