Actually commit conflict resolution.

This commit is contained in:
Nick Brassel 2023-03-30 08:40:35 +11:00
parent 836ffabc3d
commit c0a24671ee
No known key found for this signature in database
1 changed files with 46 additions and 0 deletions

View File

@ -8,8 +8,54 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
"qmk_lufa_bootloader": {
"esc_input": "C2",
"esc_output": "C4"
},
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"community_layouts": [
"60_ansi",
"60_ansi_split_bs_rshift",
"60_ansi_tsangan",
"60_hhkb",
"60_iso",
"60_iso_split_bs_rshift",
"60_iso_tsangan",
"60_tsangan_hhkb"
],
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["C4","C6","B7","B6","B5","B4","B3","B2","B1","D6","D5","D4","D2","D1"],
"rows": ["C2","D0","B0","C7","C5"]
},
"features": {
"audio": false,
"backlight": false,
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": true,
"rgblight": true
},
"rgblight": {
"led_count": 12,
"pin": "D3",
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
}
},
"layouts": {
"LAYOUT_all": {
"layout": [