diff options
| -rw-r--r-- | keyboards/delikeeb/flatbread60/config.h (renamed from keyboards/nckiibs/flatbread60/config.h) | 2 | ||||
| -rw-r--r-- | keyboards/delikeeb/flatbread60/flatbread60.c (renamed from keyboards/nckiibs/flatbread60/flatbread60.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/flatbread60/flatbread60.h (renamed from keyboards/nckiibs/flatbread60/flatbread60.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/flatbread60/info.json (renamed from keyboards/nckiibs/flatbread60/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/flatbread60/keymaps/default/keymap.c (renamed from keyboards/nckiibs/flatbread60/keymaps/default/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/flatbread60/keymaps/default/readme.md (renamed from keyboards/nckiibs/flatbread60/keymaps/default/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/flatbread60/keymaps/via/keymap.c (renamed from keyboards/nckiibs/flatbread60/keymaps/via/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/flatbread60/keymaps/via/rules.mk (renamed from keyboards/nckiibs/flatbread60/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/flatbread60/readme.md (renamed from keyboards/nckiibs/flatbread60/readme.md) | 4 | ||||
| -rw-r--r-- | keyboards/delikeeb/flatbread60/rules.mk (renamed from keyboards/nckiibs/flatbread60/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/config.h (renamed from keyboards/nckiibs/vaguettelite/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/info.json (renamed from keyboards/nckiibs/vaguettelite/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c (renamed from keyboards/nckiibs/vaguettelite/keymaps/default/keymap.c) | 10 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/keymaps/default/readme.md (renamed from keyboards/nckiibs/vaguettelite/keymaps/default/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/keymap.c (renamed from keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/keymap.c) | 4 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/readme.md (renamed from keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c (renamed from keyboards/nckiibs/vaguettelite/keymaps/noclew/keymap.c) | 10 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/keymaps/noclew/readme.md (renamed from keyboards/nckiibs/vaguettelite/keymaps/noclew/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c (renamed from keyboards/nckiibs/vaguettelite/keymaps/via/keymap.c) | 16 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/keymaps/via/rules.mk (renamed from keyboards/nckiibs/vaguettelite/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/readme.md (renamed from keyboards/nckiibs/vaguettelite/readme.md) | 4 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/rules.mk (renamed from keyboards/nckiibs/vaguettelite/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/vaguettelite.c (renamed from keyboards/nckiibs/vaguettelite/vaguettelite.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaguettelite/vaguettelite.h (renamed from keyboards/nckiibs/vaguettelite/vaguettelite.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/config.h (renamed from keyboards/nckiibs/vanana/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/info.json (renamed from keyboards/nckiibs/vanana/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/keymaps/default/keymap.c (renamed from keyboards/nckiibs/vanana/keymaps/default/keymap.c) | 39 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/keymaps/default/readme.md (renamed from keyboards/nckiibs/vanana/keymaps/default/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/keymaps/via/keymap.c (renamed from keyboards/nckiibs/vanana/keymaps/via/keymap.c) | 44 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/keymaps/via/rules.mk (renamed from keyboards/nckiibs/vanana/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/readme.md (renamed from keyboards/nckiibs/vanana/readme.md) | 4 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/rev1/config.h (renamed from keyboards/nckiibs/vanana/rev1/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/rev1/rev1.c (renamed from keyboards/nckiibs/vanana/rev1/rev1.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/rev1/rev1.h (renamed from keyboards/nckiibs/vanana/rev1/rev1.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/rev1/rules.mk (renamed from keyboards/nckiibs/vanana/rev1/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/rev2/config.h (renamed from keyboards/nckiibs/vanana/rev2/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/rev2/rev2.c (renamed from keyboards/nckiibs/vanana/rev2/rev2.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/rev2/rev2.h (renamed from keyboards/nckiibs/vanana/rev2/rev2.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/rev2/rules.mk (renamed from keyboards/nckiibs/vanana/rev2/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vanana/rules.mk (renamed from keyboards/nckiibs/vanana/rules.mk) | 2 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/config.h (renamed from keyboards/nckiibs/vaneela/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/info.json (renamed from keyboards/nckiibs/vaneela/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/keymaps/default/keymap.c (renamed from keyboards/nckiibs/vaneela/keymaps/default/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/keymaps/default/readme.md (renamed from keyboards/nckiibs/vaneela/keymaps/default/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/keymaps/via/keymap.c (renamed from keyboards/nckiibs/vaneela/keymaps/via/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/keymaps/via/rules.mk (renamed from keyboards/nckiibs/vaneela/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/readme.md (renamed from keyboards/nckiibs/vaneela/readme.md) | 4 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/rules.mk (renamed from keyboards/nckiibs/vaneela/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/vaneela.c (renamed from keyboards/nckiibs/vaneela/vaneela.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneela/vaneela.h (renamed from keyboards/nckiibs/vaneela/vaneela.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/config.h (renamed from keyboards/nckiibs/vaneelaex/config.h) | 2 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/info.json (renamed from keyboards/nckiibs/vaneelaex/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/keymaps/default/keymap.c (renamed from keyboards/nckiibs/vaneelaex/keymaps/default/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/keymaps/default/readme.md (renamed from keyboards/nckiibs/vaneelaex/keymaps/default/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c (renamed from keyboards/nckiibs/vaneelaex/keymaps/via/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/keymaps/via/rules.mk (renamed from keyboards/nckiibs/vaneelaex/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/readme.md (renamed from keyboards/nckiibs/vaneelaex/readme.md) | 4 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/rules.mk (renamed from keyboards/nckiibs/vaneelaex/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/vaneelaex.c (renamed from keyboards/nckiibs/vaneelaex/vaneelaex.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/vaneelaex/vaneelaex.h (renamed from keyboards/nckiibs/vaneelaex/vaneelaex.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/config.h (renamed from keyboards/nckiibs/waaffle/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/keymaps/default/keymap.c (renamed from keyboards/nckiibs/waaffle/keymaps/default/keymap.c) | 28 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/keymaps/default/readme.md (renamed from keyboards/nckiibs/waaffle/keymaps/default/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/keymaps/via/keymap.c (renamed from keyboards/nckiibs/waaffle/keymaps/via/keymap.c) | 8 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/keymaps/via/rules.mk (renamed from keyboards/nckiibs/waaffle/keymaps/via/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/readme.md (renamed from keyboards/nckiibs/waaffle/readme.md) | 8 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/rev3/config.h (renamed from keyboards/nckiibs/waaffle/rev3/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk (renamed from keyboards/nckiibs/waaffle/rev3/elite_c/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/rev3/info.json (renamed from keyboards/nckiibs/waaffle/rev3/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk (renamed from keyboards/nckiibs/waaffle/rev3/pro_micro/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/rev3/rev3.c (renamed from keyboards/nckiibs/waaffle/rev3/rev3.c) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/rev3/rev3.h (renamed from keyboards/nckiibs/waaffle/rev3/rev3.h) | 0 | ||||
| -rw-r--r-- | keyboards/delikeeb/waaffle/rev3/rules.mk (renamed from keyboards/nckiibs/waaffle/rev3/rules.mk) | 2 |
73 files changed, 115 insertions, 80 deletions
diff --git a/keyboards/nckiibs/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h index 14b54f43a6..6c40d46bff 100644 --- a/keyboards/nckiibs/flatbread60/config.h +++ b/keyboards/delikeeb/flatbread60/config.h @@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define VENDOR_ID 0x9906 #define PRODUCT_ID 0x0000 #define DEVICE_VER 0x0001 -#define MANUFACTURER nckiibs +#define MANUFACTURER delikeeb #define PRODUCT Flatbread60 /* key matrix size */ diff --git a/keyboards/nckiibs/flatbread60/flatbread60.c b/keyboards/delikeeb/flatbread60/flatbread60.c index 0cbc265530..0cbc265530 100644 --- a/keyboards/nckiibs/flatbread60/flatbread60.c +++ b/keyboards/delikeeb/flatbread60/flatbread60.c diff --git a/keyboards/nckiibs/flatbread60/flatbread60.h b/keyboards/delikeeb/flatbread60/flatbread60.h index 3fb8d7a6f1..3fb8d7a6f1 100644 --- a/keyboards/nckiibs/flatbread60/flatbread60.h +++ b/keyboards/delikeeb/flatbread60/flatbread60.h diff --git a/keyboards/nckiibs/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json index ed621e8175..ed621e8175 100644 --- a/keyboards/nckiibs/flatbread60/info.json +++ b/keyboards/delikeeb/flatbread60/info.json diff --git a/keyboards/nckiibs/flatbread60/keymaps/default/keymap.c b/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c index ed3ed26037..ed3ed26037 100644 --- a/keyboards/nckiibs/flatbread60/keymaps/default/keymap.c +++ b/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c diff --git a/keyboards/nckiibs/flatbread60/keymaps/default/readme.md b/keyboards/delikeeb/flatbread60/keymaps/default/readme.md index 571cfbcd68..571cfbcd68 100644 --- a/keyboards/nckiibs/flatbread60/keymaps/default/readme.md +++ b/keyboards/delikeeb/flatbread60/keymaps/default/readme.md diff --git a/keyboards/nckiibs/flatbread60/keymaps/via/keymap.c b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c index cfba3e11c0..cfba3e11c0 100644 --- a/keyboards/nckiibs/flatbread60/keymaps/via/keymap.c +++ b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c diff --git a/keyboards/nckiibs/flatbread60/keymaps/via/rules.mk b/keyboards/delikeeb/flatbread60/keymaps/via/rules.mk index bde15290ba..bde15290ba 100644 --- a/keyboards/nckiibs/flatbread60/keymaps/via/rules.mk +++ b/keyboards/delikeeb/flatbread60/keymaps/via/rules.mk diff --git a/keyboards/nckiibs/flatbread60/readme.md b/keyboards/delikeeb/flatbread60/readme.md index fa932143b4..6f187833a6 100644 --- a/keyboards/nckiibs/flatbread60/readme.md +++ b/keyboards/delikeeb/flatbread60/readme.md @@ -10,10 +10,10 @@ This is a custom PCB made by a hobbiest, and it has an ortholinear 60 key layout Make example for this keyboard (after setting up your build environment): - make nckiibs/flatbread60:default + make delikeeb/flatbread60:default Flashing example for this keyboard: - make nckiibs/flatbread60:default:flash + make delikeeb/flatbread60:default:flash 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). diff --git a/keyboards/nckiibs/flatbread60/rules.mk b/keyboards/delikeeb/flatbread60/rules.mk index 4012c6ac3e..4012c6ac3e 100644 --- a/keyboards/nckiibs/flatbread60/rules.mk +++ b/keyboards/delikeeb/flatbread60/rules.mk diff --git a/keyboards/nckiibs/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h index ef1aec49ef..ef1aec49ef 100644 --- a/keyboards/nckiibs/vaguettelite/config.h +++ b/keyboards/delikeeb/vaguettelite/config.h diff --git a/keyboards/nckiibs/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json index 0f3d6049a2..0f3d6049a2 100644 --- a/keyboards/nckiibs/vaguettelite/info.json +++ b/keyboards/delikeeb/vaguettelite/info.json diff --git a/keyboards/nckiibs/vaguettelite/keymaps/default/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c index 90778e51ff..8593526aa3 100644 --- a/keyboards/nckiibs/vaguettelite/keymaps/default/keymap.c +++ b/keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c @@ -25,7 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE, + BASE = SAFE_RANGE, LOWER, RAISE, }; @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { *---------------------------------------------------------------------------------------------------------- * | Esc | A | S | D | F | G | H | J | K | L | ; | Enter | N/A | ' | *---------------------------------------------------------------------------------------------------------- - * | N/A | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | DEL | + * | N/A | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Del | *---------------------------------------------------------------------------------------------------------- * | Ctrl | GUI | Alt | Lower | Space | Space | Space | Raise | Alt | Left | Down | Up | Right | *---------------------------------------------------------------------------------------------------------- @@ -56,9 +56,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT_all( _______, 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_F12 , _______, - KC_BSPC, KC_EQL , KC_7 , KC_8 , KC_9 , KC_SLSH, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, _______, _______, - KC_ENT , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_UNDS, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO , _______, _______, _______, - KC_DLR , KC_DLR , KC_PAST, KC_1 , KC_2 , KC_3 , KC_PPLS, KC_PIPE, KC_LCBR, KC_RCBR, KC_PERC, KC_AMPR, _______, _______, + KC_BSPC, KC_SLSH, KC_7 , KC_8 , KC_9 , KC_PPLS, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, _______, _______, + KC_EQL , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_PIPE, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, _______, _______, + KC_ENT , _______, KC_PAST, KC_1 , KC_2 , KC_3 , KC_UNDS, KC_DLR , KC_LCBR, KC_RCBR, KC_AMPR, KC_PERC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/nckiibs/vaguettelite/keymaps/default/readme.md b/keyboards/delikeeb/vaguettelite/keymaps/default/readme.md index 1dc3967344..1dc3967344 100644 --- a/keyboards/nckiibs/vaguettelite/keymaps/default/readme.md +++ b/keyboards/delikeeb/vaguettelite/keymaps/default/readme.md diff --git a/keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/keymap.c index ea95ce7be5..a1af844bb3 100644 --- a/keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/keymap.c +++ b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/keymap.c @@ -25,7 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE, + BASE = SAFE_RANGE, LOWER, RAISE, }; @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* BASE * --------------------------------------------------------------------------------------------------------- - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BSpc | Mute | + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | BSP | Mute | * --------------------------------------------------------------------------------------------------------- * | Tab | Q | W | E | R | T | Y | U | I | O | P | \ | [ | ] | *---------------------------------------------------------------------------------------------------------- diff --git a/keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/readme.md b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/readme.md index fc537215ee..fc537215ee 100644 --- a/keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/readme.md +++ b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/readme.md diff --git a/keyboards/nckiibs/vaguettelite/keymaps/noclew/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c index b82a893cd0..d8f470288a 100644 --- a/keyboards/nckiibs/vaguettelite/keymaps/noclew/keymap.c +++ b/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c @@ -27,7 +27,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE, + BASE = SAFE_RANGE, LOWER, RAISE, MAC, @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_BASE] = LAYOUT_all( - 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_MINS, KC_BSPC, KC_AUDIO_MUTE, + 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_AUDIO_MUTE, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS, KC_LBRC, KC_RBRC, KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_ENT , KC_NO, KC_QUOT, KC_NO , KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, RSFT_T(KC_QUOT), KC_DEL, @@ -76,9 +76,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT_all( _______, 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_F12 , _______, - KC_BSPC, KC_EQL , KC_7 , KC_8 , KC_9 , KC_SLSH, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, _______, _______, - KC_ENT , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_UNDS, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO , _______, _______, _______, - KC_DLR , KC_DLR , KC_PAST, KC_1 , KC_2 , KC_3 , KC_PPLS, KC_PIPE, KC_LCBR, KC_RCBR, KC_PERC, KC_AMPR, _______, _______, + KC_BSPC, KC_SLSH, KC_7 , KC_8 , KC_9 , KC_PPLS, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, _______, _______, + KC_EQL , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_PIPE, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, _______, _______, + KC_ENT , _______, KC_PAST, KC_1 , KC_2 , KC_3 , KC_UNDS, KC_DLR , KC_LCBR, KC_RCBR, KC_AMPR, KC_PERC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/nckiibs/vaguettelite/keymaps/noclew/readme.md b/keyboards/delikeeb/vaguettelite/keymaps/noclew/readme.md index bc2bbecb7c..bc2bbecb7c 100644 --- a/keyboards/nckiibs/vaguettelite/keymaps/noclew/readme.md +++ b/keyboards/delikeeb/vaguettelite/keymaps/noclew/readme.md diff --git a/keyboards/nckiibs/vaguettelite/keymaps/via/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c index 4a98fc80ae..2993728ea0 100644 --- a/keyboards/nckiibs/vaguettelite/keymaps/via/keymap.c +++ b/keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c @@ -26,7 +26,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE, + BASE = SAFE_RANGE, LOWER, RAISE, }; @@ -35,31 +35,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* BASE * --------------------------------------------------------------------------------------------------------- - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BSpc | Del | Del | Mute | + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BSpc | Mute | * --------------------------------------------------------------------------------------------------------- * | Tab | Q | W | E | R | T | Y | U | I | O | P | \ | [ | ] | *---------------------------------------------------------------------------------------------------------- * | Esc | A | S | D | F | G | H | J | K | L | ; | Enter | N/A | ' | *---------------------------------------------------------------------------------------------------------- - * | N/A | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | / | + * | N/A | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Del | *---------------------------------------------------------------------------------------------------------- * | Ctrl | GUI | Alt | Lower | Space | Space | Space | Raise | Alt | Left | Down | Up | Right | *---------------------------------------------------------------------------------------------------------- */ [_BASE] = LAYOUT_all( - KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC, KC_DEL, KC_DEL, KC_AUDIO_MUTE, + 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_AUDIO_MUTE, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS, KC_LBRC, KC_RBRC, KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_ENT , KC_NO, KC_QUOT, - KC_NO , KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, RSFT_T(KC_QUOT), KC_SLSH, + KC_NO , KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, RSFT_T(KC_QUOT), KC_DEL, KC_LCTL, KC_LGUI, KC_LALT, LOWER , KC_SPC , KC_SPC , KC_SPC , RAISE, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), [_LOWER] = LAYOUT_all( _______, 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_F12 , _______, - KC_BSPC, KC_EQL , KC_7 , KC_8 , KC_9 , KC_SLSH, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, _______, _______, - KC_ENT , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_UNDS, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO , _______, _______, _______, - KC_DLR , KC_DLR , KC_PAST, KC_1 , KC_2 , KC_3 , KC_PPLS, KC_PIPE, KC_LCBR, KC_RCBR, KC_PERC, KC_AMPR, _______, _______, + KC_BSPC, KC_SLSH, KC_7 , KC_8 , KC_9 , KC_PPLS, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, _______, _______, + KC_EQL , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_PIPE, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, _______, _______, + KC_ENT , _______, KC_PAST, KC_1 , KC_2 , KC_3 , KC_UNDS, KC_DLR , KC_LCBR, KC_RCBR, KC_AMPR, KC_PERC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/nckiibs/vaguettelite/keymaps/via/rules.mk b/keyboards/delikeeb/vaguettelite/keymaps/via/rules.mk index 1e5b99807c..1e5b99807c 100644 --- a/keyboards/nckiibs/vaguettelite/keymaps/via/rules.mk +++ b/keyboards/delikeeb/vaguettelite/keymaps/via/rules.mk diff --git a/keyboards/nckiibs/vaguettelite/readme.md b/keyboards/delikeeb/vaguettelite/readme.md index 09351226a1..f076df2e13 100644 --- a/keyboards/nckiibs/vaguettelite/readme.md +++ b/keyboards/delikeeb/vaguettelite/readme.md @@ -10,10 +10,10 @@ Vaguette Lite is a 60% keyboard that has a reduced alphas area, and it is a vari Make example for this keyboard (after setting up your build environment): - make nckiibs/vaguettelite:default + make delikeeb/vaguettelite:default Flashing example for this keyboard: - make nckiibs/vaguettelite:default:flash + make delikee/vaguettelite:default:flash 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). diff --git a/keyboards/nckiibs/vaguettelite/rules.mk b/keyboards/delikeeb/vaguettelite/rules.mk index 5fff90decf..5fff90decf 100644 --- a/keyboards/nckiibs/vaguettelite/rules.mk +++ b/keyboards/delikeeb/vaguettelite/rules.mk diff --git a/keyboards/nckiibs/vaguettelite/vaguettelite.c b/keyboards/delikeeb/vaguettelite/vaguettelite.c index a91dae9a3f..a91dae9a3f 100644 --- a/keyboards/nckiibs/vaguettelite/vaguettelite.c +++ b/keyboards/delikeeb/vaguettelite/vaguettelite.c diff --git a/keyboards/nckiibs/vaguettelite/vaguettelite.h b/keyboards/delikeeb/vaguettelite/vaguettelite.h index 20a0e59722..20a0e59722 100644 --- a/keyboards/nckiibs/vaguettelite/vaguettelite.h +++ b/keyboards/delikeeb/vaguettelite/vaguettelite.h diff --git a/keyboards/nckiibs/vanana/config.h b/keyboards/delikeeb/vanana/config.h index 3a5a888945..3a5a888945 100644 --- a/keyboards/nckiibs/vanana/config.h +++ b/keyboards/delikeeb/vanana/config.h diff --git a/keyboards/nckiibs/vanana/info.json b/keyboards/delikeeb/vanana/info.json index 486e8a7672..486e8a7672 100644 --- a/keyboards/nckiibs/vanana/info.json +++ b/keyboards/delikeeb/vanana/info.json diff --git a/keyboards/nckiibs/vanana/keymaps/default/keymap.c b/keyboards/delikeeb/vanana/keymaps/default/keymap.c index bd797c563c..af7a706ccb 100644 --- a/keyboards/nckiibs/vanana/keymaps/default/keymap.c +++ b/keyboards/delikeeb/vanana/keymaps/default/keymap.c @@ -29,7 +29,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE, + BASE = SAFE_RANGE, LOWER, RAISE, }; @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ------------------------------------------- --------- -------------------------------------------- * | Esc | A | S | D | F | G | | Bksp | | H | J | K | L | ; |Enter | * ------------------------------------------- --------- ------------------------------------------- - * | Shift| Z | X | C | V | B | | Del | | N | M | , | . | / | " | + * | Shift| Z | X | C | V | B | | Del | | N | M | , | . | / |Sft(')| * ------------------------------------------- --------- ------------------------------------------- * | GUI | Alt | Ctrl |Lower |Space | |Space |Raise |Alt | Left | Right| * ------------------------------------ ------------------------------------ @@ -59,9 +59,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( 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_BSPC, KC_EQL , KC_7 , KC_8 , KC_9 , KC_PPLS, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, - KC_ENT , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_LEFT, KC_UNDS, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, - KC_DLR , KC_PAST, KC_1 , KC_2 , KC_3 , KC_SLSH, KC_RGHT, KC_PIPE, KC_LCBR, KC_RCBR, KC_PERC, KC_AMPR, _______, + KC_BSPC, KC_SLSH, KC_7 , KC_8 , KC_9 , KC_PPLS, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, _______, + KC_EQL , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_LEFT, KC_PIPE, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, + KC_ENT , KC_PAST, KC_1 , KC_2 , KC_3 , KC_UNDS, KC_RGHT, KC_DLR , KC_LCBR, KC_RCBR, KC_AMPR, KC_PERC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), @@ -72,6 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, KC_DOWN, _______, KC_PGUP, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [_ADJUST] = LAYOUT( RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG , _______, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, @@ -122,23 +123,39 @@ void encoder_update_user(uint8_t index, bool clockwise) { /* And with another if statement we can check the direction. */ if (clockwise) { if (IS_LAYER_ON(_LOWER)){ - tap_code(KC_VOLU); - } else { tap_code(KC_RIGHT); + } else if (IS_LAYER_ON(_RAISE)){ + tap_code(KC_DOWN); + } else { + tap_code(KC_VOLU); } } else { if (IS_LAYER_ON(_LOWER)){ - tap_code(KC_VOLD); - } else { tap_code(KC_LEFT); + } else if (IS_LAYER_ON(_RAISE)){ + tap_code(KC_UP); + } else { + tap_code(KC_VOLD); } } } else if (index == 1) { /* Second encoder. Only supported by Elite-C */ if (clockwise) { - tap_code(KC_RIGHT); + if (IS_LAYER_ON(_LOWER)){ + tap_code(KC_RIGHT); + } else if (IS_LAYER_ON(_RAISE)){ + tap_code(KC_DOWN); + } else { + tap_code(KC_VOLU); + } } else { - tap_code(KC_LEFT); + if (IS_LAYER_ON(_LOWER)){ + tap_code(KC_LEFT); + } else if (IS_LAYER_ON(_RAISE)){ + tap_code(KC_UP); + } else { + tap_code(KC_VOLD); + } } } } diff --git a/keyboards/nckiibs/vanana/keymaps/default/readme.md b/keyboards/delikeeb/vanana/keymaps/default/readme.md index 4fb4d2183a..4fb4d2183a 100644 --- a/keyboards/nckiibs/vanana/keymaps/default/readme.md +++ b/keyboards/delikeeb/vanana/keymaps/default/readme.md diff --git a/keyboards/nckiibs/vanana/keymaps/via/keymap.c b/keyboards/delikeeb/vanana/keymaps/via/keymap.c index 1715ae5bd2..6d04898f3f 100644 --- a/keyboards/nckiibs/vanana/keymaps/via/keymap.c +++ b/keyboards/delikeeb/vanana/keymaps/via/keymap.c @@ -25,7 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE, + BASE = SAFE_RANGE, LOWER, RAISE, }; @@ -48,32 +48,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_BASE] = LAYOUT( - KC_GRV, KC_1 , KC_2 , KC_3 , KC_4 , KC_5, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC, - KC_TAB, KC_Q , KC_W , KC_E , KC_R , KC_T, KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS, - KC_ESC, KC_A , KC_S , KC_D , KC_F , KC_G, KC_BSPC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_ENT , - KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B, KC_DEL , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, RSFT_T(KC_QUOT), - KC_LCTL, KC_LALT, KC_LGUI, LOWER , KC_SPC, KC_SPC , RAISE , KC_RALT, KC_DOWN, KC_UP + KC_GRV, KC_1 , KC_2 , KC_3 , KC_4 , KC_5, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC, + KC_TAB, KC_Q , KC_W , KC_E , KC_R , KC_T, KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS, + KC_ESC, KC_A , KC_S , KC_D , KC_F , KC_G, KC_BSPC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_ENT , + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B, KC_DEL , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, RSFT_T(KC_QUOT), + KC_LCTL, KC_LALT, KC_LGUI, LOWER , KC_SPC, KC_SPC , RAISE , KC_RALT, KC_DOWN, KC_UP ), + [_LOWER] = LAYOUT( - 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_BSPC, KC_EQL , KC_7 , KC_8 , KC_9 , KC_SLSH, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, - KC_ENT , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_LEFT, KC_UNDS, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, - KC_DLR , KC_PAST, KC_1 , KC_2 , KC_3 , KC_PPLS, KC_RGHT, KC_PIPE, KC_LCBR, KC_RCBR, KC_PERC, KC_AMPR, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + 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_BSPC, KC_SLSH, KC_7 , KC_8 , KC_9 , KC_PPLS, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, _______, + KC_EQL , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_LEFT, KC_PIPE, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, + KC_ENT , KC_PAST, KC_1 , KC_2 , KC_3 , KC_UNDS, KC_RGHT, KC_DLR , KC_LCBR, KC_RCBR, KC_AMPR, KC_PERC, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_RAISE] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_BSPC, KC_DEL , KC_END , _______, - _______, _______, _______, _______, _______, _______, KC_UP , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_QUOT, _______, - _______, _______, _______, _______, _______, _______, KC_DOWN, _______, KC_PGUP, _______, KC_PGDN, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_BSPC, KC_DEL , KC_END , _______, + _______, _______, _______, _______, _______, _______, KC_UP , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_QUOT, _______, + _______, _______, _______, _______, _______, _______, KC_DOWN, _______, KC_PGUP, _______, KC_PGDN, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [_ADJUST] = LAYOUT( - RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG , - _______, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, - KC_CAPS, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_VOLU, _______, _______, _______, _______, _______, _______, - _______, AU_ON , AU_OFF , _______, _______, _______, KC_VOLD, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG , + _______, RGB_TOG, RGB_RMOD, RGB_MOD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, + KC_CAPS, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_VOLU, _______, _______, _______, _______, _______, _______, + _______, AU_ON , AU_OFF , _______, _______, _______, KC_VOLD, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/nckiibs/vanana/keymaps/via/rules.mk b/keyboards/delikeeb/vanana/keymaps/via/rules.mk index 9b19aff091..9b19aff091 100644 --- a/keyboards/nckiibs/vanana/keymaps/via/rules.mk +++ b/keyboards/delikeeb/vanana/keymaps/via/rules.mk diff --git a/keyboards/nckiibs/vanana/readme.md b/keyboards/delikeeb/vanana/readme.md index 49b40f815d..9872b6ed12 100644 --- a/keyboards/nckiibs/vanana/readme.md +++ b/keyboards/delikeeb/vanana/readme.md @@ -10,10 +10,10 @@ Vanana is a non-split ergonomic keyboard with RGB underglow and on-board pinouts Make example for this keyboard (after setting up your build environment): - make nckiibs/vanana/rev2:default + make delikeeb/vanana/rev2:default Flashing example for this keyboard: - make nckiibs/vanana/rev2:default:flash + make delikeeb/vanana/rev2:default:flash 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). diff --git a/keyboards/nckiibs/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h index d584e32a39..d584e32a39 100644 --- a/keyboards/nckiibs/vanana/rev1/config.h +++ b/keyboards/delikeeb/vanana/rev1/config.h diff --git a/keyboards/nckiibs/vanana/rev1/rev1.c b/keyboards/delikeeb/vanana/rev1/rev1.c index 73b5039eb8..73b5039eb8 100644 --- a/keyboards/nckiibs/vanana/rev1/rev1.c +++ b/keyboards/delikeeb/vanana/rev1/rev1.c diff --git a/keyboards/nckiibs/vanana/rev1/rev1.h b/keyboards/delikeeb/vanana/rev1/rev1.h index 3b125b3ca8..3b125b3ca8 100644 --- a/keyboards/nckiibs/vanana/rev1/rev1.h +++ b/keyboards/delikeeb/vanana/rev1/rev1.h diff --git a/keyboards/nckiibs/vanana/rev1/rules.mk b/keyboards/delikeeb/vanana/rev1/rules.mk index eee766eca6..eee766eca6 100644 --- a/keyboards/nckiibs/vanana/rev1/rules.mk +++ b/keyboards/delikeeb/vanana/rev1/rules.mk diff --git a/keyboards/nckiibs/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h index 8893bb09f5..8893bb09f5 100644 --- a/keyboards/nckiibs/vanana/rev2/config.h +++ b/keyboards/delikeeb/vanana/rev2/config.h diff --git a/keyboards/nckiibs/vanana/rev2/rev2.c b/keyboards/delikeeb/vanana/rev2/rev2.c index 8f2a259921..8f2a259921 100644 --- a/keyboards/nckiibs/vanana/rev2/rev2.c +++ b/keyboards/delikeeb/vanana/rev2/rev2.c diff --git a/keyboards/nckiibs/vanana/rev2/rev2.h b/keyboards/delikeeb/vanana/rev2/rev2.h index 7f8d16b57f..7f8d16b57f 100644 --- a/keyboards/nckiibs/vanana/rev2/rev2.h +++ b/keyboards/delikeeb/vanana/rev2/rev2.h diff --git a/keyboards/nckiibs/vanana/rev2/rules.mk b/keyboards/delikeeb/vanana/rev2/rules.mk index 8bb6ab5d91..8bb6ab5d91 100644 --- a/keyboards/nckiibs/vanana/rev2/rules.mk +++ b/keyboards/delikeeb/vanana/rev2/rules.mk diff --git a/keyboards/nckiibs/vanana/rules.mk b/keyboards/delikeeb/vanana/rules.mk index 71f046a11f..f4aa799093 100644 --- a/keyboards/nckiibs/vanana/rules.mk +++ b/keyboards/delikeeb/vanana/rules.mk @@ -22,4 +22,4 @@ ENCODER_ENABLE = yes # Enable Rotary Encoder RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -DEFAULT_FOLDER = nckiibs/vanana/rev2 +DEFAULT_FOLDER = delikeeb/vanana/rev2 diff --git a/keyboards/nckiibs/vaneela/config.h b/keyboards/delikeeb/vaneela/config.h index b8f031d7c8..b8f031d7c8 100644 --- a/keyboards/nckiibs/vaneela/config.h +++ b/keyboards/delikeeb/vaneela/config.h diff --git a/keyboards/nckiibs/vaneela/info.json b/keyboards/delikeeb/vaneela/info.json index 9faf7ceffb..9faf7ceffb 100644 --- a/keyboards/nckiibs/vaneela/info.json +++ b/keyboards/delikeeb/vaneela/info.json diff --git a/keyboards/nckiibs/vaneela/keymaps/default/keymap.c b/keyboards/delikeeb/vaneela/keymaps/default/keymap.c index ce0cd88e7e..ce0cd88e7e 100644 --- a/keyboards/nckiibs/vaneela/keymaps/default/keymap.c +++ b/keyboards/delikeeb/vaneela/keymaps/default/keymap.c diff --git a/keyboards/nckiibs/vaneela/keymaps/default/readme.md b/keyboards/delikeeb/vaneela/keymaps/default/readme.md index 597cee4faf..597cee4faf 100644 --- a/keyboards/nckiibs/vaneela/keymaps/default/readme.md +++ b/keyboards/delikeeb/vaneela/keymaps/default/readme.md diff --git a/keyboards/nckiibs/vaneela/keymaps/via/keymap.c b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c index 1dfad3f8eb..1dfad3f8eb 100644 --- a/keyboards/nckiibs/vaneela/keymaps/via/keymap.c +++ b/keyboards/delikeeb/vaneela/keymaps/via/keymap.c diff --git a/keyboards/nckiibs/vaneela/keymaps/via/rules.mk b/keyboards/delikeeb/vaneela/keymaps/via/rules.mk index 1e5b99807c..1e5b99807c 100644 --- a/keyboards/nckiibs/vaneela/keymaps/via/rules.mk +++ b/keyboards/delikeeb/vaneela/keymaps/via/rules.mk diff --git a/keyboards/nckiibs/vaneela/readme.md b/keyboards/delikeeb/vaneela/readme.md index 65a7d1772b..0e8f894690 100644 --- a/keyboards/nckiibs/vaneela/readme.md +++ b/keyboards/delikeeb/vaneela/readme.md @@ -10,10 +10,10 @@ This is a semi-staggered 5x12 keyboard made by a hobbist. Vaneela runs on Pro Mi Make example for this keyboard (after setting up your build environment): - make nckiibs/vaneela:default + make delikeeb/vaneela:default Flashing example for this keyboard: - make nckiibs/vaneela:default:flash + make delikeeb/vaneela:default:flash 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). diff --git a/keyboards/nckiibs/vaneela/rules.mk b/keyboards/delikeeb/vaneela/rules.mk index fd76a52478..fd76a52478 100644 --- a/keyboards/nckiibs/vaneela/rules.mk +++ b/keyboards/delikeeb/vaneela/rules.mk diff --git a/keyboards/nckiibs/vaneela/vaneela.c b/keyboards/delikeeb/vaneela/vaneela.c index ca5d513a00..ca5d513a00 100644 --- a/keyboards/nckiibs/vaneela/vaneela.c +++ b/keyboards/delikeeb/vaneela/vaneela.c diff --git a/keyboards/nckiibs/vaneela/vaneela.h b/keyboards/delikeeb/vaneela/vaneela.h index 3fb8d7a6f1..3fb8d7a6f1 100644 --- a/keyboards/nckiibs/vaneela/vaneela.h +++ b/keyboards/delikeeb/vaneela/vaneela.h diff --git a/keyboards/nckiibs/vaneelaex/config.h b/keyboards/delikeeb/vaneelaex/config.h index 46ced5bfbf..0b96918cbf 100644 --- a/keyboards/nckiibs/vaneelaex/config.h +++ b/keyboards/delikeeb/vaneelaex/config.h @@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define VENDOR_ID 0x9906 #define PRODUCT_ID 0x0002 #define DEVICE_VER 0x0001 -#define MANUFACTURER nckiibs +#define MANUFACTURER delikeeb #define PRODUCT VaneelaEx /* key matrix size */ diff --git a/keyboards/nckiibs/vaneelaex/info.json b/keyboards/delikeeb/vaneelaex/info.json index aa5b81f4d6..aa5b81f4d6 100644 --- a/keyboards/nckiibs/vaneelaex/info.json +++ b/keyboards/delikeeb/vaneelaex/info.json diff --git a/keyboards/nckiibs/vaneelaex/keymaps/default/keymap.c b/keyboards/delikeeb/vaneelaex/keymaps/default/keymap.c index 6e98c9b8ac..6e98c9b8ac 100644 --- a/keyboards/nckiibs/vaneelaex/keymaps/default/keymap.c +++ b/keyboards/delikeeb/vaneelaex/keymaps/default/keymap.c diff --git a/keyboards/nckiibs/vaneelaex/keymaps/default/readme.md b/keyboards/delikeeb/vaneelaex/keymaps/default/readme.md index 89c3c8c2ae..89c3c8c2ae 100644 --- a/keyboards/nckiibs/vaneelaex/keymaps/default/readme.md +++ b/keyboards/delikeeb/vaneelaex/keymaps/default/readme.md diff --git a/keyboards/nckiibs/vaneelaex/keymaps/via/keymap.c b/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c index e23cf96a27..e23cf96a27 100644 --- a/keyboards/nckiibs/vaneelaex/keymaps/via/keymap.c +++ b/keyboards/delikeeb/vaneelaex/keymaps/via/keymap.c diff --git a/keyboards/nckiibs/vaneelaex/keymaps/via/rules.mk b/keyboards/delikeeb/vaneelaex/keymaps/via/rules.mk index 1e5b99807c..1e5b99807c 100644 --- a/keyboards/nckiibs/vaneelaex/keymaps/via/rules.mk +++ b/keyboards/delikeeb/vaneelaex/keymaps/via/rules.mk diff --git a/keyboards/nckiibs/vaneelaex/readme.md b/keyboards/delikeeb/vaneelaex/readme.md index 9417ae812d..9bd39b5109 100644 --- a/keyboards/nckiibs/vaneelaex/readme.md +++ b/keyboards/delikeeb/vaneelaex/readme.md @@ -11,10 +11,10 @@ Vaneela Ex supports Pro Micro and its compatible variants, such as elite-C. Make example for this keyboard (after setting up your build environment): - make nckiibs/vaneelaex:default + make delikeeb/vaneelaex:default Flashing example for this keyboard: - make nckiibs/vaneelaex:default:flash + make delikeeb/vaneelaex:default:flash 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). diff --git a/keyboards/nckiibs/vaneelaex/rules.mk b/keyboards/delikeeb/vaneelaex/rules.mk index fd76a52478..fd76a52478 100644 --- a/keyboards/nckiibs/vaneelaex/rules.mk +++ b/keyboards/delikeeb/vaneelaex/rules.mk diff --git a/keyboards/nckiibs/vaneelaex/vaneelaex.c b/keyboards/delikeeb/vaneelaex/vaneelaex.c index e82cd5487b..e82cd5487b 100644 --- a/keyboards/nckiibs/vaneelaex/vaneelaex.c +++ b/keyboards/delikeeb/vaneelaex/vaneelaex.c diff --git a/keyboards/nckiibs/vaneelaex/vaneelaex.h b/keyboards/delikeeb/vaneelaex/vaneelaex.h index 9b2d74ecef..9b2d74ecef 100644 --- a/keyboards/nckiibs/vaneelaex/vaneelaex.h +++ b/keyboards/delikeeb/vaneelaex/vaneelaex.h diff --git a/keyboards/nckiibs/waaffle/config.h b/keyboards/delikeeb/waaffle/config.h index 1b02e32c6d..1b02e32c6d 100644 --- a/keyboards/nckiibs/waaffle/config.h +++ b/keyboards/delikeeb/waaffle/config.h diff --git a/keyboards/nckiibs/waaffle/keymaps/default/keymap.c b/keyboards/delikeeb/waaffle/keymaps/default/keymap.c index cffcd026d1..5d572ec892 100644 --- a/keyboards/nckiibs/waaffle/keymaps/default/keymap.c +++ b/keyboards/delikeeb/waaffle/keymaps/default/keymap.c @@ -25,7 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE, + BASE = SAFE_RANGE, LOWER, RAISE, }; @@ -54,9 +54,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT_ortho_5x16( _______, _______, _______, _______, 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_BSPC, KC_EQL , KC_7 , KC_8 , KC_9 , KC_SLSH, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, - _______, _______, _______, _______, KC_ENT , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_UNDS, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, - _______, _______, _______, _______, KC_DLR , KC_PAST, KC_1 , KC_2 , KC_3 , KC_PPLS, KC_PIPE, KC_LCBR, KC_RCBR, KC_PERC, KC_AMPR, _______, + _______, _______, _______, _______, KC_BSPC, KC_SLSH, KC_7 , KC_8 , KC_9 , KC_PPLS, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, + _______, _______, _______, _______, KC_EQL , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_PIPE, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, + _______, _______, _______, _______, KC_ENT , KC_PAST, KC_1 , KC_2 , KC_3 , KC_UNDS, KC_DLR , KC_LCBR, KC_RCBR, KC_AMPR, KC_PERC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), @@ -111,12 +111,16 @@ void encoder_update_user(uint8_t index, bool clockwise) { if (clockwise) { if (IS_LAYER_ON(_LOWER)){ tap_code(KC_RIGHT); + } else if (IS_LAYER_ON(_RAISE)){ + tap_code(KC_DOWN); } else { tap_code(KC_VOLU); } } else { if (IS_LAYER_ON(_LOWER)){ tap_code(KC_LEFT); + } else if (IS_LAYER_ON(_RAISE)){ + tap_code(KC_UP); } else { tap_code(KC_VOLD); } @@ -124,9 +128,21 @@ void encoder_update_user(uint8_t index, bool clockwise) { } else if (index == 1) { /* Second encoder. Only supported by Elite-C */ if (clockwise) { - tap_code(KC_RIGHT); + if (IS_LAYER_ON(_LOWER)){ + tap_code(KC_RIGHT); + } else if (IS_LAYER_ON(_RAISE)){ + tap_code(KC_DOWN); + } else { + tap_code(KC_VOLU); + } } else { - tap_code(KC_LEFT); + if (IS_LAYER_ON(_LOWER)){ + tap_code(KC_LEFT); + } else if (IS_LAYER_ON(_RAISE)){ + tap_code(KC_UP); + } else { + tap_code(KC_VOLD); + } } } } diff --git a/keyboards/nckiibs/waaffle/keymaps/default/readme.md b/keyboards/delikeeb/waaffle/keymaps/default/readme.md index 4cf5c435bd..4cf5c435bd 100644 --- a/keyboards/nckiibs/waaffle/keymaps/default/readme.md +++ b/keyboards/delikeeb/waaffle/keymaps/default/readme.md diff --git a/keyboards/nckiibs/waaffle/keymaps/via/keymap.c b/keyboards/delikeeb/waaffle/keymaps/via/keymap.c index 880de11e80..73d29ec14f 100644 --- a/keyboards/nckiibs/waaffle/keymaps/via/keymap.c +++ b/keyboards/delikeeb/waaffle/keymaps/via/keymap.c @@ -25,7 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - BASE, + BASE = SAFE_RANGE, LOWER, RAISE, }; @@ -54,9 +54,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT_ortho_5x16( _______, _______, _______, _______, 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_BSPC, KC_EQL , KC_7 , KC_8 , KC_9 , KC_SLSH, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, - _______, _______, _______, _______, KC_ENT , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_UNDS, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, - _______, _______, _______, _______, KC_DLR , KC_PAST, KC_1 , KC_2 , KC_3 , KC_PPLS, KC_PIPE, KC_LCBR, KC_RCBR, KC_PERC, KC_AMPR, _______, + _______, _______, _______, _______, KC_BSPC, KC_SLSH, KC_7 , KC_8 , KC_9 , KC_PPLS, KC_CIRC, KC_LBRC, KC_RBRC, KC_AT , KC_EXLM, KC_BSLS, + _______, _______, _______, _______, KC_EQL , KC_0 , KC_4 , KC_5 , KC_6 , KC_MINS, KC_PIPE, KC_LPRN, KC_RPRN, KC_HASH, KC_DQUO, _______, + _______, _______, _______, _______, KC_ENT , KC_PAST, KC_1 , KC_2 , KC_3 , KC_UNDS, KC_DLR , KC_LCBR, KC_RCBR, KC_AMPR, KC_PERC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/nckiibs/waaffle/keymaps/via/rules.mk b/keyboards/delikeeb/waaffle/keymaps/via/rules.mk index 1e5b99807c..1e5b99807c 100644 --- a/keyboards/nckiibs/waaffle/keymaps/via/rules.mk +++ b/keyboards/delikeeb/waaffle/keymaps/via/rules.mk diff --git a/keyboards/nckiibs/waaffle/readme.md b/keyboards/delikeeb/waaffle/readme.md index 43d920c027..0e8d9c4379 100644 --- a/keyboards/nckiibs/waaffle/readme.md +++ b/keyboards/delikeeb/waaffle/readme.md @@ -11,12 +11,12 @@ Waaffle is an ortholinear keyboard that supports 60 key and 80 key layouts. The Make example for this keyboard (after setting up your build environment): - make nckiibs/waaffle/rev3/pro_micro:default # for Pro Micro builds - make nckiibs/waaffle/rev3/elite_c:default # for Elite-C builds + make delikeeb/waaffle/rev3/pro_micro:default # for Pro Micro builds + make delikeeb/waaffle/rev3/elite_c:default # for Elite-C builds Flashing example for this keyboard: - make nckiibs/waaffle/rev3/pro_micro:default:flash # for Pro Micro builds - make nckiibs/waaffle/rev3/elite_c:default:flash # for Elite-C builds + make delikeeb/waaffle/rev3/pro_micro:default:flash # for Pro Micro builds + make delikeeb/waaffle/rev3/elite_c:default:flash # for Elite-C builds 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). diff --git a/keyboards/nckiibs/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h index 0c4327623d..0c4327623d 100644 --- a/keyboards/nckiibs/waaffle/rev3/config.h +++ b/keyboards/delikeeb/waaffle/rev3/config.h diff --git a/keyboards/nckiibs/waaffle/rev3/elite_c/rules.mk b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk index 8b5026cb03..8b5026cb03 100644 --- a/keyboards/nckiibs/waaffle/rev3/elite_c/rules.mk +++ b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk diff --git a/keyboards/nckiibs/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json index 200dce5a2a..200dce5a2a 100644 --- a/keyboards/nckiibs/waaffle/rev3/info.json +++ b/keyboards/delikeeb/waaffle/rev3/info.json diff --git a/keyboards/nckiibs/waaffle/rev3/pro_micro/rules.mk b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk index bdc4842c57..bdc4842c57 100644 --- a/keyboards/nckiibs/waaffle/rev3/pro_micro/rules.mk +++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk diff --git a/keyboards/nckiibs/waaffle/rev3/rev3.c b/keyboards/delikeeb/waaffle/rev3/rev3.c index bf7f5a1099..bf7f5a1099 100644 --- a/keyboards/nckiibs/waaffle/rev3/rev3.c +++ b/keyboards/delikeeb/waaffle/rev3/rev3.c diff --git a/keyboards/nckiibs/waaffle/rev3/rev3.h b/keyboards/delikeeb/waaffle/rev3/rev3.h index 8ca245d845..8ca245d845 100644 --- a/keyboards/nckiibs/waaffle/rev3/rev3.h +++ b/keyboards/delikeeb/waaffle/rev3/rev3.h diff --git a/keyboards/nckiibs/waaffle/rev3/rules.mk b/keyboards/delikeeb/waaffle/rev3/rules.mk index 9911721b28..775a281931 100644 --- a/keyboards/nckiibs/waaffle/rev3/rules.mk +++ b/keyboards/delikeeb/waaffle/rev3/rules.mk @@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -DEFAULT_FOLDER = nckiibs/waaffle/rev3/pro_micro +DEFAULT_FOLDER = delikeeb/waaffle/rev3/pro_micro |