Skip to content

Commit 0fb951c

Browse files
Add CI built packages from commit 9d3da52 of feature/usbd_python
1 parent 464f649 commit 0fb951c

File tree

19 files changed

+50
-73
lines changed

19 files changed

+50
-73
lines changed
-786 Bytes
Binary file not shown.
1.49 KB
Binary file not shown.

mip/feature/usbd_python/file/d7/d76b7773 renamed to mip/feature/usbd_python/file/79/79466b27

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#
66
# MIT license; Copyright (c) 2023 Angus Gratton
77
from micropython import const
8+
import machine
89
import struct
910
import time
1011
from .impl import Interface, Descriptor, split_bmRequestType
@@ -118,7 +119,7 @@ class HIDInterface(Interface):
118119
while self.busy():
119120
if time.ticks_diff(deadline, time.ticks_ms()) <= 0:
120121
return False
121-
time.sleep_ms(50)
122+
machine.idle()
122123
if not self.is_open():
123124
return False
124125
self.submit_xfer(self._int_ep, report_data)

mip/feature/usbd_python/file/be/be1af6c5 renamed to mip/feature/usbd_python/file/bd/bdb51aad

Lines changed: 35 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -38,84 +38,60 @@ class MouseInterface(HIDInterface):
3838
# same buffer, before the previous one has completed.
3939
report = struct.pack("Bbb", b, dx, dy)
4040

41-
super().send_report(report)
41+
return super().send_report(report)
4242

4343
def click_left(self, down=True):
4444
self._l = down
45-
self.send_report()
45+
return self.send_report()
4646

4747
def click_middle(self, down=True):
4848
self._m = down
49-
self.send_report()
49+
return self.send_report()
5050

5151
def click_right(self, down=True):
5252
self._r = down
53-
self.send_report()
53+
return self.send_report()
5454

5555
def move_by(self, dx, dy):
5656
if not -127 <= dx <= 127:
5757
raise ValueError("dx")
5858
if not -127 <= dy <= 127:
5959
raise ValueError("dy")
60-
self.send_report(dx, dy)
60+
return self.send_report(dx, dy)
6161

6262

6363
# Basic 3-button mouse HID Report Descriptor.
64-
# This is cribbed from Appendix E.10 of the HID v1.11 document.
65-
_MOUSE_REPORT_DESC = bytes(
66-
[
67-
0x05,
68-
0x01, # Usage Page (Generic Desktop)
69-
0x09,
70-
0x02, # Usage (Mouse)
71-
0xA1,
72-
0x01, # Collection (Application)
73-
0x09,
74-
0x01, # Usage (Pointer)
75-
0xA1,
76-
0x00, # Collection (Physical)
77-
0x05,
78-
0x09, # Usage Page (Buttons)
79-
0x19,
80-
0x01, # Usage Minimum (01),
81-
0x29,
82-
0x03, # Usage Maximun (03),
83-
0x15,
84-
0x00, # Logical Minimum (0),
85-
0x25,
86-
0x01, # Logical Maximum (1),
87-
0x95,
88-
0x03, # Report Count (3),
89-
0x75,
90-
0x01, # Report Size (1),
91-
0x81,
92-
0x02, # Input (Data, Variable, Absolute), ;3 button bits
93-
0x95,
94-
0x01, # Report Count (1),
95-
0x75,
96-
0x05, # Report Size (5),
97-
0x81,
98-
0x01, # Input (Constant), ;5 bit padding
99-
0x05,
100-
0x01, # Usage Page (Generic Desktop),
101-
0x09,
102-
0x30, # Usage (X),
103-
0x09,
104-
0x31, # Usage (Y),
105-
0x15,
106-
0x81, # Logical Minimum (-127),
107-
0x25,
108-
0x7F, # Logical Maximum (127),
109-
0x75,
110-
0x08, # Report Size (8),
111-
0x95,
112-
0x02, # Report Count (2),
113-
0x81,
114-
0x06, # Input (Data, Variable, Relative), ;2 position bytes (X & Y)
115-
0xC0, # End Collection,
116-
0xC0, # End Collection
117-
]
64+
# This is based on Appendix E.10 of the HID v1.11 document.
65+
# fmt: off
66+
_MOUSE_REPORT_DESC = (
67+
b'\x05\x01' # Usage Page (Generic Desktop)
68+
b'\x09\x02' # Usage (Mouse)
69+
b'\xA1\x01' # Collection (Application)
70+
b'\x09\x01' # Usage (Pointer)
71+
b'\xA1\x00' # Collection (Physical)
72+
b'\x05\x09' # Usage Page (Buttons)
73+
b'\x19\x01' # Usage Minimum (01),
74+
b'\x29\x03' # Usage Maximun (03),
75+
b'\x15\x00' # Logical Minimum (0),
76+
b'\x25\x01' # Logical Maximum (1),
77+
b'\x95\x03' # Report Count (3),
78+
b'\x75\x01' # Report Size (1),
79+
b'\x81\x02' # Input (Data, Variable, Absolute), ;3 button bits
80+
b'\x95\x01' # Report Count (1),
81+
b'\x75\x05' # Report Size (5),
82+
b'\x81\x01' # Input (Constant), ;5 bit padding
83+
b'\x05\x01' # Usage Page (Generic Desktop),
84+
b'\x09\x30' # Usage (X),
85+
b'\x09\x31' # Usage (Y),
86+
b'\x15\x81' # Logical Minimum (-127),
87+
b'\x25\x7F' # Logical Maximum (127),
88+
b'\x75\x08' # Report Size (8),
89+
b'\x95\x02' # Report Count (2),
90+
b'\x81\x06' # Input (Data, Variable, Relative), ;2 position bytes (X & Y)
91+
b'\xC0' # End Collection
92+
b'\xC0' # End Collection
11893
)
94+
# fmt: on
11995

12096

12197
__version__ = '0.1.0'
737 Bytes
Binary file not shown.
-1.48 KB
Binary file not shown.

mip/feature/usbd_python/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1832,5 +1832,5 @@
18321832
}
18331833
],
18341834
"v": 1,
1835-
"updated": 1712635730
1835+
"updated": 1713232112
18361836
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","f43ff743"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","137de745"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","f43ff743"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","137de745"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","f43ff743"],["usb/device/keyboard.mpy","335d1f78"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","137de745"],["usb/device/keyboard.mpy","335d1f78"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","f43ff743"],["usb/device/keyboard.mpy","335d1f78"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","137de745"],["usb/device/keyboard.mpy","335d1f78"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","f43ff743"],["usb/device/mouse.mpy","0f07aa26"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","137de745"],["usb/device/mouse.mpy","d64245fb"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","f43ff743"],["usb/device/mouse.mpy","0f07aa26"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.mpy","e2f1027e"],["usb/device/__init__.mpy","9b2f05b0"],["usb/device/hid.mpy","137de745"],["usb/device/mouse.mpy","d64245fb"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","d76b7773"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","79466b27"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","d76b7773"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","79466b27"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","d76b7773"],["usb/device/keyboard.py","8b46527a"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","79466b27"],["usb/device/keyboard.py","8b46527a"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","d76b7773"],["usb/device/keyboard.py","8b46527a"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","79466b27"],["usb/device/keyboard.py","8b46527a"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","d76b7773"],["usb/device/mouse.py","be1af6c5"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","79466b27"],["usb/device/mouse.py","bdb51aad"]],"version":"0.1.0"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","d76b7773"],["usb/device/mouse.py","be1af6c5"]],"version":"0.1.0"}
1+
{"v":1,"hashes":[["usb/device/impl.py","5d47cee7"],["usb/device/__init__.py","d97e6f94"],["usb/device/hid.py","79466b27"],["usb/device/mouse.py","bdb51aad"]],"version":"0.1.0"}

0 commit comments

Comments
 (0)