Update dependencies and do necessary migrations
This commit is contained in:
+10
-13
@@ -6,9 +6,6 @@ mod volume;
|
||||
mod volume_rate;
|
||||
mod pressure;
|
||||
|
||||
#[cfg(feature = "defmt")]
|
||||
pub use defmt_impl::*;
|
||||
|
||||
pub use irradiance::*;
|
||||
pub use resistance::*;
|
||||
pub use temperature::*;
|
||||
@@ -22,16 +19,16 @@ use core::marker::PhantomData;
|
||||
use core::ops::{Add, Sub};
|
||||
use num_traits::{FromPrimitive, Num, NumCast};
|
||||
|
||||
const DECA: u8 = 10;
|
||||
const DECI: u8 = 10;
|
||||
const HECTO: u8 = 100;
|
||||
const CENTI: u8 = 100;
|
||||
const KILO: u16 = 1_000;
|
||||
const MILLI: u16 = 1_000;
|
||||
const MEGA: u32 = 1_000_000;
|
||||
const MICRO: u32 = 1_000_000;
|
||||
const GIGA: u32 = 1_000_000_000;
|
||||
const NANO: u32 = 1_000_000_000;
|
||||
pub const DECA: u8 = 10;
|
||||
pub const DECI: u8 = 10;
|
||||
pub const HECTO: u8 = 100;
|
||||
pub const CENTI: u8 = 100;
|
||||
pub const KILO: u16 = 1_000;
|
||||
pub const MILLI: u16 = 1_000;
|
||||
pub const MEGA: u32 = 1_000_000;
|
||||
pub const MICRO: u32 = 1_000_000;
|
||||
pub const GIGA: u32 = 1_000_000_000;
|
||||
pub const NANO: u32 = 1_000_000_000;
|
||||
|
||||
pub trait Quantity<V: Value>: Copy + PartialEq + PartialOrd + Add + Sub {
|
||||
fn value(self) -> V;
|
||||
|
||||
@@ -19,9 +19,9 @@ quantity_type! {MilliLiters, "mL"}
|
||||
|
||||
impl<V: Value> MilliLiters<V> {
|
||||
#[inline]
|
||||
pub fn to_liters(self) -> MilliLiters<V> {
|
||||
pub fn to_liters(self) -> Liters<V> {
|
||||
let divisor = V::from_u16(MILLI).unwrap();
|
||||
MilliLiters(self.0 / divisor)
|
||||
Liters(self.0 / divisor)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
mod part;
|
||||
|
||||
pub use part::*;
|
||||
#[allow(unused_imports)]
|
||||
pub use part::*;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//! Note - Thermocouple conversion uses [f64] arithmetic internally.
|
||||
|
||||
use libm::pow;
|
||||
use libm::exp;
|
||||
use crate::error::InvalidValue;
|
||||
use crate::quantity::{Celsius, MilliVolts, Quantity};
|
||||
|
||||
@@ -45,7 +45,7 @@ fn _convert(
|
||||
|
||||
Ok(Celsius(celsius as f32))
|
||||
} else if mv >= 20.644 && mv <= 54.886 {
|
||||
let celsius = 1.318058e2
|
||||
let celsius = -1.318058e2
|
||||
+ 4.830222E+1 * mv
|
||||
+ -1.646031 * mv_pow2
|
||||
+ 5.464731E-2 * mv_pow3
|
||||
@@ -136,8 +136,8 @@ pub fn temp_to_voltage_poly(
|
||||
Ok(MilliVolts(mv as f32))
|
||||
} else if celsius >= 0.0 && celsius <= 1372.0 {
|
||||
let base = celsius - 0.126968600000E+03;
|
||||
let exp = -0.118343200000E-03 * (base * base);
|
||||
let addition = pow(0.1185976, exp);
|
||||
let exponent = -0.118343200000E-03 * (base * base);
|
||||
let addition = 0.1185976 * exp(exponent);
|
||||
|
||||
let mv = -0.176004136860E-01
|
||||
+ 0.389212049750E-01 * celsius
|
||||
|
||||
Reference in New Issue
Block a user