summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/config.h (renamed from keyboards/kbdfans/kbdpad_mk2/config.h)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/info.json (renamed from keyboards/kbdfans/kbdpad_mk2/info.json)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c (renamed from keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c)10
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md (renamed from keyboards/kbdfans/kbdpad_mk2/keymaps/default/readme.md)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c (renamed from keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/keymap.c)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md (renamed from keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/readme.md)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk (renamed from keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/rules.mk)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/keymaps/tester/keymap.c (renamed from keyboards/kbdfans/kbdpad_mk2/keymaps/tester/keymap.c)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/keymaps/tester/readme.md (renamed from keyboards/kbdfans/kbdpad_mk2/keymaps/tester/readme.md)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/keymaps/via/keymap.c (renamed from keyboards/kbdfans/kbdpad_mk2/keymaps/via/keymap.c)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/keymaps/via/rules.mk (renamed from keyboards/kbdfans/kbdpad_mk2/keymaps/via/rules.mk)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/mk2.c (renamed from keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c)2
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/mk2.h (renamed from keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.h)37
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/readme.md (renamed from keyboards/kbdfans/kbdpad_mk2/readme.md)0
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/rules.mk (renamed from keyboards/kbdfans/kbdpad_mk2/rules.mk)0
-rw-r--r--keyboards/planck/keymaps/default/keymap.c6
-rw-r--r--keyboards/ut472/keymaps/default/keymap.c4
17 files changed, 38 insertions, 21 deletions
diff --git a/keyboards/kbdfans/kbdpad_mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index e64aaa3379..e64aaa3379 100644
--- a/keyboards/kbdfans/kbdpad_mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
diff --git a/keyboards/kbdfans/kbdpad_mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json
index 2f61318575..2f61318575 100644
--- a/keyboards/kbdfans/kbdpad_mk2/info.json
+++ b/keyboards/kbdfans/kbdpad/mk2/info.json
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c
index fb9b074587..3213eca482 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c
@@ -19,10 +19,10 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_6x4( /* Base */
KC_ESC, KC_LCTL, KC_LALT, KC_BSPC,
- KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
- KC_P7, KC_P8, KC_P9, KC_PPLS,
- KC_P4, KC_P5, KC_P6, KC_PPLS,
- KC_P1, KC_P2, KC_P3, KC_PENT,
- KC_P0, KC_P0, KC_PDOT, KC_PENT
+ KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9, KC_PPLS,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_P0, KC_P0, KC_PDOT, KC_PENT
),
};
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/default/readme.md b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md
index 71ff8e0025..71ff8e0025 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/default/readme.md
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
index 39ebb77ff8..39ebb77ff8 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/readme.md b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md
index a574499c6b..a574499c6b 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/readme.md
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/rules.mk b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk
index e5ddcae8d9..e5ddcae8d9 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/rules.mk
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/keymap.c
index e0c56c167d..e0c56c167d 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/keymap.c
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/readme.md b/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/readme.md
index 3cd1e9b67b..3cd1e9b67b 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/readme.md
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/readme.md
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/via/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/via/keymap.c
index 20c048c111..20c048c111 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/via/keymap.c
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/via/rules.mk b/keyboards/kbdfans/kbdpad/mk2/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/via/rules.mk
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/via/rules.mk
diff --git a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c b/keyboards/kbdfans/kbdpad/mk2/mk2.c
index 1d6e1642b9..2449724126 100644
--- a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
+++ b/keyboards/kbdfans/kbdpad/mk2/mk2.c
@@ -13,4 +13,4 @@
* 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 "kbdpad_mk2.h"
+#include "mk2.h"
diff --git a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.h b/keyboards/kbdfans/kbdpad/mk2/mk2.h
index 328aeaac9b..0dfa995fe2 100644
--- a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.h
+++ b/keyboards/kbdfans/kbdpad/mk2/mk2.h
@@ -27,17 +27,34 @@
*/
#define LAYOUT_ortho_6x4( \
K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, \
- K40, K41, K42, K43, \
- K50, K51, K52, K53 \
+ K10, K11, K12, K13, \
+ K20, K21, K22, K23, \
+ K30, K31, K32, K33, \
+ K40, K41, K42, K43, \
+ K50, K51, K52, K53 \
) \
{ \
{ K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { K50, K51, K52, K53 } \
+ { K10, K11, K12, K13 }, \
+ { K20, K21, K22, K23 }, \
+ { K30, K31, K32, K33 }, \
+ { K40, K41, K42, K43 }, \
+ { K50, K51, K52, K53 } \
+}
+
+#define LAYOUT_numpad_6x4( \
+ K00, K01, K02, K03, \
+ K10, K11, K12, K13, \
+ K20, K21, K22, \
+ K30, K31, K32, K33, \
+ K40, K41, K42, \
+ K50, K52, K53 \
+) \
+{ \
+ { K00, K01, K02, K03 }, \
+ { K10, K11, K12, K13 }, \
+ { K20, K21, K22, KC_NO }, \
+ { K30, K31, K32, K33 }, \
+ { K40, K41, K42, KC_NO }, \
+ { K50, KC_NO, K52, K53 } \
}
diff --git a/keyboards/kbdfans/kbdpad_mk2/readme.md b/keyboards/kbdfans/kbdpad/mk2/readme.md
index 7736019bb5..7736019bb5 100644
--- a/keyboards/kbdfans/kbdpad_mk2/readme.md
+++ b/keyboards/kbdfans/kbdpad/mk2/readme.md
diff --git a/keyboards/kbdfans/kbdpad_mk2/rules.mk b/keyboards/kbdfans/kbdpad/mk2/rules.mk
index b21b4a2a60..b21b4a2a60 100644
--- a/keyboards/kbdfans/kbdpad_mk2/rules.mk
+++ b/keyboards/kbdfans/kbdpad/mk2/rules.mk
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 7c787e0366..b5ec2e8082 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,-----------------------------------------------------------------------------------.
* | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
* |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
+ * | Esc | A | S | D | F | G | H | J | K | L | ; | ' |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
* |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,-----------------------------------------------------------------------------------.
* | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp |
* |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc | A | R | S | T | D | H | N | E | I | O | " |
+ * | Esc | A | R | S | T | D | H | N | E | I | O | ' |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Shift| Z | X | C | V | B | K | M | , | . | / |Enter |
* |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Dvorak
* ,-----------------------------------------------------------------------------------.
- * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp |
+ * | Tab | ' | , | . | P | Y | F | G | C | R | L | Bksp |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Esc | A | O | E | U | I | D | H | T | N | S | / |
* |------+------+------+------+------+------+------+------+------+------+------+------|
diff --git a/keyboards/ut472/keymaps/default/keymap.c b/keyboards/ut472/keymaps/default/keymap.c
index c6509e97a6..e303f2220c 100644
--- a/keyboards/ut472/keymaps/default/keymap.c
+++ b/keyboards/ut472/keymaps/default/keymap.c
@@ -68,7 +68,7 @@ LAYOUT( /* Right */
* |-------------------------------------------------------------------------+
* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | |
* |-------------------------------------------------------------------------+
- * | | | |Capsl| | | | Home| PgDn| PgUp| End |
+ * | | | |Capsl| | | | Next| Vol-| Vol+| Play|
* `-------------------------------------------------------------------------'
*/
@@ -76,7 +76,7 @@ LAYOUT( /* Left */
KC_TILDE, KC_EXCLAIM, KC_AT, KC_HASH, KC_DOLLAR, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_DELETE,
_______, _______, _______, _______, _______, _______, _______, KC_UNDERSCORE, KC_PLUS, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_PIPE,
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
- _______, _______, _______, KC_CAPS, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+ _______, _______, _______, KC_CAPS, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* FN Layer 3