Merge branch 'develop'

4 files changed, 94 insertions, 94 deletions

diff --git a/keyboards/keychron/q11/ansi_encoder/info.json b/keyboards/keychron/q11/ansi_encoder/info.json
index 50d1260a09..da10fe5166 100755
--- a/keyboards/keychron/q11/ansi_encoder/info.json
+++ b/keyboards/keychron/q11/ansi_encoder/info.json
@@ -64,102 +64,102 @@
     "layouts": {
         "LAYOUT_ansi_91": {
             "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":1.25, "y":0},
-                {"matrix":[0,2], "x":2.25, "y":0},
-                {"matrix":[0,3], "x":3.25, "y":0},
-                {"matrix":[0,4], "x":4.25, "y":0},
-                {"matrix":[0,5], "x":5.25, "y":0},
-                {"matrix":[0,6], "x":6.25, "y":0},
-                {"matrix":[0,7], "x":7.25, "y":0},
-                {"matrix":[6,0], "x":8.25, "y":0},
-                {"matrix":[6,1], "x":9.25, "y":0},
-                {"matrix":[6,2], "x":10.25, "y":0},
-                {"matrix":[6,3], "x":11.25, "y":0},
-                {"matrix":[6,4], "x":12.25, "y":0},
-                {"matrix":[6,5], "x":13.25, "y":0},
-                {"matrix":[6,6], "x":14.25, "y":0},
-                {"matrix":[6,7], "x":15.25, "y":0},
-                {"matrix":[6,8], "x":16.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [6, 0], "x": 8.25, "y": 0},
+                {"matrix": [6, 1], "x": 9.25, "y": 0},
+                {"matrix": [6, 2], "x": 10.25, "y": 0},
+                {"matrix": [6, 3], "x": 11.25, "y": 0},
+                {"matrix": [6, 4], "x": 12.25, "y": 0},
+                {"matrix": [6, 5], "x": 13.25, "y": 0},
+                {"matrix": [6, 6], "x": 14.25, "y": 0},
+                {"matrix": [6, 7], "x": 15.25, "y": 0},
+                {"matrix": [6, 8], "x": 16.5, "y": 0},
 
-                {"matrix":[1,0], "x":0, "y":1.25},
-                {"matrix":[1,1], "x":1.25, "y":1.25},
-                {"matrix":[1,2], "x":2.25, "y":1.25},
-                {"matrix":[1,3], "x":3.25, "y":1.25},
-                {"matrix":[1,4], "x":4.25, "y":1.25},
-                {"matrix":[1,5], "x":5.25, "y":1.25},
-                {"matrix":[1,6], "x":6.25, "y":1.25},
-                {"matrix":[1,7], "x":7.25, "y":1.25},
-                {"matrix":[7,0], "x":8.25, "y":1.25},
-                {"matrix":[7,1], "x":9.25, "y":1.25},
-                {"matrix":[7,2], "x":10.25, "y":1.25},
-                {"matrix":[7,3], "x":11.25, "y":1.25},
-                {"matrix":[7,4], "x":12.25, "y":1.25},
-                {"matrix":[7,5], "x":13.25, "y":1.25},
-                {"matrix":[7,6], "x":14.25, "y":1.25, "w":2},
-                {"matrix":[7,8], "x":16.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [7, 0], "x": 8.25, "y": 1.25},
+                {"matrix": [7, 1], "x": 9.25, "y": 1.25},
+                {"matrix": [7, 2], "x": 10.25, "y": 1.25},
+                {"matrix": [7, 3], "x": 11.25, "y": 1.25},
+                {"matrix": [7, 4], "x": 12.25, "y": 1.25},
+                {"matrix": [7, 5], "x": 13.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 14.25, "y": 1.25, "w": 2},
+                {"matrix": [7, 8], "x": 16.5, "y": 1.25},
 
-                {"matrix":[2,0], "x":0, "y":2.25},
-                {"matrix":[2,1], "x":1.25, "y":2.25, "w":1.5},
-                {"matrix":[2,2], "x":2.75, "y":2.25},
-                {"matrix":[2,3], "x":3.75, "y":2.25},
-                {"matrix":[2,4], "x":4.75, "y":2.25},
-                {"matrix":[2,6], "x":5.75, "y":2.25},
-                {"matrix":[2,7], "x":6.75, "y":2.25},
-                {"matrix":[8,0], "x":7.75, "y":2.25},
-                {"matrix":[8,1], "x":8.75, "y":2.25},
-                {"matrix":[8,2], "x":9.75, "y":2.25},
-                {"matrix":[8,3], "x":10.75, "y":2.25},
-                {"matrix":[8,4], "x":11.75, "y":2.25},
-                {"matrix":[8,5], "x":12.75, "y":2.25},
-                {"matrix":[8,6], "x":13.75, "y":2.25},
-                {"matrix":[8,7], "x":14.75, "y":2.25, "w":1.5},
-                {"matrix":[8,8], "x":16.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.75, "y": 2.25},
+                {"matrix": [8, 0], "x": 7.75, "y": 2.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 2.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 2.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 2.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 2.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 2.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 2.25},
+                {"matrix": [8, 7], "x": 14.75, "y": 2.25, "w": 1.5},
+                {"matrix": [8, 8], "x": 16.5, "y": 2.25},
 
-                {"matrix":[3,0], "x":0, "y":3.25},
-                {"matrix":[3,1], "x":1.25, "y":3.25, "w":1.75},
-                {"matrix":[3,2], "x":3, "y":3.25},
-                {"matrix":[3,3], "x":4, "y":3.25},
-                {"matrix":[3,4], "x":5, "y":3.25},
-                {"matrix":[3,5], "x":6, "y":3.25},
-                {"matrix":[3,6], "x":7, "y":3.25},
-                {"matrix":[9,0], "x":8, "y":3.25},
-                {"matrix":[9,1], "x":9, "y":3.25},
-                {"matrix":[9,2], "x":10, "y":3.25},
-                {"matrix":[9,3], "x":11, "y":3.25},
-                {"matrix":[9,4], "x":12, "y":3.25},
-                {"matrix":[9,5], "x":13, "y":3.25},
-                {"matrix":[9,7], "x":14, "y":3.25, "w":2.25},
-                {"matrix":[9,8], "x":16.5, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3.25},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [9, 0], "x": 8, "y": 3.25},
+                {"matrix": [9, 1], "x": 9, "y": 3.25},
+                {"matrix": [9, 2], "x": 10, "y": 3.25},
+                {"matrix": [9, 3], "x": 11, "y": 3.25},
+                {"matrix": [9, 4], "x": 12, "y": 3.25},
+                {"matrix": [9, 5], "x": 13, "y": 3.25},
+                {"matrix": [9, 7], "x": 14, "y": 3.25, "w": 2.25},
+                {"matrix": [9, 8], "x": 16.5, "y": 3.25},
 
-                {"matrix":[4,0], "x":0, "y":4.25},
-                {"matrix":[4,2], "x":1.25, "y":4.25, "w":2.25},
-                {"matrix":[4,3], "x":3.5, "y":4.25},
-                {"matrix":[4,4], "x":4.5, "y":4.25},
-                {"matrix":[4,5], "x":5.5, "y":4.25},
-                {"matrix":[4,6], "x":6.5, "y":4.25},
-                {"matrix":[4,7], "x":7.5, "y":4.25},
-                {"matrix":[10,0], "x":8.5, "y":4.25},
-                {"matrix":[10,1], "x":9.5, "y":4.25},
-                {"matrix":[10,2], "x":10.5, "y":4.25},
-                {"matrix":[10,3], "x":11.5, "y":4.25},
-                {"matrix":[10,4], "x":12.5, "y":4.25},
-                {"matrix":[10,5], "x":13.5, "y":4.25, "w":1.75},
-                {"matrix":[10,7], "x":15.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [10, 0], "x": 8.5, "y": 4.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 4.25},
+                {"matrix": [10, 2], "x": 10.5, "y": 4.25},
+                {"matrix": [10, 3], "x": 11.5, "y": 4.25},
+                {"matrix": [10, 4], "x": 12.5, "y": 4.25},
+                {"matrix": [10, 5], "x": 13.5, "y": 4.25, "w": 1.75},
+                {"matrix": [10, 7], "x": 15.5, "y": 4.25},
 
-                {"matrix":[5,0], "x":0, "y":5.25},
-                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,3], "x":3.75, "y":5.25, "w":1.25},
-                {"matrix":[5,4], "x":5, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":6.25, "y":5.25, "w":2.25},
-                {"matrix":[11,1], "x":8.5, "y":5.25, "w":2.75},
-                {"matrix":[11,2], "x":11.25, "y":5.25},
-                {"matrix":[11,3], "x":12.25, "y":5.25},
-                {"matrix":[11,4], "x":13.25, "y":5.25},
-                {"matrix":[11,6], "x":14.5, "y":5.25},
-                {"matrix":[11,7], "x":15.5, "y":5.25},
-                {"matrix":[11,8], "x":16.5, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.25, "y": 5.25, "w": 2.25},
+                {"matrix": [11, 1], "x": 8.5, "y": 5.25, "w": 2.75},
+                {"matrix": [11, 2], "x": 11.25, "y": 5.25},
+                {"matrix": [11, 3], "x": 12.25, "y": 5.25},
+                {"matrix": [11, 4], "x": 13.25, "y": 5.25},
+                {"matrix": [11, 6], "x": 14.5, "y": 5.25},
+                {"matrix": [11, 7], "x": 15.5, "y": 5.25},
+                {"matrix": [11, 8], "x": 16.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c
index b2c3ec24c0..3378ce7df9 100755
--- a/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c
@@ -62,7 +62,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] = {
     [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c
index 7102922323..852f34def9 100755
--- a/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
     [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
diff --git a/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c
index 7ba9886ef8..0452eccec2 100755
--- a/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
     [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },