update unused USBKit and SerialPort

tmtfx · tmtfx · commit 096861aead8a · 2024-09-09T11:25:29.000+02:00
diff --git a/bindings/device/SerialPort.cpp b/bindings/device/SerialPort.cpp
@@ -56,8 +56,25 @@ py::class_<BSerialPort>(m, "BSerialPort")
 .def(py::init(), "")
 .def("Open", &BSerialPort::Open, "", py::arg("portName"))
 .def("Close", &BSerialPort::Close, "")
-.def("Read", &BSerialPort::Read, "", py::arg("buf"), py::arg("count"))
-.def("Write", &BSerialPort::Write, "", py::arg("buf"), py::arg("count"))
+//.def("Read", &BSerialPort::Read, "", py::arg("buf"), py::arg("count"))
+.def("Read", [](BSerialPort& self, size_t count) {
+	std::vector<uint8_t> buffer(count);
+	ssize_t result = self.Read(buffer.data(), count);
+	if (result > 0) {
+		return py::bytes(reinterpret_cast<const char*>(buffer.data()), result);
+	}
+	return py::bytes(); 
+	}, "", py::arg("count"))
+//.def("Write", &BSerialPort::Write, "", py::arg("buf"), py::arg("count"))
+.def("Write", [](BSerialPort& self, py::buffer data){
+	/*std::string buffer = data;
+	const void* buf =buffer.data();
+	size_t count = buffer.size();*/
+	py::buffer_info info = data.request();
+	size_t count = info.size;
+	const void* buffer = info.ptr;
+	return self.Write(buffer,count);
+},"",py::arg("data"))
 .def("SetBlocking", &BSerialPort::SetBlocking, "", py::arg("blocking"))
 .def("SetTimeout", &BSerialPort::SetTimeout, "", py::arg("microSeconds"))
 .def("SetDataRate", &BSerialPort::SetDataRate, "", py::arg("bitsPerSecond"))
diff --git a/bindings/device/USBKit.cpp b/bindings/device/USBKit.cpp
@@ -111,7 +111,7 @@ py::class_<BUSBEndpoint, std::unique_ptr<BUSBEndpoint,py::nodelete>>(m, "BUSBEnd
 	std::vector<uint8_t> buffer(dataLength);
 	ssize_t result = self.ControlTransfer(requestType, request, value, index, length, buffer.data());
 	return py::bytes(reinterpret_cast<const char*>(buffer.data()), result);
-},"", py::arg("requestType"), py::arg("request"), py::arg("value"), py::arg("index"), py::arg("length"), py::arg("data")) .def("InterruptTransfer", [](const MyDevice& self, py::bytes data) { size_t dataLength = py::len(data); std::vector<uint8_t> buffer(dataLength); ssize_t result = self.InterruptTransfer(buffer.data(), dataLength); return py::bytes(reinterpret_cast<const char*>(buffer.data()), result); }, py::arg("data")) .def("BulkTransfer", [](const MyDevice& self, py::bytes data) { size_t dataLength = py::len(data); std::vector<uint8_t> buffer(dataLength); ssize_t result = self.BulkTransfer(buffer.data(), dataLength); return py::bytes(reinterpret_cast<const char*>(buffer.data()), result); }, py::arg("data")) .def("IsochronousTransfer", [](const MyDevice& self, py::bytes data, py::list packetDescriptors) { size_t dataLength = py::len(data); std::vector<uint8_t> buffer(dataLength); // Converti packetDescriptors da lista Python a un array C++ std::vector<usb_iso_packet_descriptor> descriptors; for (auto item : packetDescriptors) { descriptors.push_back(item.cast<usb_iso_packet_descriptor>()); } ssize_t result = self.IsochronousTransfer(buffer.data(), dataLength, descriptors.data(), descriptors.size()); return py::bytes(reinterpret_cast<const char*>(buffer.data()), result); }, py::arg("data"), py::arg("packetDescriptors"))
+},"", py::arg("requestType"), py::arg("request"), py::arg("value"), py::arg("index"), py::arg("length"), py::arg("data")) 
 //.def("InterruptTransfer", &BUSBEndpoint::InterruptTransfer, "", py::arg("data"), py::arg("length"))
 .def("InterruptTransfer", [](const BUSBEndpoint& self, py::bytes data) {
 	size_t dataLength = py::len(data);
@@ -132,7 +132,7 @@ py::class_<BUSBEndpoint, std::unique_ptr<BUSBEndpoint,py::nodelete>>(m, "BUSBEnd
 	std::vector<uint8_t> buffer(dataLength);
 	ssize_t result = self.IsochronousTransfer(buffer.data(), dataLength,packetDescriptors,packetCount);
 	return py::bytes(reinterpret_cast<const char*>(buffer.data()), result);
-},"", py::arg("data"))
+},"", py::arg("data"),py::arg("packetDescriptors"),py::arg("packetCount"))
 .def("IsStalled", &BUSBEndpoint::IsStalled, "")
 .def("ClearStall", &BUSBEndpoint::ClearStall, "")
 ;
