From a849bdc5811b2bb69df8e3b0948c8e81c0dfa9d4 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Sun, 27 Nov 2016 11:44:30 +0100 Subject: - Merged --- keyboards/ergodox/keymaps/win10_writers-block/Makefile | 9 --------- .../keymaps/win10_writers-block/images/base-layer.png | Bin 125979 -> 0 bytes .../keymaps/win10_writers-block/images/media-layer.png | Bin 102643 -> 0 bytes .../win10_writers-block/images/rimworld-layer.png | Bin 90359 -> 0 bytes .../win10_writers-block/images/symbol-layer.png | Bin 101477 -> 0 bytes 5 files changed, 9 deletions(-) delete mode 100644 keyboards/ergodox/keymaps/win10_writers-block/Makefile delete mode 100644 keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png delete mode 100644 keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png delete mode 100644 keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png delete mode 100644 keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png diff --git a/keyboards/ergodox/keymaps/win10_writers-block/Makefile b/keyboards/ergodox/keymaps/win10_writers-block/Makefile deleted file mode 100644 index fbab4b71c4..0000000000 --- a/keyboards/ergodox/keymaps/win10_writers-block/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# Having a file like this allows you to override Makefile definitions -# for your own particular keymap - -TAP_DANCE_ENABLE=yes - - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png deleted file mode 100644 index d1cb1987c8..0000000000 Binary files a/keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png and /dev/null differ diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png deleted file mode 100644 index c2019da4e9..0000000000 Binary files a/keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png and /dev/null differ diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png deleted file mode 100644 index f866d3d55d..0000000000 Binary files a/keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png and /dev/null differ diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png deleted file mode 100644 index 6f49aae798..0000000000 Binary files a/keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png and /dev/null differ -- cgit v1.2.3 From 46b93f02d570c0bb66410cb8d9af2451d5453635 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Sat, 17 Dec 2016 22:25:08 +0100 Subject: - Added capslock key --- keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c index 5d7c7f38a3..123c53a6de 100644 --- a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c +++ b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------------. * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del | * |-----------------------------------------------------------------------------------------+ - * | | Led | Led-| Led+| | | | | Psc | Slck| Paus| Up | | | + * | CAPS | Led | Led-| Led+| | | | | Psc | Slck| Paus| Up | | | * |-----------------------------------------------------------------------------------------+ * | | Vol-| Vol+| Mute| | | * | / | Home| PgUp| Left|Right| | * |-----------------------------------------------------------------------------------------+ @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FN] = KEYMAP( /* Layer 1 */ ______, 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_INS, \ - ______, S_LED, S_LEDI, S_LEDD, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ______, ______, \ + KC_CAPS, S_LED, S_LEDI, S_LEDD, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ______, ______, \ ______, KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______, ______, \ ______, ______, KC_MPRV, KC_MPLY, KC_MNXT,______,______,KC_PPLS,KC_PMNS,KC_END, KC_PGDN, KC_DOWN, ______,______, \ ______, ______, ______, ______, KC_DEL, KC_MSTP, ______, ______, ______ \ -- cgit v1.2.3 From e9f69ff46eb87eda30fa72e8e8eac2c69173989f Mon Sep 17 00:00:00 2001 From: dbroqua Date: Sat, 17 Dec 2016 22:33:45 +0100 Subject: - Revert local fail o_O --- keyboards/ergodox/keymaps/win10_writers-block/Makefile | 9 +++++++++ .../keymaps/win10_writers-block/images/base-layer.png | Bin 0 -> 125979 bytes .../keymaps/win10_writers-block/images/media-layer.png | Bin 0 -> 102643 bytes .../win10_writers-block/images/rimworld-layer.png | Bin 0 -> 90359 bytes .../win10_writers-block/images/symbol-layer.png | Bin 0 -> 101477 bytes 5 files changed, 9 insertions(+) create mode 100644 keyboards/ergodox/keymaps/win10_writers-block/Makefile create mode 100644 keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png create mode 100644 keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png create mode 100644 keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png create mode 100644 keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png diff --git a/keyboards/ergodox/keymaps/win10_writers-block/Makefile b/keyboards/ergodox/keymaps/win10_writers-block/Makefile new file mode 100644 index 0000000000..fbab4b71c4 --- /dev/null +++ b/keyboards/ergodox/keymaps/win10_writers-block/Makefile @@ -0,0 +1,9 @@ +# Having a file like this allows you to override Makefile definitions +# for your own particular keymap + +TAP_DANCE_ENABLE=yes + + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png new file mode 100644 index 0000000000..d1cb1987c8 Binary files /dev/null and b/keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png differ diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png new file mode 100644 index 0000000000..c2019da4e9 Binary files /dev/null and b/keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png differ diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png new file mode 100644 index 0000000000..f866d3d55d Binary files /dev/null and b/keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png differ diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png new file mode 100644 index 0000000000..6f49aae798 Binary files /dev/null and b/keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png differ -- cgit v1.2.3