Merge remote-tracking branch 'origin/master' into develop

2 files changed, 6 insertions, 6 deletions

diff --git a/keyboards/cxt_studio/12e3/keyboard.json b/keyboards/cxt_studio/12e3/keyboard.json
index 0b8949cda7..a85126aab6 100644
--- a/keyboards/cxt_studio/12e3/keyboard.json
+++ b/keyboards/cxt_studio/12e3/keyboard.json
@@ -21,8 +21,8 @@
     },
     "encoder": {
         "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"},
-            {"pin_a": "E6", "pin_b": "F0"},
+            {"pin_a": "F5", "pin_b": "F6", "resolution": 4},
+            {"pin_a": "E6", "pin_b": "F0", "resolution": 4},
             {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
         ]
     },
diff --git a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c
index 78375680d4..ef4b6938eb 100644
--- a/keyboards/cxt_studio/12e3/keymaps/default/keymap.c
+++ b/keyboards/cxt_studio/12e3/keymaps/default/keymap.c
@@ -11,14 +11,14 @@ enum my_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_BASE] = LAYOUT(
-        KC_PSCR, KC_CUT, KC_COPY, KC_PSTE,  MS_BTN3, RM_TOGG,
-        KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT,     KC_MUTE,
+        KC_ESC, C(KC_X), C(KC_C), C(KC_V),  MS_BTN3, RM_TOGG,
+        KC_PSCR,C(KC_Z), KC_CALC, KC_MNXT,     KC_MPLY,
         MO(1), KC_LGUI, KC_DEL, KC_APP
     ),
 
     [_RGBL] = LAYOUT(
-        RM_NEXT, RM_SATU, KC_INS, KC_DEL,   _______, _______,
-        RM_PREV, RM_SATD, KC_PGUP, KC_HOME,     _______,
+        RM_NEXT, RM_SATU, KC_INS,  KC_DEL,   _______, _______,
+        RM_PREV, RM_SATD, KC_PGUP, KC_HOME,     KC_MUTE,
         _______, QK_BOOT, KC_PGDN, KC_END
     ),
 };