diff options
Diffstat (limited to 'keyboards/cannonkeys/ortho48v2')
| -rw-r--r-- | keyboards/cannonkeys/ortho48v2/info.json | 98 | ||||
| -rw-r--r-- | keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c | 2 |
3 files changed, 51 insertions, 51 deletions
diff --git a/keyboards/cannonkeys/ortho48v2/info.json b/keyboards/cannonkeys/ortho48v2/info.json index e49d86d517..4ead7db042 100644 --- a/keyboards/cannonkeys/ortho48v2/info.json +++ b/keyboards/cannonkeys/ortho48v2/info.json @@ -27,7 +27,7 @@ }, "encoder": { "rotary": [ - { "pin_a": "GP28", "pin_b": "GP29" } + {"pin_a": "GP28", "pin_b": "GP29"} ] }, "backlight": { @@ -42,54 +42,54 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"label":"Tab", "x":0, "y":0, "matrix": [0,0]}, - {"label":"Q", "x":1, "y":0, "matrix": [0,1]}, - {"label":"W", "x":2, "y":0, "matrix": [0,2]}, - {"label":"E", "x":3, "y":0, "matrix": [0,3]}, - {"label":"R", "x":4, "y":0, "matrix": [0,4]}, - {"label":"T", "x":5, "y":0, "matrix": [0,5]}, - {"label":"Y", "x":6, "y":0, "matrix": [0,6]}, - {"label":"U", "x":7, "y":0, "matrix": [0,7]}, - {"label":"I", "x":8, "y":0, "matrix": [0,8]}, - {"label":"O", "x":9, "y":0, "matrix": [0,9]}, - {"label":"P", "x":10, "y":0, "matrix": [0,10]}, - {"label":"Back Space", "x":11, "y":0, "matrix": [0,11]}, - {"label":"Esc", "x":0, "y":1, "matrix": [1,0]}, - {"label":"A", "x":1, "y":1, "matrix": [1,1]}, - {"label":"S", "x":2, "y":1, "matrix": [1,2]}, - {"label":"D", "x":3, "y":1, "matrix": [1,3]}, - {"label":"F", "x":4, "y":1, "matrix": [1,4]}, - {"label":"G", "x":5, "y":1, "matrix": [1,5]}, - {"label":"H", "x":6, "y":1, "matrix": [1,6]}, - {"label":"J", "x":7, "y":1, "matrix": [1,7]}, - {"label":"K", "x":8, "y":1, "matrix": [1,8]}, - {"label":"L", "x":9, "y":1, "matrix": [1,9]}, - {"label":";", "x":10, "y":1, "matrix": [1,10]}, - {"label":"'", "x":11, "y":1, "matrix": [1,11]}, - {"label":"Shift", "x":0, "y":2, "matrix": [2,0]}, - {"label":"Z", "x":1, "y":2, "matrix": [2,1]}, - {"label":"X", "x":2, "y":2, "matrix": [2,2]}, - {"label":"C", "x":3, "y":2, "matrix": [2,3]}, - {"label":"V", "x":4, "y":2, "matrix": [2,4]}, - {"label":"B", "x":5, "y":2, "matrix": [2,5]}, - {"label":"N", "x":6, "y":2, "matrix": [2,6]}, - {"label":"M", "x":7, "y":2, "matrix": [2,7]}, - {"label":",", "x":8, "y":2, "matrix": [2,8]}, - {"label":".", "x":9, "y":2, "matrix": [2,9]}, - {"label":"/", "x":10, "y":2, "matrix": [2,10]}, - {"label":"Return", "x":11, "y":2, "matrix": [2,11]}, - {"label":"", "x":0, "y":3, "matrix": [3,0]}, - {"label":"Ctrl", "x":1, "y":3, "matrix": [3,1]}, - {"label":"Alt", "x":2, "y":3, "matrix": [3,2]}, - {"label":"Super", "x":3, "y":3, "matrix": [3,3]}, - {"label":"⇓", "x":4, "y":3, "matrix": [3,4]}, - {"label":"", "x":5, "y":3, "matrix": [3,5]}, - {"label":"", "x":6, "y":3, "matrix": [3,6]}, - {"label":"⇑", "x":7, "y":3, "matrix": [3,7]}, - {"label":"←", "x":8, "y":3, "matrix": [3,8]}, - {"label":"↓", "x":9, "y":3, "matrix": [3,9]}, - {"label":"↑", "x":10, "y":3, "matrix": [3,10]}, - {"label":"→", "x":11, "y":3, "matrix": [3,11]}] + {"label": "Tab", "x": 0, "y": 0, "matrix": [0, 0]}, + {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]}, + {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]}, + {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]}, + {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]}, + {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]}, + {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]}, + {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]}, + {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]}, + {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]}, + {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]}, + {"label": "Back Space", "x": 11, "y": 0, "matrix": [0, 11]}, + {"label": "Esc", "x": 0, "y": 1, "matrix": [1, 0]}, + {"label": "A", "x": 1, "y": 1, "matrix": [1, 1]}, + {"label": "S", "x": 2, "y": 1, "matrix": [1, 2]}, + {"label": "D", "x": 3, "y": 1, "matrix": [1, 3]}, + {"label": "F", "x": 4, "y": 1, "matrix": [1, 4]}, + {"label": "G", "x": 5, "y": 1, "matrix": [1, 5]}, + {"label": "H", "x": 6, "y": 1, "matrix": [1, 6]}, + {"label": "J", "x": 7, "y": 1, "matrix": [1, 7]}, + {"label": "K", "x": 8, "y": 1, "matrix": [1, 8]}, + {"label": "L", "x": 9, "y": 1, "matrix": [1, 9]}, + {"label": ";", "x": 10, "y": 1, "matrix": [1, 10]}, + {"label": "'", "x": 11, "y": 1, "matrix": [1, 11]}, + {"label": "Shift", "x": 0, "y": 2, "matrix": [2, 0]}, + {"label": "Z", "x": 1, "y": 2, "matrix": [2, 1]}, + {"label": "X", "x": 2, "y": 2, "matrix": [2, 2]}, + {"label": "C", "x": 3, "y": 2, "matrix": [2, 3]}, + {"label": "V", "x": 4, "y": 2, "matrix": [2, 4]}, + {"label": "B", "x": 5, "y": 2, "matrix": [2, 5]}, + {"label": "N", "x": 6, "y": 2, "matrix": [2, 6]}, + {"label": "M", "x": 7, "y": 2, "matrix": [2, 7]}, + {"label": ",", "x": 8, "y": 2, "matrix": [2, 8]}, + {"label": ".", "x": 9, "y": 2, "matrix": [2, 9]}, + {"label": "/", "x": 10, "y": 2, "matrix": [2, 10]}, + {"label": "Return", "x": 11, "y": 2, "matrix": [2, 11]}, + {"label": "", "x": 0, "y": 3, "matrix": [3, 0]}, + {"label": "Ctrl", "x": 1, "y": 3, "matrix": [3, 1]}, + {"label": "Alt", "x": 2, "y": 3, "matrix": [3, 2]}, + {"label": "Super", "x": 3, "y": 3, "matrix": [3, 3]}, + {"label": "⇓", "x": 4, "y": 3, "matrix": [3, 4]}, + {"label": "", "x": 5, "y": 3, "matrix": [3, 5]}, + {"label": "", "x": 6, "y": 3, "matrix": [3, 6]}, + {"label": "⇑", "x": 7, "y": 3, "matrix": [3, 7]}, + {"label": "←", "x": 8, "y": 3, "matrix": [3, 8]}, + {"label": "↓", "x": 9, "y": 3, "matrix": [3, 9]}, + {"label": "↑", "x": 10, "y": 3, "matrix": [3, 10]}, + {"label": "→", "x": 11, "y": 3, "matrix": [3, 11]}] } } } diff --git a/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c index 78e35ff821..0448c07355 100644 --- a/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }, [_RAISE] = { ENCODER_CCW_CW(KC_MS_WH_LEFT, KC_MS_WH_RIGHT) }, diff --git a/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c b/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c index 4129b4e0f5..5d137c746d 100644 --- a/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/ortho48v2/keymaps/via/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }, [2] = { ENCODER_CCW_CW(KC_MS_WH_LEFT, KC_MS_WH_RIGHT) }, |