From 0ab88f534227f908ed7ab6f4e20f83a8a19b2423 Mon Sep 17 00:00:00 2001 From: noclew Date: Fri, 19 Mar 2021 20:12:38 -0400 Subject: [Keyboard] Vanana, Vaguette Lite, and Waaffle (#11441) * added Vanana / Vaguette Lite / Waaffle * changed extra GPIO allocations of Waaffle and Vanana * Apply suggestions from code review changed layout name of vaguette Lite / requested by drashna * Apply suggestions from code review Requested keymap changes have been made. * all changes requested by collaborators are made * RGB config updated / keymap updated * fixed vaguette lite info.json * fixed vaguette lite info.json * fixed vaguette lite info.json * Apply suggestions from code review request changes are made * pre rename h * vaguettelite reanmed to lowercases * fixed vanana keymap * Apply suggestions from code review * changed Bootmagic key of VaguetteLite as suggested * Updated via keymap of Vaguette Lite as suggested * add vaguette lite 6.25 layout * added vaguette lite noclew keymap * updated vaguette lite 6.25u keymap description * updated vanana default keymap * updated keymap spacing * reabased from the official repo * Update keymap.c fixed vaguette lite keymap * Apply suggestions from code review All the requested changes by a collaborator were made. * updated info.json of Vanana and readme files of Vanana and waffle * rename LAYOUT_waaffle to LAYOUT_ortho_5x16 Also adjusts the info.json data to put a visual gap between the extension and main PCBs. * make rules.mk and info.json specific to rev3 Removes nckiibs/waaffle as a build target, as it redirects to the only extant revision in the repository. * add controller board build targets Adds build targets for Pro Micro and Elite-C builds, with appropriate defaults for each. Running `make nckiibs/waaffle/rev3` defaults to a Pro Micro-based build. --- keyboards/nckiibs/vanana/keymaps/default/keymap.c | 144 +++++++++++++++++++++ keyboards/nckiibs/vanana/keymaps/default/readme.md | 1 + keyboards/nckiibs/vanana/keymaps/via/keymap.c | 79 +++++++++++ keyboards/nckiibs/vanana/keymaps/via/rules.mk | 2 + 4 files changed, 226 insertions(+) create mode 100644 keyboards/nckiibs/vanana/keymaps/default/keymap.c create mode 100644 keyboards/nckiibs/vanana/keymaps/default/readme.md create mode 100644 keyboards/nckiibs/vanana/keymaps/via/keymap.c create mode 100644 keyboards/nckiibs/vanana/keymaps/via/rules.mk (limited to 'keyboards/nckiibs/vanana/keymaps') diff --git a/keyboards/nckiibs/vanana/keymaps/default/keymap.c b/keyboards/nckiibs/vanana/keymaps/default/keymap.c new file mode 100644 index 0000000000..bd797c563c --- /dev/null +++ b/keyboards/nckiibs/vanana/keymaps/default/keymap.c @@ -0,0 +1,144 @@ +/* Copyright 2020 noclew + * + * 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 . + */ +#include QMK_KEYBOARD_H + +#ifdef AUDIO_ENABLE + float song_coin[][2] = SONG(COIN_SOUND); +#endif + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _LOWER, + _RAISE, + _ADJUST +}; + +// Defines the keycodes used by our macros in process_record_user +enum custom_keycodes { + BASE, + LOWER, + RAISE, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* BASE + * ------------------------------------------- ------------------------------------------- + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | + * ------------------------------------------- ------------------------------------------- + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | + * ------------------------------------------- --------- -------------------------------------------- + * | Esc | A | S | D | F | G | | Bksp | | H | J | K | L | ; |Enter | + * ------------------------------------------- --------- ------------------------------------------- + * | Shift| Z | X | C | V | B | | Del | | N | M | , | . | / | " | + * ------------------------------------------- --------- ------------------------------------------- + * | GUI | Alt | Ctrl |Lower |Space | |Space |Raise |Alt | Left | Right| + * ------------------------------------ ------------------------------------ + */ + + [_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_LGUI, KC_LALT, KC_LCTL, LOWER , KC_SPC, KC_SPC , RAISE , KC_RALT, KC_LEFT, KC_RGHT + ), + + [_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, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_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, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [_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, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + + case RESET: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + stop_all_notes(); + PLAY_SONG(song_coin); + #endif + } + return false; + } + return true; +} + +void encoder_update_user(uint8_t index, bool clockwise) { + /* With an if statement we can check which encoder was turned. */ + if (index == 0) { /* First encoder */ + /* 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(_LOWER)){ + tap_code(KC_VOLD); + } else { + tap_code(KC_LEFT); + } + } + + } else if (index == 1) { /* Second encoder. Only supported by Elite-C */ + if (clockwise) { + tap_code(KC_RIGHT); + } else { + tap_code(KC_LEFT); + } + } +} diff --git a/keyboards/nckiibs/vanana/keymaps/default/readme.md b/keyboards/nckiibs/vanana/keymaps/default/readme.md new file mode 100644 index 0000000000..4fb4d2183a --- /dev/null +++ b/keyboards/nckiibs/vanana/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for vanana diff --git a/keyboards/nckiibs/vanana/keymaps/via/keymap.c b/keyboards/nckiibs/vanana/keymaps/via/keymap.c new file mode 100644 index 0000000000..1715ae5bd2 --- /dev/null +++ b/keyboards/nckiibs/vanana/keymaps/via/keymap.c @@ -0,0 +1,79 @@ +/* Copyright 2020 noclew + * + * 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 . + */ +#include QMK_KEYBOARD_H + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _LOWER, + _RAISE, + _ADJUST +}; + +// Defines the keycodes used by our macros in process_record_user +enum custom_keycodes { + BASE, + LOWER, + RAISE, +}; + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* BASE + * ------------------------------------------- ------------------------------------------- + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | + * ------------------------------------------- ------------------------------------------- + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | + * ------------------------------------------- --------- -------------------------------------------- + * | Esc | A | S | D | F | G | | Bksp | | H | J | K | L | ; |Enter | + * ------------------------------------------- --------- ------------------------------------------- + * | Shift| Z | X | C | V | B | | Del | | N | M | , | . | / | " | + * ------------------------------------------- --------- ------------------------------------------- + * | Ctrl | GUI | Alt |Lower |Space | |Space |Raise |Alt | DOWN | UP | + * ------------------------------------ ------------------------------------ + */ + + [_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 + ), + [_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, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [_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, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [_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, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/nckiibs/vanana/keymaps/via/rules.mk b/keyboards/nckiibs/vanana/keymaps/via/rules.mk new file mode 100644 index 0000000000..9b19aff091 --- /dev/null +++ b/keyboards/nckiibs/vanana/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +AUDIO_ENABLE = no # Audio output -- cgit v1.2.3