Added Keychron K3 ISO keymap (#195)

* Added K3 ISO keymap

* Aligned KC_Y and KC_H

11 files changed, 331 insertions, 444 deletions

diff --git a/keyboards/keychron/k3/keymaps/ansi/config.h b/keyboards/keychron/k3/keymaps/ansi/config.h
new file mode 100644
index 000000000..b0bcda0ec
--- /dev/null
+++ b/keyboards/keychron/k3/keymaps/ansi/config.h
@@ -0,0 +1,4 @@
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x3434
+#define PRODUCT_ID      0xFE04
+#define DEVICE_VER		0x0001
\ No newline at end of file
diff --git a/keyboards/keychron/k3/keymaps/ansi/keymap.c b/keyboards/keychron/k3/keymaps/ansi/keymap.c
new file mode 100644
index 000000000..3fb6d6e55
--- /dev/null
+++ b/keyboards/keychron/k3/keymaps/ansi/keymap.c
@@ -0,0 +1,110 @@
+/*
+Copyright 2020 Dimitris Mantzouranis
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+  _BASE = 0,
+  _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /*
+    *****************************************************************************************************************
+    * ESC  * F1   * F2   * F3   * F4   * F5   * F6   * F7   * F8   * F9   * F10  * F11  * F12  * PSCR * DEL  * RMOD *
+    *****************************************************************************************************************
+    * ~    * 1    * 2    * 3    * 4    * 5    * 6    * 7    * 8    * 9    * 0    * *    * =    * BSPC        * PGUP *
+    *****************************************************************************************************************
+    * TAB     * Q    * W    * E    * R    * T    * Y    * U    * I    * O    * P    * [    * ]    * \        * PGDN *
+    *****************************************************************************************************************
+    * CAPS      * A    * S    * D    * F    * G    * H    * J    * K    * L    * ;    * '    * ENT           * HOME *
+    *****************************************************************************************************************
+    * LSFT         * Z    * X    * C    * V    * B    * N    * M    * ,    * .    * /    * RSFT       * UP   * END  *
+    *****************************************************************************************************************
+    * LCTL  * LGUI  * LALT  * SPC                                         * RALT * FN   * RCTL * LEFT * DOWN * RGHT *
+    *****************************************************************************************************************
+  */
+  [_BASE] = {
+  /*  0           1           2           3           4           5           6           7           8           9           10          11          12          13          14          15         */
+    { KC_ESC,     KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_PSCR,    KC_DEL,     RGB_MOD    },
+    { KC_GRV,     KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_MINS,    KC_EQL,     KC_BSPC,    XXXXXXX,    KC_PGUP    },
+    { KC_TAB,     KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       KC_LBRC,    KC_RBRC,    KC_BSLS,    XXXXXXX,    KC_PGDN    },
+    { KC_CAPS,    KC_A,       KC_S,       KC_D,       KC_F,       KC_G,       KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOT,    XXXXXXX,    KC_ENT,     XXXXXXX,    KC_HOME    },
+    { KC_LSFT,    XXXXXXX,    KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,       KC_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    XXXXXXX,    KC_RSFT,    KC_UP,      KC_END     },
+    { KC_LCTL,    KC_LGUI,    KC_LALT,    XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_SPC,     XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_RALT,    MO(_FN),    KC_RCTL,    KC_LEFT,    KC_DOWN,    KC_RGHT    }
+  },
+
+  /*
+    *****************************************************************************************************************
+    *      *      *      *      *      * RVAD * RVAI * MPRV * MPLY * MNXT * MUTE * VOLD * VOLU *      *      * RTOG *
+    *****************************************************************************************************************
+    *      *      *      *      *      *      *      *      *      *      *      *      *      *             * RM_P *
+    *****************************************************************************************************************
+    *         *      *      *      *      *      *      *      *      *      *      *      *      *          *      *
+    *****************************************************************************************************************
+    *           *      *      *      *      *      *      *      *      *      *      *      *               *      *
+    *****************************************************************************************************************
+    *              *      *      *      *      *      *      *      *      *      *      *            * RSAI *      *
+    *****************************************************************************************************************
+    *       *       *       *                                             *      * FN   *      * RHUD * RSAD * RHUI *
+    *****************************************************************************************************************
+  */
+  [_FN] = {
+  /*  0           1           2           3           4           5           6           7           8           9           10          11          12          13          14          15         */
+    { RESET,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      RGB_VAD,    RGB_VAI,    KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_NO,      KC_NO,      RGB_TOG    },
+    { KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    RGB_M_P    },
+    { KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    KC_NO      },
+    { KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    KC_NO,      XXXXXXX,    KC_NO      },
+    { KC_NO,      XXXXXXX,    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    KC_NO,      RGB_SAI,    KC_NO      },
+    { KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_NO,      XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_NO,      MO(_FN),    KC_NO,      RGB_HUD,    RGB_SAD,    RGB_HUI    }
+  }
+};
+
+bool dip_switch_update_user(uint8_t index, bool active) {
+  switch(index) {
+    case 0: // OS switch
+      if (active) { // Win/Android mode
+        // do stuff
+      }
+      else { // Mac/iOS mode
+        // do stuff
+      }
+      break;
+    case 1: // Connection switch
+      // Probably it's not possible to do anything sensible here as switching from Cable to BT requires turning off the board. (BT / OFF / Cable)
+      if (active) { // BT mode
+        // do stuff
+      }
+      else { //Cable mode
+        // do stuff
+      }
+      break;
+  }
+  return true;
+}
+
+void keyboard_post_init_user(void) {
+  // Customise these values to desired behaviour
+  // debug_enable = true;
+  // debug_matrix = true;
+  // debug_keyboard = true;
+  // debug_mouse = true;
+}
diff --git a/keyboards/keychron/k3/keymaps/ansi/via_ansi.json b/keyboards/keychron/k3/keymaps/ansi/via_ansi.json
new file mode 100644
index 000000000..68da9b9e0
--- /dev/null
+++ b/keyboards/keychron/k3/keymaps/ansi/via_ansi.json
@@ -0,0 +1,17 @@
+{
+    "name": "Keychron K3 ANSI",
+    "vendorId": "0x3434",
+    "productId": "0xFE04",
+    "lighting": "none",
+    "matrix": {"rows": 6, "cols": 16},
+    "layouts": {
+        "keymap": [
+            [ "0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12","0,13","0,14","0,15" ],
+            [ "1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"w": 2},"1,13","1,15" ],
+            [{"w": 1.5},"2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12",{"w": 1.5},"2,13","2,15" ],
+            [{"w": 1.75},"3,0","3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"w": 2.25},"3,13","3,15" ],
+            [{"w": 2.25},"4,0","4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11",{"w": 1.75},"4,13","4,14","4,15" ],
+            [{"w": 1.25},"5,0",{"w": 1.25},"5,1",{"w": 1.25},"5,2",{"w": 6.25},"5,6","5,10","5,11","5,12","5,13","5,14","5,15" ]
+        ]
+    }
+}
diff --git a/keyboards/keychron/k3/keymaps/iso/config.h b/keyboards/keychron/k3/keymaps/iso/config.h
new file mode 100644
index 000000000..01257fe71
--- /dev/null
+++ b/keyboards/keychron/k3/keymaps/iso/config.h
@@ -0,0 +1,6 @@
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x3434
+#define PRODUCT_ID      0xFE05
+#define DEVICE_VER		0x0001
+
+#define KEYMAP_ISO 1
diff --git a/keyboards/keychron/k3/keymaps/iso/keymap.c b/keyboards/keychron/k3/keymaps/iso/keymap.c
new file mode 100644
index 000000000..c3409d1a4
--- /dev/null
+++ b/keyboards/keychron/k3/keymaps/iso/keymap.c
@@ -0,0 +1,107 @@
+/*
+Copyright 2020 Dimitris Mantzouranis
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+  _BASE = 0,
+  _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*  +------------------------------------------------------------------------------+
+    | ESC| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10| F11| F12|PSCR|DEL|RMOD|
+    +------------------------------------------------------------------------------+
+    |  ~ |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = | BACKSP |PGUP|
+    +------------------------------------------------------------------------------+
+    |  TAB |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] |      |PGDN|
+    +-------------------------------------------------------------------  RET -----+
+    |CAPSLCK|  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |  # |     |HOME|
+    +------------------------------------------------------------------------------+
+    |LSHFT|  \ |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / | RSHIFT| UP | END|
+    +------------------------------------------------------------------------------+
+    |LCTRL| LGUI| LALT|            SPACE            | RALT| FN |RCTL|LEFT|DOWN|RGHT|
+    +------------------------------------------------------------------------------+
+*/
+    [_BASE] = { 
+    /*  0          1          2          3        4        5        6         7        8        9          10         11         12         13         14         15        */
+      { KC_ESC,    KC_F1,     KC_F2,     KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,   KC_F9,     KC_F10,    KC_F11,    KC_F12,    KC_PSCR,   KC_DEL,    RGB_MOD   },
+      { KC_GRV,    KC_1,      KC_2,      KC_3,    KC_4,    KC_5,    KC_6,     KC_7,    KC_8,    KC_9,      KC_0,      KC_MINS,   KC_EQL,    KC_BSPC,   KC_NO,     KC_PGUP   },
+      { KC_TAB,    KC_Q,      KC_W,      KC_E,    KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,      KC_P,      KC_LBRC,   KC_RBRC,   KC_NO,     KC_NO,     KC_PGDN   },
+      { KC_CAPS,   KC_A,      KC_S,      KC_D,    KC_F,    KC_G,    KC_H,     KC_J,    KC_K,    KC_L,      KC_SCLN,   KC_QUOT,   KC_NUHS,   KC_ENT,    KC_NO,     KC_HOME   },
+      { KC_LSFT,   KC_NUBS,   KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM,   KC_DOT,    KC_SLSH,   KC_NO,     KC_RSFT,   KC_UP,     KC_END    },
+      { KC_LCTL,   KC_LGUI,   KC_LALT,   KC_NO,   KC_NO,   KC_NO,   KC_SPC,   KC_NO,   KC_NO,   KC_NO,     KC_RALT,   MO(_FN),   KC_RCTL,   KC_LEFT,   KC_DOWN,   KC_RGHT   }
+    },
+/*  +------------------------------------------------------------------------------+
+    |    |    |    |    |    |RVAD|RVAI|MPRV|MPLY|MNXT|MUTE|VOLD|VOLU|    |   |RTOG|
+    +------------------------------------------------------------------------------+
+    |    |    |    |    |    |    |    |    |    |    |    |    |    |        |RM_P|
+    +------------------------------------------------------------------------------+
+    |      |    |    |    |    |    |    |    |    |    |    |    |    |      |    |
+    +-------------------------------------------------------------------  RET -----+
+    |       |    |    |    |    |    |    |    |    |    |    |    |    |     |    |
+    +------------------------------------------------------------------------------+
+    |     |    |    |    |    |    |    |    |    |    |    |    |       |RSAI|    |
+    +------------------------------------------------------------------------------+
+    |     |     |     |                             |     | FN |    |RHUD|RSAD|RHUI|
+    +------------------------------------------------------------------------------+
+*/
+  [_FN] = {
+  /*  0           1           2           3           4           5           6           7           8           9           10          11          12          13          14          15         */
+    { RESET,      KC_NO,      KC_NO,      KC_APP,     KC_NO,      RGB_VAD,    RGB_VAI,    KC_MPRV,    KC_MPLY,    KC_MNXT,    KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_NO,      KC_NO,      RGB_TOG    },
+    { KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    RGB_M_P    },
+    { KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    KC_NO      },
+    { KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    KC_NO,      XXXXXXX,    KC_NO      },
+    { KC_NO,      XXXXXXX,    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    KC_NO,      RGB_SAI,    KC_NO      },
+    { KC_NO,      KC_NO,      KC_NO,      XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_NO,      XXXXXXX,    XXXXXXX,    XXXXXXX,    KC_NO,      MO(_FN),    KC_NO,      RGB_HUD,    RGB_SAD,    RGB_HUI    }
+  }
+};
+
+bool dip_switch_update_user(uint8_t index, bool active) {
+  switch(index) {
+    case 0: // OS switch
+      if (active) { // Win/Android mode
+        // do stuff
+      }
+      else { // Mac/iOS mode
+        // do stuff
+      }
+      break;
+    case 1: // Connection switch
+      // Probably it's not possible to do anything sensible here as switching from Cable to BT requires turning off the board. (BT / OFF / Cable)
+      if (active) { // BT mode
+        // do stuff
+      }
+      else { //Cable mode
+        // do stuff
+      }
+      break;
+  }
+  return true;
+}
+
+void keyboard_post_init_user(void) {
+  // Customise these values to desired behaviour
+  // debug_enable = true;
+  // debug_matrix = true;
+  // debug_keyboard = true;
+  // debug_mouse = true;
+}
diff --git a/keyboards/keychron/k3/keymaps/iso/via_iso.json b/keyboards/keychron/k3/keymaps/iso/via_iso.json
new file mode 100644
index 000000000..b38b0a44c
--- /dev/null
+++ b/keyboards/keychron/k3/keymaps/iso/via_iso.json
@@ -0,0 +1,17 @@
+{
+    "name": "Keychron K3 ISO",
+    "vendorId": "0x3434",
+    "productId": "0xFE05",
+    "lighting": "none",
+    "matrix": {"rows": 6, "cols": 16},
+    "layouts": {
+        "keymap": [
+            [ "0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12","0,13","0,14","0,15" ],
+            [ "1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"w": 2},"1,13","1,15" ],
+            [{"w": 1.5},"2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12",{"x": 0.25,"w": 1.25,"h": 2,"w2": 1.5,"h2": 1,"x2": -0.25},"3,13","2,15" ],
+            [{"w": 1.75},"3,0","3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11","3,12",{"x": 1.25},"3,15" ],
+            [{"w": 1.25},"4,0","4,1","4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11",{"w": 1.75},"4,13","4,14","4,15" ],
+            [{"w": 1.25},"5,0",{"w": 1.25},"5,1",{"w": 1.25},"5,2",{"w": 6.25},"5,6","5,10","5,11","5,12","5,13","5,14","5,15" ]
+        ]
+    }
+}
diff --git a/keyboards/keychron/k3/rgb/config_led.c b/keyboards/keychron/k3/rgb/config_led.c
index 178d0477d..0d40b059a 100644
--- a/keyboards/keychron/k3/rgb/config_led.c
+++ b/keyboards/keychron/k3/rgb/config_led.c
@@ -5,6 +5,36 @@
 
 #define NA NO_LED // readability
 
+#ifdef KEYMAP_ISO
+/* ISO keymap LEDs */
+led_config_t g_led_config = {
+  {
+    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
+    { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, NA, 30 },
+    { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, NA, NA, 44 },
+    { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, NA, 59 },
+    { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, NA, 72, 73, 74 },
+    { 75, 76, 77, NA, NA, NA, 78, NA, NA, NA, 79, 80, 81, 82, 83, 84 }
+  },
+  {
+    {7  , 0}, {21 , 0}, {35 , 0}, {49 , 0}, {63 , 0}, {77 , 0}, {91 , 0}, {105, 0}, {119, 0}, {133, 0}, {147, 0}, {161, 0}, {175, 0}, {189, 0}, {203, 0}, {217, 0},
+    {7  ,13}, {21 ,13}, {35 ,13}, {49 ,13}, {63 ,13}, {77 ,13}, {91 ,13}, {105,13}, {119,13}, {133,13}, {147,13}, {161,13}, {175,13}, {196,13},           {217,13},
+    {11 ,26}, {28 ,26}, {42 ,26}, {56 ,26}, {70 ,26}, {84 ,26}, {98 ,26}, {112,26}, {126,26}, {140,26}, {154,26}, {168,26}, {182,26},                     {217,26},
+    {12 ,38}, {32 ,38}, {46 ,38}, {60 ,38}, {74 ,38}, {88 ,38}, {102,38}, {116,38}, {130,38}, {144,38}, {158,38}, {172,38}, {182,38}, {194,38},           {217,38},
+    {9  ,51}, {26 ,51}, {39 ,51}, {53 ,51}, {67 ,51}, {81 ,51}, {95 ,51}, {109,51}, {123,51}, {137,51}, {151,51}, {165,51},           {184,51}, {203,51}, {217,51},
+    {9  ,64}, {26 ,64}, {44 ,64},                               {97 ,64},                               {147,64}, {161,64}, {175,64}, {189,64}, {203,64}, {217,64},
+  },
+  {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 4,
+    4, 4, 4,          4,          4, 4, 4, 4, 4, 4,
+  }
+};
+#else
+/* ANSI keymap LEDs */
 /*
   ****************************************************************************************************************
   * 1    * 7    * 13   * 19   * 25   * 31   * 37   * 43   * 49   * 55   * 61   * 67   * 73   * 79   * 85   * 91   *
@@ -61,5 +91,5 @@ led_config_t g_led_config = {
     4, 4, 4,          4,          4, 4, 4, 4, 4, 4,
   }
 };
-
+#endif
 #endif
diff --git a/keyboards/keychron/k3/rgb/config_led.h b/keyboards/keychron/k3/rgb/config_led.h
index 595000372..3241fc11a 100644
--- a/keyboards/keychron/k3/rgb/config_led.h
+++ b/keyboards/keychron/k3/rgb/config_led.h
@@ -30,4 +30,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_MATRIX_COLS MATRIX_COLS
 #define LED_MATRIX_COL_PINS MATRIX_COL_PINS
 
+#ifdef KEYMAP_ISO
+#define DRIVER_LED_TOTAL (85)
+#else
 #define DRIVER_LED_TOTAL (84)
+#endif
diff --git a/keyboards/keychron/k3/rgb/info.json b/keyboards/keychron/k3/rgb/info.json
index 3c20cd385..ef40a557b 100644
--- a/keyboards/keychron/k3/rgb/info.json
+++ b/keyboards/keychron/k3/rgb/info.json
@@ -1,444 +1,17 @@
 {
-    "keyboard_name": "K3 Gateron RGB Non Hotswap",
-    "url": "https://www.keychron.com/products/keychron-k3-wireless-mechanical-keyboard?variant=32220198633561",
-    "maintainer": "smp4488",
+    "keyboard_name": "K3 Gateron RGB",
+    "url": "https://www.keychron.com/products/keychron-k3-wireless-mechanical-keyboard",
+    "maintainer": "gibbio",
     "width": 16,
-    "height": 5,
+    "height": 6,
     "layouts": {
-      "LAYOUT": {
-        "layout": [
-            {
-                "label": "esc",
-                "x": 0,
-                "y": 0
-            },
-            {
-                "label": "F1",
-                "x": 1,
-                "y": 0
-            },
-            {
-                "label": "F2",
-                "x": 2,
-                "y": 0
-            },
-            {
-                "label": "F3",
-                "x": 3,
-                "y": 0
-            },
-            {
-                "label": "F4",
-                "x": 4,
-                "y": 0
-            },
-            {
-                "label": "F5",
-                "x": 5,
-                "y": 0
-            },
-            {
-                "label": "F6",
-                "x": 6,
-                "y": 0
-            },
-            {
-                "label": "F7",
-                "x": 7,
-                "y": 0
-            },
-            {
-                "label": "F8",
-                "x": 8,
-                "y": 0
-            },
-            {
-                "label": "F9",
-                "x": 9,
-                "y": 0
-            },
-            {
-                "label": "F10",
-                "x": 10,
-                "y": 0
-            },
-            {
-                "label": "F11",
-                "x": 11,
-                "y": 0
-            },
-            {
-                "label": "F12",
-                "x": 12,
-                "y": 0
-            },
-            {
-                "label": "print screen",
-                "x": 13,
-                "y": 0
-            },
-            {
-                "label": "del",
-                "x": 14,
-                "y": 0
-            },
-            {
-                "label": "rgb",
-                "x": 15,
-                "y": 0
-            },
-            {
-                "label": "`",
-                "x": 0,
-                "y": 1
-            },
-            {
-                "label": "1 !",
-                "x": 1,
-                "y": 1
-            },
-            {
-                "label": "2 @",
-                "x": 2,
-                "y": 1
-            },
-            {
-                "label": "3 #",
-                "x": 3,
-                "y": 1
-            },
-            {
-                "label": "4 $",
-                "x": 4,
-                "y": 1
-            },
-            {
-                "label": "5 %",
-                "x": 5,
-                "y": 1
-            },
-            {
-                "label": "6 ^",
-                "x": 6,
-                "y": 1
-            },
-            {
-                "label": "7 &",
-                "x": 7,
-                "y": 1
-            },
-            {
-                "label": "8 *",
-                "x": 8,
-                "y": 1
-            },
-            {
-                "label": "9 (",
-                "x": 9,
-                "y": 1
-            },
-            {
-                "label": "0 )",
-                "x": 10,
-                "y": 1
-            },
-            {
-                "label": "- _",
-                "x": 11,
-                "y": 1
-            },
-            {
-                "label": "= +",
-                "x": 12,
-                "y": 1
-            },
-            {
-                "label": "backspace",
-                "x": 13,
-                "y": 1,
-                "w": 2
-            },
-            {
-                "label": "page up",
-                "x": 15,
-                "y": 1
-            },
-            {
-                "label": "tab",
-                "x": 0,
-                "y": 2,
-                "w": 1.5
-            },
-            {
-                "label": "Q",
-                "x": 1.5,
-                "y": 2
-            },
-            {
-                "label": "W",
-                "x": 2.5,
-                "y": 2
-            },
-            {
-                "label": "E",
-                "x": 3.5,
-                "y": 2
-            },
-            {
-                "label": "R",
-                "x": 4.5,
-                "y": 2
-            },
-            {
-                "label": "T",
-                "x": 5.5,
-                "y": 2
-            },
-            {
-                "label": "Y",
-                "x": 6.5,
-                "y": 2
-            },
-            {
-                "label": "U",
-                "x": 7.5,
-                "y": 2
-            },
-            {
-                "label": "I",
-                "x": 8.5,
-                "y": 2
-            },
-            {
-                "label": "O",
-                "x": 9.5,
-                "y": 2
-            },
-            {
-                "label": "P",
-                "x": 10.5,
-                "y": 2
-            },
-            {
-                "label": "[ {",
-                "x": 11.5,
-                "y": 2
-            },
-            {
-                "label": "] }",
-                "x": 12.5,
-                "y": 2
-            },
-            {
-                "label": "\\ |",
-                "x": 12.5,
-                "y": 2,
-                "w": 1.5
-            },
-            {
-                "label": "page down",
-                "x": 15,
-                "y": 2
-            },
-            {
-                "label": "caps lock",
-                "x": 0,
-                "y": 3,
-                "w": 1.75
-            },
-            {
-                "label": "A",
-                "x": 1.75,
-                "y": 3
-            },
-            {
-                "label": "S",
-                "x": 2.75,
-                "y": 3
-            },
-            {
-                "label": "D",
-                "x": 3.75,
-                "y": 3
-            },
-            {
-                "label": "F",
-                "x": 4.75,
-                "y": 3
-            },
-            {
-                "label": "G",
-                "x": 5.75,
-                "y": 3
-            },
-            {
-                "label": "H",
-                "x": 6.75,
-                "y": 3
-            },
-            {
-                "label": "J",
-                "x": 7.75,
-                "y": 3
-            },
-            {
-                "label": "K",
-                "x": 8.75,
-                "y": 3
-            },
-            {
-                "label": "L",
-                "x": 9.75,
-                "y": 3
-            },
-            {
-                "label": "; :",
-                "x": 10.75,
-                "y": 3
-            },
-            {
-                "label": "' \"",
-                "x": 11.75,
-                "y": 3
-            },
-            {
-                "label": "enter",
-                "x": 13.75,
-                "y": 3,
-                "w": 2.25
-            },
-            {
-                "label": "home",
-                "x": 15,
-                "y": 3
-            },
-            {
-                "label": "shift",
-                "x": 0,
-                "y": 4,
-                "w": 2.25
-            },
-            {
-                "label": "Z",
-                "x": 2.25,
-                "y": 4
-            },
-            {
-                "label": "X",
-                "x": 3.25,
-                "y": 4
-            },
-            {
-                "label": "C",
-                "x": 4.25,
-                "y": 4
-            },
-            {
-                "label": "V",
-                "x": 5.25,
-                "y": 4
-            },
-            {
-                "label": "B",
-                "x": 6.25,
-                "y": 4
-            },
-            {
-                "label": "N",
-                "x": 7.25,
-                "y": 4
-            },
-            {
-                "label": "M",
-                "x": 8.25,
-                "y": 4
-            },
-            {
-                "label": ", <",
-                "x": 9.25,
-                "y": 4
-            },
-            {
-                "label": ". >",
-                "x": 10.25,
-                "y": 4
-            },
-            {
-                "label": "/ ?",
-                "x": 11.25,
-                "y": 4
-            },
-            {
-                "label": "shift",
-                "x": 12.25,
-                "y": 4,
-                "w": 1.75
-            },
-            {
-                "label": "up",
-                "x": 14,
-                "y": 4
-            },
-            {
-                "label": "end",
-                "x": 15,
-                "y": 4
-            },
-            {
-                "label": "control",
-                "x": 0,
-                "y": 5,
-                "w": 1.25
-            },
-            {
-                "label": "option",
-                "x": 1.25,
-                "y": 5,
-                "w": 1.25
-            },
-            {
-                "label": "cmd",
-                "x": 2.5,
-                "y": 5,
-                "w": 1.25
-            },
-            {
-                "label": "space",
-                "x": 3.75,
-                "y": 5,
-                "w": 6.25
-            },
-            {
-                "label": "cmd",
-                "x": 10,
-                "y": 5
-            },
-            {
-                "label": "cmd",
-                "x": 11,
-                "y": 5
-            },
-            {
-                "label": "fn",
-                "x": 12,
-                "y": 5
-            },
-            {
-                "label": "left",
-                "x": 13,
-                "y": 5
-            },
-            {
-                "label": "down",
-                "x": 14,
-                "y": 5
-            },
-            {
-                "label": "right",
-                "x": 15,
-                "y": 5
-            }
-        ]
-      }
+        "LAYOUT_ansi": {
+            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"print screen", "x":13, "y":0}, {"label":"del", "x":14, "y":0}, {"label":"rgb", "x":15, "y":0}, {"label":"`", "x":0, "y":1}, {"label":"1 !", "x":1, "y":1}, {"label":"2 @", "x":2, "y":1}, {"label":"3 #", "x":3, "y":1}, {"label":"4 $", "x":4, "y":1}, {"label":"5 %", "x":5, "y":1}, {"label":"6 ^", "x":6, "y":1}, {"label":"7 &", "x":7, "y":1}, {"label":"8 *", "x":8, "y":1}, {"label":"9 (", "x":9, "y":1}, {"label":"0 )", "x":10, "y":1}, {"label":"- _", "x":11, "y":1}, {"label":"= +", "x":12, "y":1}, {"label":"backspace", "x":13, "y":1, "w":2}, {"label":"page up", "x":15, "y":1}, {"label":"tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"[ {", "x":11.5, "y":2}, {"label":"] }", "x":12.5, "y":2}, {"label":"\\ |", "x":12.5, "y":2, "w":1.5}, {"label":"page down", "x":15, "y":2}, {"label":"caps lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":"; :", "x":10.75, "y":3}, {"label":"' \"", "x":11.75, "y":3}, {"label":"enter", "x":13.75, "y":3, "w":2.25}, {"label":"home", "x":15, "y":3}, {"label":"shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":", <", "x":9.25, "y":4}, {"label":". >", "x":10.25, "y":4}, {"label":"/ ?", "x":11.25, "y":4}, {"label":"shift", "x":12.25, "y":4, "w":1.75}, {"label":"up", "x":14, "y":4}, {"label":"end", "x":15, "y":4}, {"label":"control", "x":0, "y":5, "w":1.25}, {"label":"option", "x":1.25, "y":5, "w":1.25}, {"label":"cmd", "x":2.5, "y":5, "w":1.25}, {"label":"space", "x":3.75, "y":5, "w":6.25}, {"label":"cmd", "x":10, "y":5}, {"label":"cmd", "x":11, "y":5}, {"label":"fn", "x":12, "y":5}, {"label":"left", "x":13, "y":5}, {"label":"down", "x":14, "y":5}, {"label":"right", "x":15, "y":5}
+            ]
+       },
+        "LAYOUT_iso": {
+            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"print screen", "x":13, "y":0}, {"label":"del", "x":14, "y":0}, {"label":"rgb", "x":15, "y":0}, {"label":"&sect; &plusmn;", "x":0, "y":1}, {"label":"1 !", "x":1, "y":1}, {"label":"2 @", "x":2, "y":1}, {"label":"3 #", "x":3, "y":1}, {"label":"4 $", "x":4, "y":1}, {"label":"5 %", "x":5, "y":1}, {"label":"6 ^", "x":6, "y":1}, {"label":"7 &", "x":7, "y":1}, {"label":"8 *", "x":8, "y":1}, {"label":"9 (", "x":9, "y":1}, {"label":"0 )", "x":10, "y":1}, {"label":"- _", "x":11, "y":1}, {"label":"= +", "x":12, "y":1}, {"label":"backspace", "x":13, "y":1, "w":2}, {"label":"page up", "x":15, "y":1}, {"label":"tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"[ {", "x":11.5, "y":2}, {"label":"] }", "x":12.5, "y":2}, {"label":"enter", "x":13.75, "y":2, "w":1.25, "h":2}, {"label":"page down", "x":15, "y":2}, {"label":"caps lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":"; :", "x":10.75, "y":3}, {"label":"' \"", "x":11.75, "y":3}, {"label":"\\ |", "x":12.75, "y":3}, {"label":"home", "x":15, "y":3}, {"label":"shift", "x":0, "y":4, "w":1.25}, {"label":"`~", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":", <", "x":9.25, "y":4}, {"label":". >", "x":10.25, "y":4}, {"label":"/ ?", "x":11.25, "y":4}, {"label":"shift", "x":12.25, "y":4, "w":1.75}, {"label":"up", "x":14, "y":4}, {"label":"end", "x":15, "y":4}, {"label":"control", "x":0, "y":5, "w":1.25}, {"label":"option", "x":1.25, "y":5, "w":1.25}, {"label":"cmd", "x":2.5, "y":5, "w":1.25}, {"label":"space", "x":3.75, "y":5, "w":6.25}, {"label":"cmd", "x":10, "y":5}, {"label":"fn", "x":11, "y":5}, {"label":"control", "x":12, "y":5}, {"label":"left", "x":13, "y":5}, {"label":"down", "x":14, "y":5}, {"label":"right", "x":15, "y":5}
+            ]
+        }
     }
-  }
+}
diff --git a/keyboards/keychron/k3/rgb/k3.h b/keyboards/keychron/k3/rgb/k3.h
index 437847e3f..e2f270024 100644
--- a/keyboards/keychron/k3/rgb/k3.h
+++ b/keyboards/keychron/k3/rgb/k3.h
@@ -4,7 +4,7 @@
 
 #define XXX KC_NO // readability
 
-#define LAYOUT( \
+#define LAYOUT_ansi( \
   k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
   k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1f, \
   k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2f, \
@@ -20,3 +20,20 @@
   {k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e, k4f}, \
   {k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d  k5e, k5f}  \
 }
+
+#define LAYOUT_iso( \
+  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1f, \
+  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2f, \
+  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3f, \
+  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d, k4e, k4f, \
+  k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f  \
+) \
+{ \
+  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
+  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX, k1f}, \
+  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, XXX, k2f}, \
+  {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, k3f}, \
+  {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, k4e, k4f}, \
+  {k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d  k5e, k5f}  \
+}
diff --git a/keyboards/keychron/k3/rgb/readme.md b/keyboards/keychron/k3/rgb/readme.md
index 286324df4..c38725f18 100644
--- a/keyboards/keychron/k3/rgb/readme.md
+++ b/keyboards/keychron/k3/rgb/readme.md
@@ -1,15 +1,17 @@
 ## Keychron K3
 
-Keychron K3 Non Hotswap RGB (Sonix SN32F248B)
+Keychron K3 RGB (Sonix SN32F248B)
 
 Layout by: [Stephen Peery](https://github.com/smp4488) 
 Layout by: [Alexander Frank](https://github.com/jedifindtrick) 
+ISO Layout by: [Gibbio](https://github.com/Gibbio)
 
 Based on Keychron K4 by: [Dimitris Mantzouranis](https://github.com/dexter93) and Keychron K6 by: [Alexander Frank](https://github.com/jedifindtrick) 
 Hardware Supported: SN32F248BF
 
 Make example for this keyboard (after setting up your build environment):
 
-    make keychron/k3:default
+    make keychron/k3/rgb:ansi
+    make keychron/k3/rgb/optical_via:iso
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).