Skip to content

Switch1 experiment #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkennedy wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Switch1 experiment #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e41a27
adding switch 1 pro controller
Jun 8, 2026
5f8bea5
Checkpoint Switch Pro stick debugging state
Jun 9, 2026
940ac98
Trim Switch Pro stick diagnostics
Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 80 additions & 1 deletion config-tool-web/code.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const SET_MONITOR_ENABLED = 22;
const CLEAR_QUIRKS = 23;
const ADD_QUIRK = 24;
const GET_QUIRK = 25;
const GET_SWITCH_PRO_DIAG = 26;

const PERSIST_CONFIG_SUCCESS = 1;
const PERSIST_CONFIG_CONFIG_TOO_BIG = 2;
Expand Down Expand Up @@ -190,6 +191,7 @@ document.addEventListener("DOMContentLoaded", function () {
document.getElementById("flash_b_side").addEventListener("click", flash_b_side);
document.getElementById("pair_new_device").addEventListener("click", pair_new_device);
document.getElementById("clear_bonds").addEventListener("click", clear_bonds);
document.getElementById("switch_pro_diag").addEventListener("click", switch_pro_diag);
document.getElementById("monitor_clear").addEventListener("click", monitor_clear);
document.getElementById("file_input").addEventListener("change", file_uploaded);
document.getElementById("add_quirk").addEventListener("click", add_empty_quirk);
Expand Down Expand Up @@ -866,6 +868,82 @@ async function clear_bonds() {
await send_feature_command(CLEAR_BONDS);
}

function hex_byte(value) {
return (value & 0xff).toString(16).padStart(2, '0');
}

function hex_word(value) {
return (value >>> 0).toString(16).padStart(8, '0');
}

async function switch_pro_diag() {
clear_error();
try {
const pages = [];
for (let page = 0; page < 10; page++) {
await send_feature_command(GET_SWITCH_PRO_DIAG, [[UINT32, page]]);
pages.push(await read_config_feature([UINT32, UINT32, UINT32, UINT32, UINT32, UINT32, UINT32]));
}

const format_pages = (label, offset) => {
const p0 = pages[offset];
const p1 = pages[offset + 1];
const p2 = pages[offset + 2];
const p3 = pages[offset + 3];
const p4 = pages[offset + 4];
const buttons = p3[0];
const left_stick = p3[1];
const right_stick = p3[2];
const bt_connected = p3[5] & 0xffff;
const hogp_ready = p3[5] >>> 16;
const bt_disconnected = p3[6] & 0xffff;
const last_disconnect = (p3[6] >>> 16) & 0xff;
const conn_high = p3[6] >>> 24;

return [
label,
'magic=0x' + hex_word(p0[0]) + ' version=' + p0[1] + ' enabled=' + p0[2],
'report_q=' + (p0[3] & 0xffff) + ' high=' + (p0[3] >>> 16) +
' response_q=' + (p0[4] & 0xffff) + ' high=' + (p0[4] >>> 16) +
' out_q=' + p0[5] + ' out_overflows=' + p0[6],
'ble=' + p1[0] + ' ble_drop=' + p1[1] +
' host=' + p1[2] + ' host_drop=' + p1[3] +
' set=' + p1[4] + ' translated=' + p1[5] + ' response_drop=' + p1[6],
'mapped=' + p2[0] + ' mapped_fail=' + p2[1] +
' heartbeat=' + p2[2] + ' heartbeat_fail=' + p2[3] +
' response=' + p2[4] + ' response_fail=' + p2[5] + ' timer=' + p2[6],
'buttons=' + hex_byte(buttons) + ' ' + hex_byte(buttons >> 8) + ' ' + hex_byte(buttons >> 16) +
' left_stick=' + hex_byte(left_stick) + ' ' + hex_byte(left_stick >> 8) + ' ' + hex_byte(left_stick >> 16) +
' right_stick=' + hex_byte(right_stick) + ' ' + hex_byte(right_stick >> 8) + ' ' + hex_byte(right_stick >> 16) +
' last_input_ms=' + p3[4],
'bt_connected=' + bt_connected + ' hogp_ready=' + hogp_ready +
' bt_disconnected=' + bt_disconnected + ' last_disconnect=' + last_disconnect + ' conn_high=' + conn_high,
'axis_last lx=0x' + (p4[0] & 0xffff).toString(16).padStart(4, '0') +
' ly=0x' + (p4[0] >>> 16).toString(16).padStart(4, '0') +
' rx=0x' + (p4[1] & 0xffff).toString(16).padStart(4, '0') +
' ry=0x' + (p4[1] >>> 16).toString(16).padStart(4, '0'),
'axis_range lx=0x' + (p4[2] & 0xffff).toString(16).padStart(4, '0') + '..0x' + (p4[2] >>> 16).toString(16).padStart(4, '0') +
' ly=0x' + (p4[3] & 0xffff).toString(16).padStart(4, '0') + '..0x' + (p4[3] >>> 16).toString(16).padStart(4, '0') +
' rx=0x' + (p4[4] & 0xffff).toString(16).padStart(4, '0') + '..0x' + (p4[4] >>> 16).toString(16).padStart(4, '0') +
' ry=0x' + (p4[5] & 0xffff).toString(16).padStart(4, '0') + '..0x' + (p4[5] >>> 16).toString(16).padStart(4, '0'),
];
};

const lines = [
'Switch Pro diagnostics',
...format_pages('live', 0),
'',
...format_pages('saved', 5),
'',
'raw=' + pages.map((page) => page.map((value) => '0x' + hex_word(value)).join(' ')).join(' | '),
];

display_error_html('<pre class="mb-0 user-select-all">' + lines.join('\n') + '</pre>');
} catch (e) {
display_error(e);
}
}

function file_uploaded() {
const reader = new FileReader();
reader.onload = function (e) {
Expand Down Expand Up @@ -1484,6 +1562,7 @@ function device_buttons_set_disabled_state(state) {
document.getElementById("flash_b_side").disabled = state;
document.getElementById("pair_new_device").disabled = state;
document.getElementById("clear_bonds").disabled = state;
document.getElementById("switch_pro_diag").disabled = state;
}

function bluetooth_buttons_set_visibility(visible) {
Expand Down Expand Up @@ -1845,4 +1924,4 @@ function usage_search_onchange(element) {
}
element.closest('div').querySelector('.have_preferred_result_checkmark').classList.toggle('d-none', !have_preferred_result);
}
}
}
18 changes: 18 additions & 0 deletions config-tool-web/examples.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10069,4 +10069,22 @@ const examples = [
}
];

const xbox_bluetooth_switch_idx = examples.findIndex((example) => example.description == 'Xbox controller (Bluetooth) adapter for Switch');
if (xbox_bluetooth_switch_idx >= 0) {
const switch_pro_example = JSON.parse(JSON.stringify(examples[xbox_bluetooth_switch_idx]));
switch_pro_example.description = 'Xbox controller (Bluetooth) adapter for Switch Pro Controller';
switch_pro_example.config.our_descriptor_number = 6;
for (const mapping of switch_pro_example.config.mappings) {
if ([
'0x00010030',
'0x00010031',
'0x00010032',
'0x00010035',
].includes(mapping.source_usage) && mapping.source_usage === mapping.target_usage) {
mapping.scaling = 257000;
}
}
examples.splice(xbox_bluetooth_switch_idx + 1, 0, switch_pro_example);
}

export default examples;
4 changes: 4 additions & 0 deletions config-tool-web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ <h1 class="mt-sm-5 mt-3">HID Remapper Configuration</h1>
<option value="3">PS4 arcade stick</option>
<option value="4">Stadia controller</option>
<option value="5">XAC/Flex compatible</option>
<option value="6">Switch Pro Controller</option>
</select>
</div>
</div>
Expand Down Expand Up @@ -294,6 +295,9 @@ <h5 class="mt-4">Custom usages</h5>
<div class="col-4 d-none" id="clear_bonds_container">
<button id="clear_bonds" type="button" class="btn btn-primary w-100">Forget all devices</button>
</div>
<div class="col-4" id="switch_pro_diag_container">
<button id="switch_pro_diag" type="button" class="btn btn-primary w-100">Switch Pro diagnostics</button>
</div>
</div>

</div>
Expand Down
27 changes: 27 additions & 0 deletions config-tool-web/usages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,32 @@ const usages = {
"0x00090007": { 'name': 'View', 'class': 'mouse' },
"0x00090008": { 'name': 'Menu', 'class': 'mouse' },
},
6: {
"0x00090001": { 'name': 'Y', 'class': 'mouse' },
"0x00090002": { 'name': 'B', 'class': 'mouse' },
"0x00090003": { 'name': 'A', 'class': 'mouse' },
"0x00090004": { 'name': 'X', 'class': 'mouse' },
"0x00090005": { 'name': 'L', 'class': 'mouse' },
"0x00090006": { 'name': 'R', 'class': 'mouse' },
"0x00090007": { 'name': 'ZL', 'class': 'mouse' },
"0x00090008": { 'name': 'ZR', 'class': 'mouse' },
"0x00090009": { 'name': 'Minus', 'class': 'mouse' },
"0x0009000a": { 'name': 'Plus', 'class': 'mouse' },
"0x0009000b": { 'name': 'LS', 'class': 'mouse' },
"0x0009000c": { 'name': 'RS', 'class': 'mouse' },
"0x0009000d": { 'name': 'Home', 'class': 'mouse' },
"0x0009000e": { 'name': 'Capture', 'class': 'mouse' },
"0x0009000f": { 'name': 'Button 15', 'class': 'mouse' },
"0x00090010": { 'name': 'Button 16', 'class': 'mouse' },
"0xfff90001": { 'name': 'D-pad left', 'class': 'mouse' },
"0xfff90002": { 'name': 'D-pad right', 'class': 'mouse' },
"0xfff90003": { 'name': 'D-pad up', 'class': 'mouse' },
"0xfff90004": { 'name': 'D-pad down', 'class': 'mouse' },
"0x00010030": { 'name': 'Left stick X', 'class': 'mouse' },
"0x00010031": { 'name': 'Left stick Y', 'class': 'mouse' },
"0x00010032": { 'name': 'Right stick X', 'class': 'mouse' },
"0x00010035": { 'name': 'Right stick Y', 'class': 'mouse' },
},
};

const common_target_usages = {
Expand Down Expand Up @@ -645,6 +671,7 @@ Object.assign(usages[2], common_target_usages);
Object.assign(usages[3], common_target_usages);
Object.assign(usages[4], common_target_usages);
Object.assign(usages[5], common_target_usages);
Object.assign(usages[6], common_target_usages);
usages[1] = usages[0]; // absolute mouse & keyboard is the same as regular mouse & keyboard

export default usages;
Loading