From 39f5930eb125d2f0c31d87c29cf5a321e1667865 Mon Sep 17 00:00:00 2001 From: sorgelig Date: Sun, 12 Sep 2021 02:07:02 +0800 Subject: [PATCH] input: add ControllaBLE (DIY) adapter to no_merge. --- input.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/input.cpp b/input.cpp index 8f2f78b..e5fca55 100644 --- a/input.cpp +++ b/input.cpp @@ -2962,10 +2962,11 @@ void mergedevs() //Bypass merging of specified 2 port/player controllers make_unique(0x289B, 0x0057, -1); // Raphnet - make_unique(0x0E8F, 0x3013, 1); // Mayflash SNES controller 2 port adapter - make_unique(0x16C0, 0x05E1, 1); // XinMo XM-10 2 player USB Encoder - make_unique(0x045E, 0x02A1, 1); // Xbox 360 wireless receiver + make_unique(0x0E8F, 0x3013, 1); // Mayflash SNES controller 2 port adapter + make_unique(0x16C0, 0x05E1, 1); // XinMo XM-10 2 player USB Encoder + make_unique(0x045E, 0x02A1, 1); // Xbox 360 wireless receiver make_unique(0x8282, 0x3201, 1); // Irken Labs JAMMA Expander / Mojo Retro Adapter + make_unique(0x1209, 0xFACA, 1); // ControllaBLE if (cfg.no_merge_vid) {