mirror of https://github.com/eldruin/ds323x-rs
				
				
				
			Make type conversions explicit
							parent
							
								
									f971786c0d
								
							
						
					
					
						commit
						7d7008a583
					
				| 
						 | 
					@ -229,10 +229,10 @@ fn year_from_registers(month: u8, year: u8) -> u16 {
 | 
				
			||||||
    let century = month & BitFlags::CENTURY;
 | 
					    let century = month & BitFlags::CENTURY;
 | 
				
			||||||
    let year = packed_bcd_to_decimal(year);
 | 
					    let year = packed_bcd_to_decimal(year);
 | 
				
			||||||
    if century != 0 {
 | 
					    if century != 0 {
 | 
				
			||||||
        2100 + (year as u16)
 | 
					        2100 + u16::from(year)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    else {
 | 
					    else {
 | 
				
			||||||
        2000 + (year as u16)
 | 
					        2000 + u16::from(year)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -83,13 +83,13 @@ where
 | 
				
			||||||
        let mut data = [Register::TEMP_MSB, 0, 0];
 | 
					        let mut data = [Register::TEMP_MSB, 0, 0];
 | 
				
			||||||
        self.iface.read_data(&mut data)?;
 | 
					        self.iface.read_data(&mut data)?;
 | 
				
			||||||
        let is_negative = (data[1] & 0b1000_0000) != 0;
 | 
					        let is_negative = (data[1] & 0b1000_0000) != 0;
 | 
				
			||||||
        let temp = ((data[1] as u16) << 2) | (data[2] >> 6) as u16;
 | 
					        let temp = (u16::from(data[1]) << 2) | u16::from(data[2] >> 6);
 | 
				
			||||||
        if is_negative {
 | 
					        if is_negative {
 | 
				
			||||||
            let temp_sign_extended = temp | 0b1111_1100_0000_0000;
 | 
					            let temp_sign_extended = temp | 0b1111_1100_0000_0000;
 | 
				
			||||||
            Ok(temp_sign_extended as i16 as f32 * 0.25)
 | 
					            Ok(f32::from(temp_sign_extended as i16) * 0.25)
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        else {
 | 
					        else {
 | 
				
			||||||
            Ok(temp as f32 * 0.25)
 | 
					            Ok(f32::from(temp) * 0.25)
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue