diff options
Diffstat (limited to 'keyboards/tau4')
| -rw-r--r-- | keyboards/tau4/info.json | 108 | ||||
| -rwxr-xr-x | keyboards/tau4/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/tau4/tau4.c | 14 |
3 files changed, 56 insertions, 68 deletions
diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json index dca1387203..f5acdbddd3 100644 --- a/keyboards/tau4/info.json +++ b/keyboards/tau4/info.json @@ -13,8 +13,8 @@ "lto": true }, "matrix_pins": { - "rows": [ "F4", "F5", "F6", "F7" ], - "cols": [ "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0", "B0", "B1" ] + "rows": ["F4", "F5", "F6", "F7"], + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0", "B0", "B1"] }, "processor": "atmega32u4", "features": { @@ -26,11 +26,11 @@ "oled": true, "rgblight": true }, - "community_layouts": [ "ortho_4x12" ], + "community_layouts": ["ortho_4x12"], "diode_direction": "COL2ROW", "encoder": { "rotary": [ - { "pin_a": "B3", "pin_b": "B7", "resolution": 1 } + {"pin_a": "B3", "pin_b": "B7", "resolution": 1} ] }, "rgblight": { @@ -56,64 +56,66 @@ }, "led_count": 10, "max_brightness": 128, - "pin": "B2", "saturation_steps": 16, "sleep": true }, + "ws2812": { + "pin": "B2" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"label": "Mute", "matrix": [0, 0], "x":0, "y":0}, - {"label": "Q", "matrix": [0, 1], "x":1, "y":0}, - {"label": "W", "matrix": [0, 2], "x":2, "y":0}, - {"label": "E", "matrix": [0, 3], "x":3, "y":0}, - {"label": "R", "matrix": [0, 4], "x":4, "y":0}, - {"label": "T", "matrix": [0, 5], "x":5, "y":0}, - {"label": "Y", "matrix": [0, 6], "x":6, "y":0}, - {"label": "U", "matrix": [0, 7], "x":7, "y":0}, - {"label": "I", "matrix": [0, 8], "x":8, "y":0}, - {"label": "O", "matrix": [0, 9], "x":9, "y":0}, - {"label": "P", "matrix": [0, 10], "x":10, "y":0}, - {"label": "Backspace", "matrix": [0, 11], "x":11, "y":0}, + {"label": "Mute", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "Backspace", "matrix": [0, 11], "x": 11, "y": 0}, - {"label": "Esc", "matrix": [1, 0], "x":0, "y":1}, - {"label": "A", "matrix": [1, 1], "x":1, "y":1}, - {"label": "S", "matrix": [1, 2], "x":2, "y":1}, - {"label": "D", "matrix": [1, 3], "x":3, "y":1}, - {"label": "F", "matrix": [1, 4], "x":4, "y":1}, - {"label": "G", "matrix": [1, 5], "x":5, "y":1}, - {"label": "H", "matrix": [1, 6], "x":6, "y":1}, - {"label": "J", "matrix": [1, 7], "x":7, "y":1}, - {"label": "K", "matrix": [1, 8], "x":8, "y":1}, - {"label": "L", "matrix": [1, 9], "x":9, "y":1}, - {"label": ";:", "matrix": [1, 10], "x":10, "y":1}, - {"label": "'\"", "matrix": [1, 11], "x":11, "y":1}, + {"label": "Esc", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "A", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": ";:", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "'\"", "matrix": [1, 11], "x": 11, "y": 1}, - {"label": "Shift", "matrix": [2, 0], "x":0, "y":2}, - {"label": "Z", "matrix": [2, 1], "x":1, "y":2}, - {"label": "X", "matrix": [2, 2], "x":2, "y":2}, - {"label": "C", "matrix": [2, 3], "x":3, "y":2}, - {"label": "V", "matrix": [2, 4], "x":4, "y":2}, - {"label": "B", "matrix": [2, 5], "x":5, "y":2}, - {"label": "N", "matrix": [2, 6], "x":6, "y":2}, - {"label": "M", "matrix": [2, 7], "x":7, "y":2}, - {"label": ",<", "matrix": [2, 8], "x":8, "y":2}, - {"label": ".>", "matrix": [2, 9], "x":9, "y":2}, - {"label": "/?", "matrix": [2, 10], "x":10, "y":2}, - {"label": "Enter", "matrix": [2, 11], "x":11, "y":2}, + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Z", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7, "y": 2}, + {"label": ",<", "matrix": [2, 8], "x": 8, "y": 2}, + {"label": ".>", "matrix": [2, 9], "x": 9, "y": 2}, + {"label": "/?", "matrix": [2, 10], "x": 10, "y": 2}, + {"label": "Enter", "matrix": [2, 11], "x": 11, "y": 2}, - {"label": "Backspace", "matrix": [3, 0], "x":0, "y":3}, - {"label": "Ctrl", "matrix": [3, 1], "x":1, "y":3}, - {"label": "GUI", "matrix": [3, 2], "x":2, "y":3}, - {"label": "Alt", "matrix": [3, 3], "x":3, "y":3}, - {"label": "Lower", "matrix": [3, 4], "x":4, "y":3}, - {"label": "Space", "matrix": [3, 5], "x":5, "y":3}, - {"label": "Space", "matrix": [3, 6], "x":6, "y":3}, - {"label": "Raise", "matrix": [3, 7], "x":7, "y":3}, - {"label": "Left", "matrix": [3, 8], "x":8, "y":3}, - {"label": "Down", "matrix": [3, 9], "x":9, "y":3}, - {"label": "Up", "matrix": [3, 10], "x":10, "y":3}, - {"label": "Right", "matrix": [3, 11], "x":11, "y":3} + {"label": "Backspace", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "Ctrl", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "GUI", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "Alt", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "Lower", "matrix": [3, 4], "x": 4, "y": 3}, + {"label": "Space", "matrix": [3, 5], "x": 5, "y": 3}, + {"label": "Space", "matrix": [3, 6], "x": 6, "y": 3}, + {"label": "Raise", "matrix": [3, 7], "x": 7, "y": 3}, + {"label": "Left", "matrix": [3, 8], "x": 8, "y": 3}, + {"label": "Down", "matrix": [3, 9], "x": 9, "y": 3}, + {"label": "Up", "matrix": [3, 10], "x": 10, "y": 3}, + {"label": "Right", "matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/tau4/keymaps/default/keymap.c b/keyboards/tau4/keymaps/default/keymap.c index 775ec3a8f4..92baeefbfc 100755 --- a/keyboards/tau4/keymaps/default/keymap.c +++ b/keyboards/tau4/keymaps/default/keymap.c @@ -104,7 +104,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { } #ifdef ENCODER_MAP_ENABLE - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_NUMPAD] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_LOWER] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/tau4/tau4.c b/keyboards/tau4/tau4.c index aa508aae2c..c93d73f2b4 100644 --- a/keyboards/tau4/tau4.c +++ b/keyboards/tau4/tau4.c @@ -17,20 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "quantum.h" -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return true; -} -#endif - #ifdef OLED_ENABLE bool oled_task_kb(void) { if (!oled_task_user()) { return false; } |