kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing merge issues

This commit is contained in:
Ryan Summers 2020-11-09 12:33:18 +01:00
parent 7e1a58f1f0
commit c97e4d9d20
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

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

2
src/pounder/mod.rs
View File

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