Skip to content

Commit

Permalink
Sayma: HMC7043 init and detect no longer need results.
Browse files Browse the repository at this point in the history
  • Loading branch information
hartytp committed Jun 12, 2018
1 parent 7a0140e commit 28ecf81
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions artiq/firmware/libboard_artiq/hmc830_7043.rs
Expand Up @@ -238,7 +238,7 @@ pub mod hmc7043 {
Ok(())
}

pub fn enable() -> Result<(), &'static str> {
pub fn enable() {
info!("enabling hmc7043");

unsafe {
Expand All @@ -249,11 +249,9 @@ pub mod hmc7043 {
write(0x0, 0x1); // Software reset
write(0x0, 0x0); // Normal operation
write(0x1, 0x48); // mute all outputs

Ok(())
}

pub fn init() -> Result<(), &'static str> {
pub fn init() {
spi_setup();
info!("loading configuration...");

Expand Down Expand Up @@ -301,8 +299,6 @@ pub mod hmc7043 {
write(0x1, 0x40); // Unmute, high-performace/low-noise mode

info!(" ...done");

Ok(())
}

pub fn cfg_dac_sysref(dacno: u8, phase: u16) {
Expand Down Expand Up @@ -333,7 +329,9 @@ pub fn init() -> Result<(), &'static str> {
hmc830::set_dividers(1, 24, 0, 2); // 100MHz ref, 1.2GHz out
hmc830::check_locked()?;

hmc7043::enable()?;
hmc7043::enable();
hmc7043::detect()?;
hmc7043::init()
hmc7043::init();

Ok(())
}

0 comments on commit 28ecf81

Please sign in to comment.