Modified to add flag to build with XAC

ATMakersBill · ATMakersBill · commit 6b1509d758ca · 2019-08-19T09:01:33.000-04:00
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
@@ -28,6 +28,11 @@ ifneq ($(SPI_FLASH_FILESYSTEM),)
 	CFLAGS += -DSPI_FLASH_FILESYSTEM=$(SPI_FLASH_FILESYSTEM) -DEXPRESS_BOARD
 endif
 
+# If HID_CONFIG is not set, set it to standard.  This is stop-gap to support the XAC
+ifeq ($(HID_CONFIG),)
+HID_CONFIG = standard
+endif
+
 # Choose which flash filesystem impl to use.
 # (Right now INTERNAL_FLASH_FILESYSTEM and SPI_FLASH_FILESYSTEM are mutually exclusive.
 # But that might not be true in the future.)
@@ -93,6 +98,7 @@ autogen_usb_descriptor.intermediate: ../../tools/gen_usb_descriptor.py Makefile
 	$(STEPECHO) "GEN $@"
 	$(Q)install -d $(BUILD)/genhdr
 	$(Q)$(PYTHON3) ../../tools/gen_usb_descriptor.py \
+                --hid_config $(HID_CONFIG) \
 		--manufacturer $(USB_MANUFACTURER)\
 		--product $(USB_PRODUCT)\
 		--vid $(USB_VID)\
diff --git a/tools/gen_usb_descriptor.py b/tools/gen_usb_descriptor.py
@@ -9,6 +9,8 @@
 import hid_report_descriptors
 
 parser = argparse.ArgumentParser(description='Generate USB descriptors.')
+parser.add_argument('--hid_config', type=str,
+                    help='standard HID or XAC')
 parser.add_argument('--manufacturer', type=str,
                     help='manufacturer of the device')
 parser.add_argument('--product', type=str,
@@ -140,7 +142,10 @@ def strings_in_order(cls):
 
 # Include only these HID devices.
 # DIGITIZER works on Linux but conflicts with MOUSE, so leave it out for now.
-hid_devices = ("KEYBOARD", "MOUSE", "CONSUMER", "GAMEPAD")
+if (args.hid_config == "XAC"):
+    hid_devices = ("XAC",)
+else:
+    hid_devices = ("KEYBOARD", "MOUSE", "CONSUMER", "GAMEPAD")
 
 combined_hid_report_descriptor = hid.ReportDescriptor(
     description="MULTIDEVICE",
diff --git a/tools/hid_report_descriptors.py b/tools/hid_report_descriptors.py
@@ -38,6 +38,7 @@
     "SYS_CONTROL" : 4,
     "GAMEPAD" : 5,
     "DIGITIZER" : 6,
+    "XAC" : 7,
     }
 
 # Byte count for each kind of report. Length does not include report ID in first byte.
@@ -48,6 +49,7 @@
     "SYS_CONTROL" : 1,
     "GAMEPAD" : 6,
     "DIGITIZER" : 5,
+    "XAC" : 6
     }
 
 KEYBOARD_WITH_ID = hid.ReportDescriptor(
@@ -194,6 +196,35 @@
         0xC0,              # End Collection
     ]))
 
+XAC_WITH_ID = hid.ReportDescriptor(
+    description="XAC",
+    report_descriptor=bytes([
+        # This descriptor mimics the simple joystick from PDP that the XBox likes
+        0x05, 0x01,         #  Usage Page (Desktop),
+        0x09, 0x05,         #  Usage (Gamepad),
+        0xA1, 0x01,         #  Collection (Application),
+        0x85, REPORT_IDS["XAC"], # Report ID (n)
+        0x15, 0x00,         #      Logical Minimum (0),
+        0x25, 0x01,         #      Logical Maximum (1),
+        0x35, 0x00,         #      Physical Minimum (0),
+        0x45, 0x01,         #      Physical Maximum (1),
+        0x75, 0x01,         #      Report Size (1),
+        0x95, 0x08,         #      Report Count (8),
+        0x05, 0x09,         #      Usage Page (Button),
+        0x19, 0x01,         #      Usage Minimum (01h),
+        0x29, 0x08,         #      Usage Maximum (08h),
+        0x81, 0x02,         #      Input (Variable),
+        0x05, 0x01,         #      Usage Page (Desktop),
+        0x26, 0xFF, 0x00,   #      Logical Maximum (255),
+        0x46, 0xFF, 0x00,   #      Physical Maximum (255),
+        0x09, 0x30,         #      Usage (X),
+        0x09, 0x31,         #      Usage (Y),
+        0x75, 0x08,         #      Report Size (8),
+        0x95, 0x02,         #      Report Count (2),
+        0x81, 0x02,         #      Input (Variable),
+        0xC0                #  End Collection
+    ]))
+
 DIGITIZER_WITH_ID = hid.ReportDescriptor(
     description="DIGITIZER",
     report_descriptor=bytes([
@@ -236,4 +267,5 @@
     "SYS_CONTROL" : SYS_CONTROL_WITH_ID,
     "GAMEPAD" : GAMEPAD_WITH_ID,
     "DIGITIZER" : DIGITIZER_WITH_ID,
+    "XAC" : XAC_WITH_ID,
     }
