Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated a vendor name / fixed minor keymap issues #12881

Merged
merged 1 commit into from
May 13, 2021
Merged

updated a vendor name / fixed minor keymap issues #12881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/nckiibs/flatbread60/config.h → keyboards/delikeeb/flatbread60/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
0 keyboards/nckiibs/flatbread60/flatbread60.c → keyboards/delikeeb/flatbread60/flatbread60.c
View file
Open in desktop
File renamed without changes.
0 keyboards/nckiibs/flatbread60/flatbread60.h → keyboards/delikeeb/flatbread60/flatbread60.h
View file
Open in desktop
File renamed without changes.
0 keyboards/nckiibs/flatbread60/info.json → keyboards/delikeeb/flatbread60/info.json
View file
Open in desktop
File renamed without changes.
0 ...iibs/flatbread60/keymaps/default/keymap.c → ...keeb/flatbread60/keymaps/default/keymap.c
View file
Open in desktop
File renamed without changes.
0 ...ibs/flatbread60/keymaps/default/readme.md → ...eeb/flatbread60/keymaps/default/readme.md
View file
Open in desktop
File renamed without changes.
0 .../nckiibs/flatbread60/keymaps/via/keymap.c → ...delikeeb/flatbread60/keymaps/via/keymap.c
View file
Open in desktop
File renamed without changes.
0 .../nckiibs/flatbread60/keymaps/via/rules.mk → ...delikeeb/flatbread60/keymaps/via/rules.mk
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions keyboards/nckiibs/flatbread60/readme.md → keyboards/delikeeb/flatbread60/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
0 keyboards/nckiibs/flatbread60/rules.mk → keyboards/delikeeb/flatbread60/rules.mk
View file
Open in desktop
File renamed without changes.
0 keyboards/nckiibs/vaguettelite/config.h → keyboards/delikeeb/vaguettelite/config.h
View file
Open in desktop
File renamed without changes.
0 keyboards/nckiibs/vaguettelite/info.json → keyboards/delikeeb/vaguettelite/info.json
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...ibs/vaguettelite/keymaps/default/keymap.c → ...eeb/vaguettelite/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand All @@ -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 |
*----------------------------------------------------------------------------------------------------------
Expand All @@ -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, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

Expand Down
0 ...bs/vaguettelite/keymaps/default/readme.md → ...eb/vaguettelite/keymaps/default/readme.md
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...e/keymaps/default_625u_universal/keymap.c → ...e/keymaps/default_625u_universal/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand All @@ -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 | \ | [ | ] |
*----------------------------------------------------------------------------------------------------------
Expand Down
0 .../keymaps/default_625u_universal/readme.md → .../keymaps/default_625u_universal/readme.md
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...iibs/vaguettelite/keymaps/noclew/keymap.c → ...keeb/vaguettelite/keymaps/noclew/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

Expand Down
0 ...ibs/vaguettelite/keymaps/noclew/readme.md → ...eeb/vaguettelite/keymaps/noclew/readme.md
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions ...nckiibs/vaguettelite/keymaps/via/keymap.c → ...elikeeb/vaguettelite/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand All @@ -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, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

Expand Down
0 ...nckiibs/vaguettelite/keymaps/via/rules.mk → ...elikeeb/vaguettelite/keymaps/via/rules.mk
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions keyboards/nckiibs/vaguettelite/readme.md → keyboards/delikeeb/vaguettelite/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
0 keyboards/nckiibs/vaguettelite/rules.mk → keyboards/delikeeb/vaguettelite/rules.mk
View file
Open in desktop
File renamed without changes.
0 ...oards/nckiibs/vaguettelite/vaguettelite.c → ...ards/delikeeb/vaguettelite/vaguettelite.c
View file
Open in desktop
File renamed without changes.
0 ...oards/nckiibs/vaguettelite/vaguettelite.h → ...ards/delikeeb/vaguettelite/vaguettelite.h
View file
Open in desktop
File renamed without changes.
0 keyboards/nckiibs/vanana/config.h → keyboards/delikeeb/vanana/config.h
View file
Open in desktop
File renamed without changes.
0 keyboards/nckiibs/vanana/info.json → keyboards/delikeeb/vanana/info.json
View file
Open in desktop
File renamed without changes.
39 changes: 28 additions & 11 deletions ...s/nckiibs/vanana/keymaps/default/keymap.c → .../delikeeb/vanana/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand All @@ -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|
* ------------------------------------ ------------------------------------
Expand All @@ -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, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

Expand All @@ -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, _______, _______, _______, _______, _______, _______,
Expand Down Expand Up @@ -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);
}
}
}
}
0 .../nckiibs/vanana/keymaps/default/readme.md → ...delikeeb/vanana/keymaps/default/readme.md
View file
Open in desktop
File renamed without changes.
Loading