Fixing merge issues

src/main.rs

@@ -559,8 +559,8 @@ const APP: () = {
                     dp.HRTIM_TIME,
                     dp.HRTIM_MASTER,
                     dp.HRTIM_COMMON,
-                    clocks.clocks,
-                    clocks.peripheral.HRTIM,
+                    ccdr.clocks,
+                    ccdr.peripheral.HRTIM,
                 );
 
                 // IO_Update should be latched for 50ns after the QSPI profile write. Profile writes

src/pounder/mod.rs

@@ -349,7 +349,7 @@ impl PounderDevices {
         devices.select_onboard_clock(4u8)?;
 
         // Run the DDS in stream-only mode (no read support).
-        devices.ad9959.interface.start_stream();
+        devices.ad9959.interface.start_stream().unwrap();
 
         Ok(devices)
     }