[Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
This commit is contained in:
noclew authored and GitHub committed
1 parent
49bc835aa9
commit
d200e3de8e
73 files changed
+115
-80
No files matched your search
@@ -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 */
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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).
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
+5
-5
@@ -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, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
File renamed without changes.
+2
-2
@@ -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 | \ | [ | ] |
|
||||
*----------------------------------------------------------------------------------------------------------
|
||||
File renamed without changes.
+5
-5
@@ -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, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
File renamed without changes.
+8
-8
@@ -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, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
File renamed without changes.
+2
-2
@@ -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).
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+28
-11
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
File renamed without changes.
+23
-21
@@ -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, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
)
|
||||
};
|
||||
File renamed without changes.
@@ -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).
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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).
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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 */
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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).
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+22
-6
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
File renamed without changes.
+4
-4
@@ -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, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
File renamed without changes.
@@ -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).
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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
|
||||
Reference in new issue
Block a user