feat(dinput): add 8BitDo Pro 2 persona (2026.6.15.1-DD7C)

Author: RealWhyKnot

README.md

@@ -2,9 +2,9 @@
 
 Parsec CouchLink lets a remote Parsec player use a real retro console as player 2.
 
-The Windows host reads the Parsec virtual Xbox controller, sends the button state over Wi-Fi, and a Raspberry Pi Pico 2 W or Pico W presents that input as a wired Xbox 360 controller to a USB-to-console adapter such as USB4MAPLE.
+The Windows host reads the Parsec virtual Xbox controller, sends the button state over Wi-Fi, and a Raspberry Pi Pico 2 W or Pico W presents that input as a USB controller to a console adapter such as USB4MAPLE.
 
-For games that need a keyboard instead -- Typing of the Dead on the Dreamcast, for one -- the same Pico can switch to a USB keyboard with `couchlink.exe keyboard` and forward the player's typing. For Dreamcast Maple adapters that accept Xbox 360 controllers, `couchlink.exe maple` keeps a separate Maple-labelled mode while presenting the same wired Xbox 360 USB shape. See [Controller Routing](https://github.com/RealWhyKnot/ParsecCouchLink/wiki/Controller-Routing) for keyboard and Maple modes.
+For games that need a keyboard instead -- Typing of the Dead on the Dreamcast, for one -- the same Pico can switch to a USB keyboard with `couchlink.exe keyboard` and forward the player's typing. For Dreamcast Maple adapters, `couchlink.exe maple` keeps a Maple-labelled Xbox 360-compatible mode, and `couchlink.exe dinput` presents an experimental 8BitDo Pro 2 D-Input HID gamepad shape for adapters that accept DInput. See [Controller Routing](https://github.com/RealWhyKnot/ParsecCouchLink/wiki/Controller-Routing) for keyboard, Maple, and DInput modes.
 
 **[Releases](https://github.com/RealWhyKnot/ParsecCouchLink/releases)** | **[Wiki](https://github.com/RealWhyKnot/ParsecCouchLink/wiki)** | **[Quick Start](https://github.com/RealWhyKnot/ParsecCouchLink/wiki/Quick-Start)** | **[Troubleshooting](https://github.com/RealWhyKnot/ParsecCouchLink/wiki/Troubleshooting)**
 
@@ -16,7 +16,7 @@ For games that need a keyboard instead -- Typing of the Dead on the Dreamcast, f
   - Raspberry Pi Pico W or Pico WH (RP2040 + Wi-Fi) -- also fully supported
 - Micro-USB data cable
 - 2.4 GHz Wi-Fi name and password (both boards use a 2.4 GHz-only radio)
-- USB4MAPLE or another USB-to-console adapter that accepts a wired Xbox 360 controller
+- USB4MAPLE or another USB-to-console adapter that accepts Xbox 360/XInput or DInput-style USB controllers
 - The console and controller adapter you want to use
 
 ## Quick Start
@@ -58,6 +58,8 @@ Useful commands:
 .\couchlink.exe doctor
 .\couchlink.exe keyboard
 .\couchlink.exe controller
+.\couchlink.exe maple
+.\couchlink.exe dinput
 .\couchlink.exe logs --tail
 .\couchlink.exe configure-wifi
 .\couchlink.exe recover

bridge/src/cmd_persona.rs

@@ -1,6 +1,6 @@
-//! `couchlink keyboard` / `couchlink controller` / `couchlink maple` --
-//! switch a Pico's output persona over Wi-Fi and optionally start
-//! streaming to it.
+//! `couchlink keyboard` / `couchlink controller` / `couchlink maple` /
+//! `couchlink dinput` -- switch a Pico's output persona over Wi-Fi and
+//! optionally start streaming to it.
 //!
 //! The persona is persisted on the Pico and applied at the next boot, so
 //! switching reboots the board. Because the Pico lives plugged into the

bridge/src/cmd_run.rs

@@ -113,7 +113,9 @@ impl StreamRoute {
     pub fn source_label(&self) -> String {
         match self.pico.persona {
             Persona::Keyboard => "Keyboard".to_string(),
-            Persona::Controller | Persona::Maple => xinput::user_slot_label(self.source_slot),
+            Persona::Controller | Persona::Maple | Persona::Dinput => {
+                xinput::user_slot_label(self.source_slot)
+            }
         }
     }
 }
@@ -829,7 +831,7 @@ impl RouteRuntime {
 
     async fn send_tick(&mut self, socket: &UdpSocket) -> std::io::Result<()> {
         let packet = match self.route.pico.persona {
-            Persona::Controller | Persona::Maple => self.next_controller_packet(),
+            Persona::Controller | Persona::Maple | Persona::Dinput => self.next_controller_packet(),
             Persona::Keyboard => self.next_keyboard_packet(),
         };
         self.seq = self.seq.wrapping_add(1);
@@ -942,7 +944,7 @@ fn print_status(routes: &mut [RouteRuntime]) {
             "waiting for source"
         };
         let detail = match route.route.pico.persona {
-            Persona::Controller | Persona::Maple => format!(
+            Persona::Controller | Persona::Maple | Persona::Dinput => format!(
                 "buttons=0x{:04X} lt={} rt={} lx={} ly={} rx={} ry={}",
                 route.last_state.buttons,
                 route.last_state.left_trigger,

bridge/src/cmd_usb_diag.rs

@@ -173,6 +173,7 @@ fn print_usb_diag(diag: &protocol::UsbDiag, persona: protocol::Persona) {
         protocol::Persona::Controller => "XInput",
         protocol::Persona::Keyboard => "HID keyboard",
         protocol::Persona::Maple => "XInput (Maple mode)",
+        protocol::Persona::Dinput => "8BitDo Pro 2 DInput",
     };
     println!("  {}", usb_verdict(diag, device_label));
     println!(
@@ -318,6 +319,12 @@ mod tests {
         assert!(verdict.contains("XInput (Maple mode) report"));
     }
 
+    #[test]
+    fn verdict_uses_dinput_label() {
+        let verdict = usb_verdict(&diag(true, false, false, true), "8BitDo Pro 2 DInput");
+        assert!(verdict.contains("8BitDo Pro 2 DInput report"));
+    }
+
     #[test]
     fn age_label_formats_never_and_seconds() {
         let d = diag(true, true, false, true);

bridge/src/main.rs

@@ -129,6 +129,20 @@ enum Command {
         #[arg(long)]
         no_stream: bool,
     },
+    /// Switch a Pico to 8BitDo Pro 2 D-Input HID mode for USB4MAPLE adapters.
+    Dinput {
+        /// Select a Pico by UID, IP, or board name. Repeat to select more than one.
+        #[arg(long = "pico")]
+        picos: Vec<String>,
+
+        /// Switch every Pico currently visible on Wi-Fi.
+        #[arg(long)]
+        all: bool,
+
+        /// Switch the persona but don't start streaming afterwards.
+        #[arg(long)]
+        no_stream: bool,
+    },
     /// First-time setup wizard: flash the Pico, provision Wi-Fi, and check LAN discovery.
     Setup {
         /// Path to the .uf2 firmware to flash.
@@ -346,6 +360,11 @@ fn main() {
                 all,
                 no_stream,
             }) => cmd_persona::run(protocol::Persona::Maple, picos, all, !no_stream).await,
+            Some(Command::Dinput {
+                picos,
+                all,
+                no_stream,
+            }) => cmd_persona::run(protocol::Persona::Dinput, picos, all, !no_stream).await,
             Some(Command::Setup { uf2 }) => cmd_setup::run(uf2).await,
             Some(Command::Doctor) => cmd_doctor::run().await,
             Some(Command::Flash { uf2, all, from_usb }) => cmd_flash::run(uf2, all, from_usb).await,
@@ -581,4 +600,23 @@ mod tests {
             other => panic!("expected maple command, got {other:?}"),
         }
     }
+
+    #[test]
+    fn dinput_command_parses_target_and_no_stream() {
+        let cli = Cli::try_parse_from(["couchlink", "dinput", "--pico", "07D37EB6", "--no-stream"])
+            .unwrap();
+
+        match cli.command {
+            Some(Command::Dinput {
+                picos,
+                all,
+                no_stream,
+            }) => {
+                assert_eq!(picos, vec!["07D37EB6"]);
+                assert!(!all);
+                assert!(no_stream);
+            }
+            other => panic!("expected dinput command, got {other:?}"),
+        }
+    }
 }

bridge/src/protocol.rs

@@ -76,9 +76,13 @@ pub const ACK_FLAG_KEYBOARD_PERSONA: u8 = 1 << 3;
 /// `TYPE_VERSION`.
 pub const ACK_FLAG_FULL_VERSION_SUPPORTED: u8 = 1 << 4;
 /// Set in the ACK flags byte when the Pico is presenting the Dreamcast
-/// Dreamcast Maple adapter persona. The bridge still streams normal
-/// controller STATE packets; the Pico presents Xbox 360-compatible USB.
+/// Maple adapter persona. The bridge still streams normal controller STATE
+/// packets; the Pico presents Xbox 360-compatible USB.
 pub const ACK_FLAG_MAPLE_PERSONA: u8 = 1 << 5;
+/// Set in the ACK flags byte when the Pico is presenting the 8BitDo Pro 2
+/// D-Input HID persona. The bridge still streams normal controller STATE
+/// packets; the Pico maps them into HID gamepad reports.
+pub const ACK_FLAG_DINPUT_PERSONA: u8 = 1 << 6;
 
 pub const USB_DIAG_WIRE_SIZE: usize = 78;
 pub const USB_DIAG_VERSION: u8 = 1;
@@ -140,13 +144,16 @@ pub enum Persona {
     Controller,
     Keyboard,
     Maple,
+    Dinput,
 }
 
 impl Persona {
     /// Read the active persona from an ACK packet's flags byte.
     pub fn from_ack_flags(flags: u8) -> Self {
         if flags & ACK_FLAG_KEYBOARD_PERSONA != 0 {
             Persona::Keyboard
+        } else if flags & ACK_FLAG_DINPUT_PERSONA != 0 {
+            Persona::Dinput
         } else if flags & ACK_FLAG_MAPLE_PERSONA != 0 {
             Persona::Maple
         } else {
@@ -161,6 +168,7 @@ impl Persona {
             Persona::Controller => 0,
             Persona::Keyboard => 1,
             Persona::Maple => 2,
+            Persona::Dinput => 3,
         }
     }
 
@@ -169,6 +177,7 @@ impl Persona {
             Persona::Controller => "controller",
             Persona::Keyboard => "keyboard",
             Persona::Maple => "maple",
+            Persona::Dinput => "dinput",
         }
     }
 }
@@ -1074,13 +1083,26 @@ mod tests {
             Persona::from_ack_flags(ACK_FLAG_MAPLE_PERSONA | ACK_FLAG_USB_DIAG_SUPPORTED),
             Persona::Maple
         );
+        assert_eq!(
+            Persona::from_ack_flags(ACK_FLAG_DINPUT_PERSONA | ACK_FLAG_USB_DIAG_SUPPORTED),
+            Persona::Dinput
+        );
         assert_eq!(
             Persona::from_ack_flags(ACK_FLAG_KEYBOARD_PERSONA | ACK_FLAG_MAPLE_PERSONA),
             Persona::Keyboard
         );
+        assert_eq!(
+            Persona::from_ack_flags(ACK_FLAG_DINPUT_PERSONA | ACK_FLAG_MAPLE_PERSONA),
+            Persona::Dinput
+        );
+        assert_eq!(
+            Persona::from_ack_flags(ACK_FLAG_KEYBOARD_PERSONA | ACK_FLAG_DINPUT_PERSONA),
+            Persona::Keyboard
+        );
         assert_eq!(Persona::Controller.flash_byte(), 0);
         assert_eq!(Persona::Keyboard.flash_byte(), 1);
         assert_eq!(Persona::Maple.flash_byte(), 2);
+        assert_eq!(Persona::Dinput.flash_byte(), 3);
     }
 
     #[test]

pico-bridge/CMakeLists.txt

@@ -89,6 +89,8 @@ add_executable(pico_bridge
     src/cdc_handlers.c
     src/cdc_proto.c
     src/diag_log.c
+    src/dinput.c
+    src/dinput_report.c
     src/fault_handler.c
     src/flash_creds.c
     src/heartbeat.c

pico-bridge/src/boot_mode.c

@@ -17,7 +17,8 @@
 // flash_creds.h dependency (and thus host-compilable for unit tests).
 _Static_assert((int)FLASH_PERSONA_CONTROLLER == (int)RUN_PERSONA_CONTROLLER &&
                    (int)FLASH_PERSONA_KEYBOARD == (int)RUN_PERSONA_KEYBOARD &&
-                   (int)FLASH_PERSONA_MAPLE == (int)RUN_PERSONA_MAPLE,
+                   (int)FLASH_PERSONA_MAPLE == (int)RUN_PERSONA_MAPLE &&
+                   (int)FLASH_PERSONA_DINPUT == (int)RUN_PERSONA_DINPUT,
                "flash persona byte values must match run_persona_t");
 
 static boot_mode_t current = BOOT_MODE_SETUP;

pico-bridge/src/boot_mode_policy.c

@@ -23,6 +23,8 @@ run_persona_t boot_mode_persona_from_flash(bool have_creds, uint8_t persona_byte
         return RUN_PERSONA_KEYBOARD;
     if (persona_byte == (uint8_t)RUN_PERSONA_MAPLE)
         return RUN_PERSONA_MAPLE;
+    if (persona_byte == (uint8_t)RUN_PERSONA_DINPUT)
+        return RUN_PERSONA_DINPUT;
     return RUN_PERSONA_CONTROLLER;
 }
 

pico-bridge/src/boot_mode_policy.h

@@ -21,6 +21,7 @@ typedef enum {
     RUN_PERSONA_CONTROLLER = 0, // wired Xbox 360 / XInput (default)
     RUN_PERSONA_KEYBOARD = 1,   // USB HID boot keyboard
     RUN_PERSONA_MAPLE = 2,      // Xbox-compatible Dreamcast Maple adapter mode
+    RUN_PERSONA_DINPUT = 3,     // 8BitDo Pro 2 D-Input HID gamepad
 } run_persona_t;
 
 bootsel_setup_action_t boot_mode_bootsel_setup_action(bool still_pressed, int64_t elapsed_us);
@@ -34,5 +35,5 @@ run_persona_t boot_mode_persona_from_flash(bool have_creds, uint8_t persona_byte
 // True for runtime personas that present the wired Xbox 360 USB device
 // shape. Maple mode keeps a separate persisted label, but deliberately
 // matches this USB shape for Dreamcast Maple adapters that already
-// support Xbox 360 controllers.
+// support Xbox 360 controllers. DInput is HID and returns false.
 bool boot_mode_persona_uses_xinput_usb(run_persona_t persona);