M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

firmware: don't unwrap() but propagate pca9548 errors

This commit is contained in:
Astro 2019-08-16 01:13:35 +02:00 committed by Sébastien Bourdeauducq
parent a8aabd3815
commit afe162ceca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/firmware/libboard_artiq/pca9548.rs
View File

@ -2,10 +2,10 @@ use i2c;
pub fn select(busno: u8, address: u8, channels: u8) -> Result<(), &'static str> { pub fn select(busno: u8, address: u8, channels: u8) -> Result<(), &'static str> {
i2c::start(busno).unwrap(); i2c::start(busno).unwrap();
if !i2c::write(busno, address << 1).unwrap() { if !i2c::write(busno, address << 1)? {
return Err("PCA9548 failed to ack write address") return Err("PCA9548 failed to ack write address")
} }
if !i2c::write(busno, channels).unwrap() { if !i2c::write(busno, channels)? {
return Err("PCA9548 failed to ack control word") return Err("PCA9548 failed to ack control word")
} }
i2c::stop(busno).unwrap(); i2c::stop(busno).unwrap();