pymbusparser 0.0.2__tar.gz → 0.0.3__tar.gz

{pymbusparser-0.0.2 → pymbusparser-0.0.3}/Cargo.lock

@@ -77,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bindgen"
@@ -124,9 +124,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.1.21"
+version = "1.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
+checksum = "3bbb537bb4a30b90362caddba8f360c0a56bc13d3a5570028e7197204cb54a17"
 dependencies = [
  "shlex",
 ]
@@ -492,9 +492,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libloading"
@@ -524,7 +524,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "m-bus-parser"
-version = "0.0.14"
+version = "0.0.15"
 dependencies = [
  "arrayvec",
  "bindgen",
@@ -542,7 +542,7 @@ dependencies = [
 
 [[package]]
 name = "m-bus-parser-cli"
-version = "0.0.9"
+version = "0.0.10"
 dependencies = [
  "clap",
  "m-bus-parser",
@@ -550,7 +550,7 @@ dependencies = [
 
 [[package]]
 name = "m-bus-parser-wasm-pack"
-version = "0.0.5"
+version = "0.0.6"
 dependencies = [
  "console_error_panic_hook",
  "m-bus-parser",
@@ -612,9 +612,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "oorandom"
@@ -652,9 +655,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "prettyplease"
@@ -691,7 +694,7 @@ dependencies = [
 
 [[package]]
 name = "pymbusparser"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "hex",
  "m-bus-parser",
@@ -814,9 +817,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -826,9 +829,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -837,9 +840,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustc-hash"
@@ -945,9 +948,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",

{pymbusparser-0.0.2 → pymbusparser-0.0.3}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "m-bus-parser"
-version = "0.0.14"
+version = "0.0.15"
 edition = "2021"
 description = "A library for parsing M-Bus frames"
 license = "MIT"

{pymbusparser-0.0.2 → pymbusparser-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymbusparser
-Version: 0.0.2
+Version: 0.0.3
 Summary: Python bindings for m-bus-parser written in Rust
 Home-Page: https://maebli.github.io/
 Author-email: Michael Aebli <>

{pymbusparser-0.0.2 → pymbusparser-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymbusparser"
-version = "0.0.2"
+version = "0.0.3"
 description = "Python bindings for m-bus-parser written in Rust"
 homepage = "https://maebli.github.io/"
 authors = [{name = "Michael Aebli", email = ""}] 

{pymbusparser-0.0.2 → pymbusparser-0.0.3}/python/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "pymbusparser"
-version = "0.0.2"
+version = "0.0.3"
 edition = "2021"
 homepage = "https://maebli.github.io/"
 repository = "https://github.com/maebli/m-bus-parser"
 
 [dependencies]
-m-bus-parser = { path = "..", version = "0.0.14", features = ["std", "serde"] }
+m-bus-parser = { path = "..", version = "0.0.15", features = ["std", "serde"] }
 serde_json = "1.0"
 pyo3 = { version = "0.22.3", features = ["extension-module","generate-import-lib"] }
 hex = "0.4.2"

{pymbusparser-0.0.2 → pymbusparser-0.0.3}/src/user_data/value_information.rs

@@ -214,6 +214,7 @@ impl TryFrom<&ValueInformationBlock> for ValueInformation {
                     }
                     0x10..=0x17 => {
                         units.push(unit!(Meter ^ 3));
+                        labels.push(ValueLabel::Volume);
                         decimal_scale_exponent =
                             (value_information_block.value_information.data & 0b111) as isize - 6;
                     }
@@ -1030,6 +1031,7 @@ pub enum ValueLabel {
     LowTemperatureRatingFactor,
     DisplayOutputScalingFactor,
     ManufacturerSpecific,
+    Volume,
 }
 
 #[cfg(feature = "std")]
@@ -1200,7 +1202,11 @@ mod tests {
                     x.push(unit!(Meter ^ 3));
                     x
                 },
-                labels: ArrayVec::<ValueLabel, 10>::new()
+                labels: {
+                    let mut x = ArrayVec::<ValueLabel, 10>::new();
+                    x.push(ValueLabel::Volume);
+                    x
+                }
             }
         );
 
@@ -1226,7 +1232,12 @@ mod tests {
                     x.push(unit!(Meter ^ 3));
                     x
                 },
-                labels: ArrayVec::<ValueLabel, 10>::new()
+
+                labels: {
+                    let mut x = ArrayVec::<ValueLabel, 10>::new();
+                    x.push(ValueLabel::Volume);
+                    x
+                }
             }
         );
 
@@ -1252,7 +1263,11 @@ mod tests {
                     x.push(unit!(Meter ^ 3));
                     x
                 },
-                labels: ArrayVec::<ValueLabel, 10>::new()
+                labels: {
+                    let mut x = ArrayVec::<ValueLabel, 10>::new();
+                    x.push(ValueLabel::Volume);
+                    x
+                }
             }
         );
 
@@ -1288,6 +1303,7 @@ mod tests {
         assert_eq!(result.value_information, ValueInformationField::from(0x96));
         assert_eq!(ValueInformation::try_from(&result).unwrap().labels, {
             let mut x = ArrayVec::<ValueLabel, 10>::new();
+            x.push(ValueLabel::Volume);
             x.push(ValueLabel::Averaged);
             x
         });
@@ -1306,6 +1322,7 @@ mod tests {
             ValueInformation {
                 labels: {
                     let mut x = ArrayVec::<ValueLabel, 10>::new();
+                    x.push(ValueLabel::Volume);
                     x.push(ValueLabel::Averaged);
                     x
                 },
@@ -1335,6 +1352,7 @@ mod tests {
             ValueInformation {
                 labels: {
                     let mut x = ArrayVec::<ValueLabel, 10>::new();
+                    x.push(ValueLabel::Volume);
                     x.push(ValueLabel::Averaged);
                     x
                 },