Separate default keymap into proper default, iso and ansi versions

keyboards/ducky/one2mini/boards/NUC123SD4AN0/board.h

@@ -379,7 +379,7 @@
                                      PIN_MODE_OUTPUT(GPIOB_UART1_TXD) |           \
                                      PIN_MODE_OUTPUT(GPIOB_UART1_RTS) |           \
                                      PIN_MODE_OUTPUT(GPIOB_UART1_CTS) |           \
-                                     PIN_MODE_OUTPUT(GPIOB_TM0) |           \
+                                     PIN_MODE_INPUT(GPIOB_TM0) |           \
                                      PIN_MODE_INPUT(GPIOB_TM1) |           \
                                      PIN_MODE_INPUT(GPIOB_TM2) |          \
                                      PIN_MODE_INPUT(GPIOB_PIN11) |          \
@@ -411,7 +411,7 @@
                                      PIN_DMASK_DIS(GPIOB_UART1_TXD) |       \
                                      PIN_DMASK_DIS(GPIOB_UART1_RTS) |       \
                                      PIN_DMASK_DIS(GPIOB_UART1_CTS) |       \
-                                     PIN_DMASK_DIS(GPIOB_TM0) |       \
+                                     PIN_DMASK_EN(GPIOB_TM0) |       \
                                      PIN_DMASK_EN(GPIOB_TM1) |       \
                                      PIN_DMASK_EN(GPIOB_TM2) |      \
                                      PIN_DMASK_EN(GPIOB_PIN11) |      \
@@ -427,13 +427,13 @@
                                      PIN_DBNCE_DIS(GPIOB_UART1_TXD) |         \
                                      PIN_DBNCE_DIS(GPIOB_UART1_RTS) |         \
                                      PIN_DBNCE_DIS(GPIOB_UART1_CTS) |         \
-                                     PIN_DBNCE_DIS(GPIOB_TM0) |         \
+                                     PIN_DBNCE_EN(GPIOB_TM0) |         \
                                      PIN_DBNCE_EN(GPIOB_TM1) |         \
                                      PIN_DBNCE_EN(GPIOB_TM2) |        \
                                      PIN_DBNCE_EN(GPIOB_PIN11) |        \
                                      PIN_DBNCE_DIS(GPIOB_CLK0) |        \
                                      PIN_DBNCE_DIS(GPIOB_PIN13) |   \
-                                     PIN_DBNCE_EN(GPIOB_INT0) |  \
+                                     PIN_DBNCE_DIS(GPIOB_INT0) |  \
                                      PIN_DBNCE_EN(GPIOB_INT1))
 #define VAL_GPIOB_IMD               (PIN_IMD_EDGE(GPIOB_UART0_RXD) |             \
                                      PIN_IMD_EDGE(GPIOB_UART0_TXD) |             \

keyboards/ducky/one2mini/config.h

@@ -167,3 +167,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
+
+/* RGB configuration */
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

keyboards/ducky/one2mini/keymaps/ansi/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2019 /u/KeepItUnder
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+// place overrides here

keyboards/ducky/one2mini/keymaps/ansi/keymap.c

@@ -0,0 +1,85 @@
+/* Copyright 2019 /u/KeepItUnder
+ *
+ * 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
+
+// LAYERS
+#define _QWERTY 0       // Standard QWERTY layer
+#define _QW _QWERTY
+#define _FUNCTION 1     // Function key layer
+#define _FN _FUNCTION
+#define _COLOUR 2       // RGB key layer
+#define _CLR _COLOUR
+
+#define MO_FN MO(1)
+#define MO_CLR MO(2)
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+  DK_SW1,
+  DK_SW2,
+  DK_SW3,
+  DK_SW4,
+  QMKBEST = SAFE_RANGE,
+  QMKURL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_ansi(
+    //       2        3        4        5        6        7        8        9        10       11       12       13       14       15
+    KC_GESC, 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, DK_SW1,
+    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_NUBS, DK_SW2,
+    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,  DK_SW3,
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          DK_SW4,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
+  ),
+
+  [_FUNCTION] = LAYOUT_ansi(
+    //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+    KC_GRV,  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_DEL,  KC_TRNS,
+    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS,  _______, KC_UP,   KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______, KC_TRNS,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END,  _______, KC_ENT,  KC_TRNS,
+    _______,          _______, KC_APP,  _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          KC_TRNS,
+    _______, KC_APP,  MO(_CLR),                  _______,                            _______, KC_APP,  _______, _______
+  ),
+  
+  [_COLOUR] = LAYOUT_ansi(
+    //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_TRNS,
+    _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_TRNS,
+    _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, KC_TRNS,
+    _______,          RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          KC_TRNS,
+    _______, _______, _______,                   RGB_TOG,                            _______, _______, _______, _______
+  ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  // switch (keycode) {
+  // }
+  return true;
+}
+
+// void matrix_init_user(void) {
+
+// }
+
+// void matrix_scan_user(void) {
+
+// }
+
+// void led_set_user(uint8_t usb_led) {
+
+// }

keyboards/ducky/one2mini/keymaps/ansi/readme.md

@@ -0,0 +1 @@
+# The default ANSI keymap for one2mini

keyboards/ducky/one2mini/keymaps/default/keymap.c

@@ -38,28 +38,28 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_QWERTY] = LAYOUT_iso(
+  [_QWERTY] = LAYOUT_all(
     //       2        3        4        5        6        7        8        9        10       11       12       13       14       15
     KC_GESC, 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, DK_SW1,
-    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,          DK_SW2,
+    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_NUBS, DK_SW2,
     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,  DK_SW3,
     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_RSFT,          DK_SW4,
     KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
   ),
 
-  [_FUNCTION] = LAYOUT_iso(
+  [_FUNCTION] = LAYOUT_all(
     //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
     KC_GRV,  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_DEL,  KC_TRNS,
-    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS,  _______, KC_UP,   KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR,          KC_TRNS,
+    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS,  _______, KC_UP,   KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______, KC_TRNS,
     _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END,  _______, KC_ENT,  KC_TRNS,
     _______, _______, _______, KC_APP,  _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          KC_TRNS,
     _______, KC_APP,  MO(_CLR),                  _______,                            _______, KC_APP,  _______, _______
   ),
   
-  [_COLOUR] = LAYOUT_iso(
+  [_COLOUR] = LAYOUT_all(
     //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_TRNS,
-    _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,          KC_TRNS,
+    _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, KC_TRNS,
     _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, KC_TRNS,
     _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          KC_TRNS,
     _______, _______, _______,                   RGB_TOG,                            _______, _______, _______, _______

keyboards/ducky/one2mini/keymaps/default/readme.md

@@ -1 +1 @@
-# The default keymap for one2mini (ISO - ANSI to follow)
+# The default keymap for one2mini (ISO & ANSI combined)

keyboards/ducky/one2mini/keymaps/iso/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2019 /u/KeepItUnder
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+// place overrides here

keyboards/ducky/one2mini/keymaps/iso/keymap.c

@@ -0,0 +1,85 @@
+/* Copyright 2019 /u/KeepItUnder
+ *
+ * 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
+
+// LAYERS
+#define _QWERTY 0       // Standard QWERTY layer
+#define _QW _QWERTY
+#define _FUNCTION 1     // Function key layer
+#define _FN _FUNCTION
+#define _COLOUR 2       // RGB key layer
+#define _CLR _COLOUR
+
+#define MO_FN MO(1)
+#define MO_CLR MO(2)
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+  DK_SW1,
+  DK_SW2,
+  DK_SW3,
+  DK_SW4,
+  QMKBEST = SAFE_RANGE,
+  QMKURL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_iso(
+    //       2        3        4        5        6        7        8        9        10       11       12       13       14       15
+    KC_GESC, 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, DK_SW1,
+    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,          DK_SW2,
+    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,  DK_SW3,
+    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_RSFT,          DK_SW4,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
+  ),
+
+  [_FUNCTION] = LAYOUT_iso(
+    //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+    KC_GRV,  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_DEL,  KC_TRNS,
+    _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS,  _______, KC_UP,   KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR,          KC_TRNS,
+    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END,  _______, KC_ENT,  KC_TRNS,
+    _______, _______, _______, KC_APP,  _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          KC_TRNS,
+    _______, KC_APP,  MO(_CLR),                  _______,                            _______, KC_APP,  _______, _______
+  ),
+  
+  [_COLOUR] = LAYOUT_iso(
+    //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_TRNS,
+    _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,          KC_TRNS,
+    _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, KC_TRNS,
+    _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          KC_TRNS,
+    _______, _______, _______,                   RGB_TOG,                            _______, _______, _______, _______
+  ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  // switch (keycode) {
+  // }
+  return true;
+}
+
+// void matrix_init_user(void) {
+
+// }
+
+// void matrix_scan_user(void) {
+
+// }
+
+// void led_set_user(uint8_t usb_led) {
+
+// }

keyboards/ducky/one2mini/keymaps/iso/readme.md

@@ -0,0 +1 @@
+# The default ISO keymap for one2mini

keyboards/ducky/one2mini/one2mini.c

@@ -53,7 +53,16 @@ void bootmagic_lite(void) {
  */
 #define USB_LED_CAPSLOCK_INDEX 28  /* Location of CAPS LOCK led in matrix */
 
-rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+const mbi_led g_mbi_leds[DRIVER_LED_TOTAL] = {
+    { 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 },
+    { 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 },
+    { 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 }, { 2, 13 },
+    { 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 },
+    { 4, 0 }, { 4, 1 }, { 4, 2 },                     { 4, 5 },                                         { 4, 10 }, { 4, 11 }, { 4, 12 }, { 4, 13 }
+};
+
+//rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+led_config_t g_led_config = { {
 /**
  * RGB Layout
  * 
@@ -64,69 +73,31 @@ rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
  *  4_0,  4_1,  4_2,  ---,  ---,  4_5,  ---,  ---,  ---,  ---, 4_10, 4_11, 4_12, 4_13
  * 
  */
-    {{0|(0<<4)},    {0,  0}, 4},
+	// Key Matrix to LED Index
-    {{0|(1<<4)},    {16,  0}, 4},
+	{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 },
-    {{0|(2<<4)},    {32,  0}, 4},
+	{ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, NO_LED },
-    {{0|(3<<4)},    {48,  0}, 4},
+	{ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 },
-    {{0|(4<<4)},    {64,  0}, 4},
+	{ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, NO_LED, 53 },
-    {{0|(5<<4)},    {80,  0}, 4},
+	{ 54, 55, 56, NO_LED, NO_LED, 57, NO_LED, NO_LED, NO_LED, NO_LED, 58, 59, 60, 61 }
-	{{0|(6<<4)},    {96,  0}, 4},
+}, {
-    {{0|(7<<4)},    {112,  0}, 4},
+	// Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace
-    {{0|(8<<4)},    {128,  0}, 4},
+	{ 0, 0 }, { 16, 0 }, { 32, 0 }, { 48, 0 }, { 64, 0 }, {80, 0 }, { 96, 0 }, { 112, 0 }, { 128, 0 }, { 144, 0 }, {160, 0 }, {176, 0 }, { 192, 0 }, { 224, 0 },
-    {{0|(9<<4)},    {144,  0}, 4},
+	// Tab, Q, W, E, R, T, Y, U, I, O, P, [, ]
-    {{0|(10<<4)},   {160,  0}, 4},
+	{ 0, 16 }, { 16, 16 }, { 32, 16 }, { 48, 16 }, { 64, 16 }, {80, 16 }, { 96, 16 }, { 112, 16 }, { 128, 16 }, { 144, 16 }, {160, 16 }, {176, 16 }, { 192, 16 },
-    {{0|(11<<4)},   {176,  0}, 4},
+	// Caps Lock, A, S, D, F, G, H, J, K, L, ;, ', #, Enter
-    {{0|(12<<4)},   {192,  0}, 4},
+	{ 0, 32 }, { 16, 32 }, { 32, 32 }, { 48, 32 }, { 64, 32 }, {80, 32 }, { 96, 32 }, { 112, 32 }, { 128, 32 }, { 144, 32 }, {160, 32 }, {176, 32 }, { 192, 32 }, { 224, 32 },
-    {{0|(13<<4)},   {224,  0}, 4},
+	// Shift, \, Z, X, C, V, B, N, M, ,, ., /, Shift
-    {{1|(0<<4)},    {0,  16}, 4},
+	{ 0, 48 }, { 16, 48 }, { 32, 48 }, { 48, 48 }, { 64, 48 }, {80, 48 }, { 96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, {160, 48 }, {176, 48 }, { 224, 48 },
-    {{1|(1<<4)},    {16,  16}, 4},
+	// Ctrl, Win, Alt, Space, AltGr, Win, Fn, Ctrl
-    {{1|(2<<4)},    {32,  16}, 4},
+	{ 0, 64 }, { 16, 64 }, { 32, 64 }, {80, 64 }, {160, 64 }, {176, 64 }, { 192, 64 }, { 224, 64 }
-    {{1|(3<<4)},    {48,  16}, 4},
+}, {
-    {{1|(4<<4)},    {64,  16}, 4},
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    {{1|(5<<4)},    {80,  16}, 4},
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-	{{1|(6<<4)},    {96,  16}, 4},
+	5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    {{1|(7<<4)},    {112,  16}, 4},
+	5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5,
-    {{1|(8<<4)},    {128,  16}, 4},
+	5, 5, 5, 4, 5, 5, 5, 5
-    {{1|(9<<4)},    {144,  16}, 4},
+	
-    {{1|(10<<4)},   {160,  16}, 4},
+} }; 
-    {{1|(11<<4)},   {176,  16}, 4},
-    {{1|(12<<4)},   {192,  16}, 4},
-    {{2|(0<<4)},    {0,  32}, 1},
-    {{2|(1<<4)},    {16,  32}, 4},
-    {{2|(2<<4)},    {32,  32}, 4},
-    {{2|(3<<4)},    {48,  32}, 4},
-    {{2|(4<<4)},    {64,  32}, 4},
-    {{2|(5<<4)},    {80,  32}, 4},
-    {{2|(6<<4)},    {96,  32}, 4},
-    {{2|(7<<4)},    {112,  32}, 4},
-    {{2|(8<<4)},    {128,  32}, 4},
-    {{2|(9<<4)},    {144,  32}, 4},
-    {{2|(10<<4)},   {160,  32}, 4},
-    {{2|(11<<4)},   {176,  32}, 4},
-    {{2|(12<<4)},   {192,  32}, 4},
-	{{2|(13<<4)},   {224,  32}, 4},
-    {{3|(0<<4)},    {0,  48}, 1},
-    {{3|(1<<4)},    {16,  48}, 4},
-    {{3|(2<<4)},    {32,  48}, 4},
-    {{3|(3<<4)},    {48,  48}, 4},
-    {{3|(4<<4)},    {64,  48}, 4},
-    {{3|(5<<4)},    {80,  48}, 4},
-    {{3|(6<<4)},    {96,  48}, 4},
-    {{3|(7<<4)},    {112,  48}, 4},
-    {{3|(8<<4)},    {128,  48}, 4},
-    {{3|(9<<4)},    {144,  48}, 4},
-    {{3|(10<<4)},   {160,  48}, 4},
-    {{3|(11<<4)},   {176,  48}, 4},
-    {{3|(13<<4)},   {224,  48}, 1},
-    {{4|(0<<4)},    {0,  64}, 1},
-    {{4|(1<<4)},    {16,  64}, 1},
-    {{4|(2<<4)},    {32,  64}, 1},
-    {{4|(5<<4)},    {80,  64}, 4},
-    {{4|(10<<4)},   {160,  64}, 1},
-    {{4|(11<<4)},   {176,  64}, 1},
-    {{4|(12<<4)},   {192,  64}, 1},
-    {{4|(13<<4)},   {224,  64}, 1},
-};
 	
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here

keyboards/ducky/one2mini/one2mini.h

@@ -25,20 +25,34 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_all( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
     k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d       \
 ) { \
     { k00,  k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0a,  k0b,  k0c,   k0d,   k0e }, \
-    { k10,  k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a,  k1b,  k1c,   KC_NO, k1e }, \
+    { k10,  k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a,  k1b,  k1c,   k1d,   k1e }, \
     { k20,  k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,  k2b,  k2c,   k2d,   k2e }, \
     { k30,  k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a,  k3b,  KC_NO, k3d,   k3e }, \
     { k40,  k41,   k42,   KC_NO, KC_NO, k45,   KC_NO, KC_NO, KC_NO, KC_NO, k4a,  k4b,  k4c,   k4d        }  \
 }
 
+#define LAYOUT_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e,     \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,     \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e,     \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e,     \
+    k40, k41, k42,           k45,                     k4a, k4b, k4c, k4d           \
+) { \
+    { k00,  k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0a,  k0b,  k0c,   k0d,   k0e }, \
+    { k10,  k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a,  k1b,  k1c,   k1d,   k1e }, \
+    { k20,  k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,  k2b,  k2c,   k2d,   k2e }, \
+    { k30,  KC_NO, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a,  k3b,  KC_NO, k3d,   k3e }, \
+    { k40,  k41,   k42,   KC_NO, KC_NO, k45,   KC_NO, KC_NO, KC_NO, KC_NO, k4a,  k4b,  k4c,   k4d        }  \
+}
+
 #define LAYOUT_iso( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e,     \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e,     \

keyboards/ducky/one2mini/rules.mk

@@ -103,4 +103,5 @@ FAUXCLICKY_ENABLE = no        # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no                    # Enable support for HD44780 based LCDs (+400)
 #WAIT_FOR_USB = no                     # Don't wait for USB driver to initialise
 RGB_MATRIX_ENABLE = MBI5042            # Use Macroblock PWM LED driver
+
 CUSTOM_MATRIX = yes                    # Custom keyscan matrix (don't force inputs)