aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCameron <[email protected]>2023-06-30 11:47:20 +0200
committerCameron <[email protected]>2023-06-30 11:47:20 +0200
commit81cbb0fc322c8dd23128a28e0500df1f185e1067 (patch)
treef765fcf04bb25a03a7be47f0ac588fd75be78245
parentc69f2929c0702701d49b3cd9dcc14d5a6664f5dc (diff)
Attempt to fix certain borrowing rule issues
-rw-r--r--embassy-nrf/src/buffered_uarte.rs4
-rw-r--r--embassy-nrf/src/saadc.rs4
2 files changed, 6 insertions, 2 deletions
diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs
index 9bc1c1e7a..c1300d7ef 100644
--- a/embassy-nrf/src/buffered_uarte.rs
+++ b/embassy-nrf/src/buffered_uarte.rs
@@ -352,11 +352,13 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
352 352
353 s.rx_ppi_ch.store(ppi_ch2.number() as u8, Ordering::Relaxed); 353 s.rx_ppi_ch.store(ppi_ch2.number() as u8, Ordering::Relaxed);
354 let mut ppi_group = PpiGroup::new(ppi_group); 354 let mut ppi_group = PpiGroup::new(ppi_group);
355 let ppi_group_channel_disable_all_task = ppi_group.task_disable_all();
356
355 let mut ppi_ch2 = Ppi::new_one_to_two( 357 let mut ppi_ch2 = Ppi::new_one_to_two(
356 ppi_ch2, 358 ppi_ch2,
357 Event::from_reg(&r.events_endrx), 359 Event::from_reg(&r.events_endrx),
358 Task::from_reg(&r.tasks_startrx), 360 Task::from_reg(&r.tasks_startrx),
359 ppi_group.task_disable_all(), 361 ppi_group_channel_disable_all_task
360 ); 362 );
361 ppi_ch2.disable(); 363 ppi_ch2.disable();
362 ppi_group.add_channel(&ppi_ch2); 364 ppi_group.add_channel(&ppi_ch2);
diff --git a/embassy-nrf/src/saadc.rs b/embassy-nrf/src/saadc.rs
index cf3fb9993..b6984b0f0 100644
--- a/embassy-nrf/src/saadc.rs
+++ b/embassy-nrf/src/saadc.rs
@@ -320,7 +320,9 @@ impl<'d, const N: usize> Saadc<'d, N> {
320 timer.cc(0).write(sample_counter); 320 timer.cc(0).write(sample_counter);
321 timer.cc(0).short_compare_clear(); 321 timer.cc(0).short_compare_clear();
322 322
323 let mut sample_ppi = Ppi::new_one_to_one(ppi_ch2, timer.cc(0).event_compare(), Task::from_reg(&r.tasks_sample)); 323 let compare_event = timer.cc(0).event_compare();
324
325 let mut sample_ppi = Ppi::new_one_to_one(ppi_ch2, compare_event, Task::from_reg(&r.tasks_sample));
324 326
325 timer.start(); 327 timer.start();
326 328