pyxcp 0.25.1__cp314-cp314-macosx_11_0_arm64.whl → 0.25.9__cp314-cp314-macosx_11_0_arm64.whl

pyxcp/cpp_ext/aligned_buffer.hpp

@@ -165,4 +165,4 @@ private:
 };
 
 
-#endif // __ALIGNED_BUFFER_HPP
+#endif // __ALIGNED_BUFFER_HPP

pyxcp/cpp_ext/extension_wrapper.cpp

@@ -22,6 +22,21 @@ class PyTimestampInfo : public TimestampInfo {
     using TimestampInfo::TimestampInfo;
 };
 
+py::dict mcobject_asdict(const McObject& self) {
+    py::dict d;
+    d["name"] = self.get_name();
+    d["address"] = self.get_address();
+    d["ext"] = self.get_ext();
+    d["length"] = self.get_length();
+    d["data_type"] = self.get_data_type();
+    py::list components_list;
+    for (const auto& component : self.get_components()) {
+        components_list.append(mcobject_asdict(component));
+    }
+    d["components"] = components_list;
+    return d;
+}
+
 
 PYBIND11_MODULE(cpp_ext, m) {
     m.doc() = "C++ extensions for pyXCP.";
@@ -43,6 +58,7 @@ PYBIND11_MODULE(cpp_ext, m) {
         .def_property_readonly("components", &McObject::get_components)
 
         .def("add_component", &McObject::add_component, "component"_a)
+        .def("asdict", &mcobject_asdict)
         .def("__eq__", [](const McObject& self, const McObject& other) { return self == other; })
         .def("__repr__", [](const McObject& self) { return to_string(self); })
         .def("__hash__", [](const McObject& self) { return self.get_hash(); })
@@ -54,6 +70,17 @@ PYBIND11_MODULE(cpp_ext, m) {
         .def_property("residual_capacity", &Bin::get_residual_capacity, &Bin::set_residual_capacity)
         .def_property("entries", &Bin::get_entries, nullptr)
         .def("append", &Bin::append)
+        .def("asdict", [](const Bin& self) {
+            py::dict d;
+            d["size"] = self.get_size();
+            d["residual_capacity"] = self.get_residual_capacity();
+            py::list entries_list;
+            for (const auto& entry : self.get_entries()) {
+                entries_list.append(mcobject_asdict(entry));
+            }
+            d["entries"] = entries_list;
+            return d;
+        })
         .def("__repr__", [](const Bin& self) { return to_string(self); })
         .def("__eq__", [](const Bin& self, const Bin& other) { return self == other; })
         .def("__len__", [](const Bin& self) { return std::size(self.get_entries()); });
@@ -69,7 +96,22 @@ PYBIND11_MODULE(cpp_ext, m) {
         .def_property("headers", &DaqListBase::get_headers, nullptr)
         .def_property("odt_count", &DaqListBase::get_odt_count, nullptr)
         .def_property("total_entries", &DaqListBase::get_total_entries, nullptr)
-        .def_property("total_length", &DaqListBase::get_total_length, nullptr);
+        .def_property("total_length", &DaqListBase::get_total_length, nullptr)
+        .def("asdict", [](const DaqListBase& self) {
+            py::dict d;
+            d["name"] = self.get_name();
+            d["event_num"] = self.get_event_num();
+            d["priority"] = self.get_priority();
+            d["prescaler"] = self.get_prescaler();
+            d["stim"] = self.get_stim();
+            d["enable_timestamps"] = self.get_enable_timestamps();
+            d["measurements_opt"] = self.get_measurements_opt();
+            d["headers"] = self.get_headers();
+            d["odt_count"] = self.get_odt_count();
+            d["total_entries"] = self.get_total_entries();
+            d["total_length"] = self.get_total_length();
+            return d;
+        });
 
     py::class_<DaqList, DaqListBase, std::shared_ptr<DaqList>>(m, "DaqList")
         .def(
@@ -78,7 +120,27 @@ PYBIND11_MODULE(cpp_ext, m) {
             "priority"_a=0, "prescaler"_a=1
         )
         .def("__repr__", [](const DaqList& self) { return self.to_string(); })
-        .def_property("measurements", &DaqList::get_measurements, nullptr);
+        .def_property("measurements", &DaqList::get_measurements, nullptr)
+        .def("asdict", [](const DaqList& self) {
+            py::dict d;
+            d["name"] = self.get_name();
+            d["event_num"] = self.get_event_num();
+            d["priority"] = self.get_priority();
+            d["prescaler"] = self.get_prescaler();
+            d["stim"] = self.get_stim();
+            d["enable_timestamps"] = self.get_enable_timestamps();
+            d["measurements_opt"] = self.get_measurements_opt();
+            d["headers"] = self.get_headers();
+            d["odt_count"] = self.get_odt_count();
+            d["total_entries"] = self.get_total_entries();
+            d["total_length"] = self.get_total_length();
+            py::list measurements_list;
+            for (const auto& measurement : self.get_measurements()) {
+                measurements_list.append(mcobject_asdict(measurement));
+            }
+            d["measurements"] = measurements_list;
+            return d;
+        });
 
     py::class_<PredefinedDaqList, DaqListBase, std::shared_ptr<PredefinedDaqList>>(m, "PredefinedDaqList")
         .def(
@@ -94,6 +156,21 @@ PYBIND11_MODULE(cpp_ext, m) {
             } catch (...) {
                 return std::string("PredefinedDaqList(<repr error: unknown>)");
             }
+        })
+        .def("asdict", [](const PredefinedDaqList& self) {
+            py::dict d;
+            d["name"] = self.get_name();
+            d["event_num"] = self.get_event_num();
+            d["priority"] = self.get_priority();
+            d["prescaler"] = self.get_prescaler();
+            d["stim"] = self.get_stim();
+            d["enable_timestamps"] = self.get_enable_timestamps();
+            d["measurements_opt"] = self.get_measurements_opt();
+            d["headers"] = self.get_headers();
+            d["odt_count"] = self.get_odt_count();
+            d["total_entries"] = self.get_total_entries();
+            d["total_length"] = self.get_total_length();
+            return d;
         })
 		;
 

pyxcp/cpp_ext/framing.hpp

@@ -357,4 +357,4 @@ private:
     std::uint16_t m_send_buffer_offset = 0UL;
 };
 
-#endif // __FRAMING_HPP
+#endif // __FRAMING_HPP