diff --git a/advanced/i2c-driver/src/main.rs b/advanced/i2c-driver/src/main.rs index 4a8991e5..158e086e 100644 --- a/advanced/i2c-driver/src/main.rs +++ b/advanced/i2c-driver/src/main.rs @@ -33,8 +33,7 @@ fn main() -> Result<()> { println!("Sensor init"); let device_id = sensor.read_device_id_register()?; - assert_eq!(device_id, 96_u8); - println!("Hello, world, I am sensor {}", device_id); + println!("Hello, world, I am sensor {:#02x}", device_id); loop { FreeRtos.delay_ms(500u32); diff --git a/advanced/i2c-sensor-reading/examples/part_1.rs b/advanced/i2c-sensor-reading/examples/part_1.rs index e54a3c1f..5cb2e40f 100644 --- a/advanced/i2c-sensor-reading/examples/part_1.rs +++ b/advanced/i2c-sensor-reading/examples/part_1.rs @@ -32,7 +32,7 @@ fn main() -> Result<()> { let device_id = sht.device_identifier().unwrap(); // 4. Read and print the sensor's device ID. - println!("Device ID SHTC3: {}", device_id); + println!("Device ID SHTC3: {:#02x}", device_id); loop { // 5. This loop initiates measurements, reads values and prints humidity in % and Temperature in °C. @@ -41,10 +41,7 @@ fn main() -> Result<()> { let measurement = sht.get_measurement_result().unwrap(); println!( - "TEMP: {} °C\n - HUM: {:?} %\n - \n - ", + "TEMP: {:.2} °C | HUM: {:.2} %", measurement.temperature.as_degrees_celsius(), measurement.humidity.as_percent(), ); diff --git a/advanced/i2c-sensor-reading/examples/part_2.rs b/advanced/i2c-sensor-reading/examples/part_2.rs index 36371549..23c36db4 100644 --- a/advanced/i2c-sensor-reading/examples/part_2.rs +++ b/advanced/i2c-sensor-reading/examples/part_2.rs @@ -41,14 +41,14 @@ fn main() -> Result<()> { // 6. Read and print the device ID. let device_id = sht.device_identifier().unwrap(); - println!("Device ID SHTC3: {}", device_id); + println!("Device ID SHTC3: {:#02x}", device_id); // 7. Create an instance of ICM42670p sensor. Pass the second proxy and the sensor's address. let mut imu = Icm42670::new(proxy_2, Address::Primary).unwrap(); // 8. Read the device's ID register and print the value. let device_id = imu.device_id().unwrap(); - println!("Device ID ICM42670p: {}", device_id); + println!("Device ID ICM42670p: {:#02x}", device_id); // 9. Start the ICM42670p in low noise mode. imu.set_power_mode(imuPowerMode::GyroLowNoise).unwrap(); @@ -62,16 +62,12 @@ fn main() -> Result<()> { // 11. Print all values println!( - " GYRO: X: {:.2} Y: {:.2} Z: {:.2}\n - TEMP: {} °C\n - HUM: {:?} %\n - \n - ", + "TEMP: {:.2} °C | HUM: {:.2} % | GYRO: X= {:.2} Y= {:.2} Z= {:.2}", + measurement.temperature.as_degrees_celsius(), + measurement.humidity.as_percent(), gyro_data.x, gyro_data.y, gyro_data.z, - measurement.temperature.as_degrees_celsius(), - measurement.humidity.as_percent(), ); FreeRtos.delay_ms(500u32);