updates

Author: andrewleech

micropython/usb/examples/device/mtp_example.py

@@ -18,46 +18,38 @@
 
 import os
 import time
-import machine
+import usb.device
 from usb.device.mtp import MTPInterface
 
-def main():
-    """Main function to run the MTP example."""
-    # Print startup message
-    print("MicroPython USB MTP Example")
-    print("===========================")
-    
-    # Create MTP interface to expose the filesystem
-    # The root_dir parameter sets which directory to expose via MTP
-    # Here we use '/' to expose the entire filesystem
-    mtp = MTPInterface(root_dir="/")
-    
-    # Create a USB device using machine.USBDevice
-    usb_dev = machine.USBDevice(0xF055, 0x9802, "MicroPython", "MTP Device", "123456789")
-    
-    # Add the MTP interface to the USB device
-    usb_dev.add_interface(mtp)
-    
-    # Enable the USB device
-    usb_dev.enable()
-    
-    # Wait for USB to be configured
-    print("Waiting for USB connection...")
-    while not usb_dev.configured():
-        time.sleep(0.1)
-    
-    print("USB MTP device connected!")
-    print("You can now access files via the host computer")
-    print("Press Ctrl+C to exit")
+# Print startup message
+print("MicroPython USB MTP Example")
+print("===========================")
+
+# Create MTP interface to expose the filesystem
+# The root_dir parameter sets which directory to expose via MTP
+# Here we use '/' to expose the entire filesystem
+mtp = MTPInterface(root_dir="/")
+
+# Initialize the USB device with the MTP interface
+# This registers the device with USB and starts accepting connections
+usb.device.get().init(mtp, builtin_driver=True)
+
+# Wait for USB to be configured
+print("Waiting for USB connection...")
+# while not mtp.is_open():
+    # time.sleep(0.1)
+
+print("USB MTP device connected!")
+print("You can now access files via the host computer")
+print("Press Ctrl+C to exit")
 
-    try:
-        # Keep the program running to maintain the USB connection
-        while True:
-            time.sleep(1)
-    except KeyboardInterrupt:
-        # Clean up on exit
-        print("Exiting MTP example")
-        usb_dev.disable()
-
-if __name__ == "__main__":
-    main()
+    # try:
+    #     # Keep the program running to maintain the USB connection
+    #     while True:
+    #         time.sleep(1)
+    # except KeyboardInterrupt:
+    #     # Clean up on exit
+    #     print("Exiting MTP example")
+
+# if __name__ == "__main__":
+#     main()

micropython/usb/usb-device-mtp/usb/device/mtp.py

@@ -13,7 +13,7 @@
 import io
 import uctypes
 
-from usb.device import Interface, Descriptor, Buffer
+from .core import Interface, Descriptor, Buffer
 import usb.device
 
 # MTP Class-specific constants
@@ -135,6 +135,11 @@
     # Handles follow
 }
 
+_EP_IN_FLAG = const(1 << 7)
+EP_TYPE_BULK = "bulk"
+EP_TYPE_INTERRUPT = "interrupt"
+
+
 def string_to_utf16(s):
     """Convert ASCII string to UTF-16 with length prefix as required by MTP."""
     utf16_bytes = s.encode('utf-16-le')
@@ -305,36 +310,40 @@ def desc_cfg(self, desc, itf_num, ep_num, strs):
             ep_num: First endpoint number to use
             strs: String descriptor array
         """
+        # Add the interface identifier to the strings
+        iInterface = len(strs)
+        strs.append("MTP")
+
         # Store interface number
         self._itf_num = itf_num
 
         # Interface Association Descriptor for MTP
-        desc.interface_assoc(itf_num, 1, MTP_CLASS, MTP_SUBCLASS, MTP_PROTOCOL)
-        
-        # Interface descriptor
-        desc.interface(itf_num, 3, MTP_CLASS, MTP_SUBCLASS, MTP_PROTOCOL)
-        
-        # Class-specific functional descriptor
-        desc.pack(
-            "<BBBBB",
-            5,  # bFunctionLength
-            0x24,  # bDescriptorType - CS_INTERFACE
-            0x00,  # bDescriptorSubtype
-            0x01,  # bcdMTPVersion - 1.0 LSB
-            0x00,  # bcdMTPVersion - 1.0 MSB
-        )
+        # desc.interface_assoc(itf_num, 1, MTP_CLASS, MTP_SUBCLASS, MTP_PROTOCOL)
+        
+        # Interface descriptor        
+        desc.interface(itf_num, 3, MTP_CLASS, MTP_SUBCLASS, MTP_PROTOCOL, iInterface)
+        
+        # # Class-specific functional descriptor
+        # desc.pack(
+        #     "<BBBBB",
+        #     5,  # bFunctionLength
+        #     0x24,  # bDescriptorType - CS_INTERFACE
+        #     0x00,  # bDescriptorSubtype
+        #     0x01,  # bcdMTPVersion - 1.0 LSB
+        #     0x00,  # bcdMTPVersion - 1.0 MSB
+        # )
 
         # Endpoint descriptors
         # Bulk OUT endpoint
         self._bulk_out_ep = ep_num
         desc.endpoint(self._bulk_out_ep, "bulk", MTP_BULK_EP_SIZE, 0)
 
         # Bulk IN endpoint
-        self._bulk_in_ep = (ep_num + 1) | 0x80
+        self._bulk_in_ep = ep_num | _EP_IN_FLAG
         desc.endpoint(self._bulk_in_ep, "bulk", MTP_BULK_EP_SIZE, 0)
 
         # Interrupt IN endpoint for events
-        self._intr_ep = (ep_num + 2) | 0x80
+        self._intr_ep = (ep_num + 1) | _EP_IN_FLAG
         desc.endpoint(self._intr_ep, "interrupt", MTP_INTERRUPT_EP_SIZE, 10)  # 10ms interval
 
     def on_interface_control_xfer(self, stage, request):

micropython/usb/usb-device/usb/device/core.py

@@ -242,6 +242,7 @@ def active(self, *optional_value):
         return self._usbd.active(*optional_value)
 
     def _open_itf_cb(self, desc):
+        self.did_open = desc
         # Singleton callback from TinyUSB custom class driver, when USB host does
         # Set Configuration. Called once per interface or IAD.
 
@@ -277,8 +278,8 @@ def _open_itf_cb(self, desc):
         #
         # This means on_open() is only called once, and that it can
         # safely submit transfers on any of the USB interfaces' endpoints.
-        if self._itfs.get(max_itf + 1, None) != itf:
-            itf.on_open()
+        # if self._itfs.get(max_itf + 1, None) != itf:
+        itf.on_open()
 
     def _reset_cb(self):
         # Callback when the USB device is reset by the host