Get in sync with libosdp API changes regarding "osdp_status_report" and make the members of "OsdpStatusReport" public so they can be accessed from the application callback

Author: rustylocker

libosdp/Cargo.toml

@@ -18,6 +18,7 @@ embedded-io = { version = "0.6.1", features = ["alloc"] }
 libosdp-sys = { version = "3.1.0", path = "../libosdp-sys" }
 log = { version = "0.4.20", optional = true }
 serde = { version = "1.0.192", features = ["derive", "alloc"], default-features = false }
+serde_arrays = "0.2.0"
 thiserror = { version = "1.0.50", optional = true }
 defmt = { version = "0.3", optional = true, features = ["alloc"] }
 itoa = "1.0.11"

libosdp/src/events.rs

@@ -287,45 +287,29 @@ impl From<OsdpStatusReportType> for libosdp_sys::osdp_status_report_type {
 /// Event to describe various status changes on PD
 ///
 /// This event is used by the PD to indicate status such as input, output,
-/// tamper, etc.,. up to a maximum of 32 status bits can be reported. The values
+/// tamper, etc.,. up to a maximum of 64 status bits can be reported. The values
 /// of the least significant N bit of status are considered, where N is the
 /// number of items as described in the corresponding capability codes,
 /// - PdCapability::OutputControl
 /// - PdCapability::ContactStatusMonitoring
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "defmt-03", derive(defmt::Format))]
 pub struct OsdpStatusReport {
-    type_: OsdpStatusReportType,
-    nr_entries: usize,
-    mask: u32,
-}
-
-impl OsdpStatusReport {
-    /// Create an input event with given bit mask
-    pub fn new_input(nr_entries: usize, mask: u32) -> Self {
-        Self {
-            type_: OsdpStatusReportType::Input,
-            nr_entries,
-            mask,
-        }
-    }
-
-    /// Create an output event with given bit mask
-    pub fn new_output(nr_entries: usize, mask: u32) -> Self {
-        Self {
-            type_: OsdpStatusReportType::Output,
-            nr_entries,
-            mask,
-        }
-    }
+    /// The kind of event to report see `enum osdp_event_status_type_e`
+    pub type_: OsdpStatusReportType,
+    /// Number of valid entries in `report`
+    pub nr_entries: usize,
+    /// Status report
+    #[serde(with = "serde_arrays")]
+    pub report: [u8; 64],
 }
 
 impl From<libosdp_sys::osdp_status_report> for OsdpStatusReport {
     fn from(value: libosdp_sys::osdp_status_report) -> Self {
         OsdpStatusReport {
             type_: value.type_.into(),
             nr_entries: value.nr_entries as usize,
-            mask: value.mask,
+            report: value.report,
         }
     }
 }
@@ -335,7 +319,7 @@ impl From<OsdpStatusReport> for libosdp_sys::osdp_status_report {
         libosdp_sys::osdp_status_report {
             type_: value.type_.into(),
             nr_entries: value.nr_entries as i32,
-            mask: value.mask,
+            report: value.report,
         }
     }
 }