diff options
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/keymap_generated.c | 78 | ||||
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/keymap_jack.c | 69 | ||||
| -rw-r--r-- | keyboard/planck/Makefile | 4 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/keymap_eric.c | 42 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/keymap_lock.c | 10 | ||||
| -rw-r--r-- | keyboard/planck/planck.c | 29 | ||||
| -rw-r--r-- | keyboard/planck/planck.h | 5 |
7 files changed, 161 insertions, 76 deletions
diff --git a/keyboard/ergodox_ez/keymaps/keymap_generated.c b/keyboard/ergodox_ez/keymaps/keymap_generated.c new file mode 100644 index 000000000..54fd3059f --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/keymap_generated.c | |||
| @@ -0,0 +1,78 @@ | |||
| 1 | #include "ergodox_ez.h" | ||
| 2 | #include "debug.h" | ||
| 3 | #include "action_layer.h" | ||
| 4 | |||
| 5 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 6 | |||
| 7 | // If it accepts an argument (i.e, is a function), it doesn't need KC_. | ||
| 8 | // Otherwise, it needs KC_* | ||
| 9 | |||
| 10 | #define SYMB 0 | ||
| 11 | |||
| 12 | [0] = KEYMAP( \ | ||
| 13 | \ | ||
| 14 | KC_KP_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_DELETE, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), KC_BSPACE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TAB, KC_LEFT, KC_RIGHT, KC_TRANSPARENT, KC_LGUI, KC_HOME, KC_SPACE, KC_BSPACE, KC_END, KC_RIGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_TRANSPARENT, KC_N, KC_M, KC_COMMA, KC_DOT, KC_LCTRL, KC_LSHIFT, KC_UP, KC_DOWN, KC_LBRACKET, KC_RBRACKET, KC_TRANSPARENT, KC_LALT, KC_ESCAPE, KC_PGUP, KC_PGDOWN, KC_TAB, KC_ENTER \ | ||
| 15 | \ | ||
| 16 | ), | ||
| 17 | |||
| 18 | [1] = KEYMAP( \ | ||
| 19 | \ | ||
| 20 | KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRANSPARENT, KC_UP, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_ASTERISK, KC_F12, KC_DOWN, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, KC_TRANSPARENT, KC_TRANSPARENT, , KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_SLASH, KC_TRANSPARENT, KC_TRANSPARENT, KC_KP_DOT, KC_KP_0, KC_KP_EQUAL, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT \ | ||
| 21 | \ | ||
| 22 | ), | ||
| 23 | |||
| 24 | [2] = KEYMAP( \ | ||
| 25 | \ | ||
| 26 | KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_UP, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_BTN3, KC_MS_BTN2, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MEDIA_PLAY_PAUSE, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_TRANSPARENT, KC_TRANSPARENT, KC_AUDIO_VOL_UP, KC_AUDIO_VOL_DOWN, KC_AUDIO_MUTE, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT \ | ||
| 27 | \ | ||
| 28 | ), | ||
| 29 | |||
| 30 | }; | ||
| 31 | |||
| 32 | const uint16_t PROGMEM fn_actions[] = { | ||
| 33 | [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) | ||
| 34 | }; | ||
| 35 | |||
| 36 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | ||
| 37 | { | ||
| 38 | // MACRODOWN only works in this function | ||
| 39 | switch(id) { | ||
| 40 | case 0: | ||
| 41 | if (record->event.pressed) { | ||
| 42 | register_code(KC_RSFT); | ||
| 43 | } else { | ||
| 44 | unregister_code(KC_RSFT); | ||
| 45 | } | ||
| 46 | break; | ||
| 47 | } | ||
| 48 | return MACRO_NONE; | ||
| 49 | }; | ||
| 50 | |||
| 51 | // Runs just one time when the keyboard initializes. | ||
| 52 | void * matrix_init_user(void) { | ||
| 53 | |||
| 54 | }; | ||
| 55 | |||
| 56 | // Runs constantly in the background, in a loop. | ||
| 57 | void * matrix_scan_user(void) { | ||
| 58 | |||
| 59 | uint8_t layer = biton32(layer_state); | ||
| 60 | |||
| 61 | ergodox_board_led_off(); | ||
| 62 | ergodox_right_led_1_off(); | ||
| 63 | ergodox_right_led_2_off(); | ||
| 64 | ergodox_right_led_3_off(); | ||
| 65 | switch (layer) { | ||
| 66 | // TODO: Make this relevant to the ErgoDox EZ. | ||
| 67 | case 1: | ||
| 68 | ergodox_right_led_1_on(); | ||
| 69 | break; | ||
| 70 | case 2: | ||
| 71 | ergodox_right_led_2_on(); | ||
| 72 | break; | ||
| 73 | default: | ||
| 74 | // none | ||
| 75 | break; | ||
| 76 | } | ||
| 77 | |||
| 78 | }; | ||
diff --git a/keyboard/ergodox_ez/keymaps/keymap_jack.c b/keyboard/ergodox_ez/keymaps/keymap_jack.c index 2677a3d8f..f8f73a1af 100644 --- a/keyboard/ergodox_ez/keymaps/keymap_jack.c +++ b/keyboard/ergodox_ez/keymaps/keymap_jack.c | |||
| @@ -8,29 +8,6 @@ | |||
| 8 | #define MDIA 2 // media keys | 8 | #define MDIA 2 // media keys |
| 9 | 9 | ||
| 10 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 10 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 11 | /* Keymap 0: Basic layer | ||
| 12 | * | ||
| 13 | * ,--------------------------------------------------. ,--------------------------------------------------. | ||
| 14 | * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | | ||
| 15 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | ||
| 16 | * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | | ||
| 17 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 18 | * | BkSp | A | S | D | F | G |------| |------| H | J | K | L |; / L2| ' | | ||
| 19 | * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| | ||
| 20 | * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | | ||
| 21 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | ||
| 22 | * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 | | ||
| 23 | * `----------------------------------' `----------------------------------' | ||
| 24 | * ,-------------. ,-------------. | ||
| 25 | * | App | LGui | | Alt |Ctrl/Esc| | ||
| 26 | * ,------|------|------| |------+--------+------. | ||
| 27 | * | | | Home | | PgUp | | | | ||
| 28 | * | Space|Backsp|------| |------| Tab |Enter | | ||
| 29 | * | |ace | End | | PgDn | | | | ||
| 30 | * `--------------------' `----------------------' | ||
| 31 | */ | ||
| 32 | // If it accepts an argument (i.e, is a function), it doesn't need KC_. | ||
| 33 | // Otherwise, it needs KC_* | ||
| 34 | [BASE] = KEYMAP( // layer 0 : default | 11 | [BASE] = KEYMAP( // layer 0 : default |
| 35 | // left hand | 12 | // left hand |
| 36 | KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, | 13 | KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO, |
| @@ -51,28 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 51 | KC_PGUP, | 28 | KC_PGUP, |
| 52 | KC_PGDN, KC_SPC,KC_SPC | 29 | KC_PGDN, KC_SPC,KC_SPC |
| 53 | ), | 30 | ), |
| 54 | /* Keymap 1: Symbol Layer | ||
| 55 | * | ||
| 56 | * ,--------------------------------------------------. ,--------------------------------------------------. | ||
| 57 | * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | | ||
| 58 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | ||
| 59 | * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | | ||
| 60 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 61 | * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | | ||
| 62 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 63 | * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | | ||
| 64 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | ||
| 65 | * | | | | | | | | . | 0 | = | | | ||
| 66 | * `----------------------------------' `----------------------------------' | ||
| 67 | * ,-------------. ,-------------. | ||
| 68 | * | | | | | | | ||
| 69 | * ,------|------|------| |------+------+------. | ||
| 70 | * | | | | | | | | | ||
| 71 | * | | |------| |------| | | | ||
| 72 | * | | | | | | | | | ||
| 73 | * `--------------------' `--------------------' | ||
| 74 | */ | ||
| 75 | // SYMBOLS | ||
| 76 | [SYMB] = KEYMAP( | 31 | [SYMB] = KEYMAP( |
| 77 | // left hand | 32 | // left hand |
| 78 | KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, | 33 | KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, |
| @@ -93,29 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 93 | KC_TRNS, | 48 | KC_TRNS, |
| 94 | KC_TRNS, KC_TRNS, KC_TRNS | 49 | KC_TRNS, KC_TRNS, KC_TRNS |
| 95 | ), | 50 | ), |
| 96 | /* Keymap 2: Media and mouse keys | 51 | [MDIA] = KEYMAP( |
| 97 | * | ||
| 98 | * ,--------------------------------------------------. ,--------------------------------------------------. | ||
| 99 | * | | | | | | | | | | | | | | | | | ||
| 100 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | ||
| 101 | * | | | | MsUp | | | | | | | | | | | | | ||
| 102 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 103 | * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | | ||
| 104 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | ||
| 105 | * | | | | | | | | | | | | Prev | Next | | | | ||
| 106 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | ||
| 107 | * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | | ||
| 108 | * `----------------------------------' `----------------------------------' | ||
| 109 | * ,-------------. ,-------------. | ||
| 110 | * | | | | | | | ||
| 111 | * ,------|------|------| |------+------+------. | ||
| 112 | * | | | | | | |Brwser| | ||
| 113 | * | | |------| |------| |Back | | ||
| 114 | * | | | | | | | | | ||
| 115 | * `--------------------' `--------------------' | ||
| 116 | */ | ||
| 117 | // MEDIA AND MOUSE | ||
| 118 | KEYMAP( | ||
| 119 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 52 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 120 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, | 53 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, |
| 121 | KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, | 54 | KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, |
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 485c5f77f..fdf8c1640 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile | |||
| @@ -122,8 +122,8 @@ COMMAND_ENABLE = yes # Commands for debug and configuration | |||
| 122 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 122 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 123 | # SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | 123 | # SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend |
| 124 | # NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 124 | # NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 125 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 125 | # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 126 | # MIDI_ENABLE = YES # MIDI controls | 126 | MIDI_ENABLE = YES # MIDI controls |
| 127 | # UNICODE_ENABLE = YES # Unicode | 127 | # UNICODE_ENABLE = YES # Unicode |
| 128 | # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID | 128 | # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID |
| 129 | 129 | ||
diff --git a/keyboard/planck/keymaps/keymap_eric.c b/keyboard/planck/keymaps/keymap_eric.c new file mode 100644 index 000000000..ffeec5f80 --- /dev/null +++ b/keyboard/planck/keymaps/keymap_eric.c | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | #include "planck.h" | ||
| 2 | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 4 | [0] = { | ||
| 5 | {KC_BSLS, S(KC_SLSH), KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH}, | ||
| 6 | {TG(1), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS}, | ||
| 7 | {KC_LGUI, KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RGUI}, | ||
| 8 | {KC_LCBR, KC_LCTL, KC_LALT, LT(1, TG(2)), KC_SPC, KC_TAB, KC_ENT, KC_BSPC, LT(1, TG(3)), KC_RALT, KC_RCTL, KC_RCBR} | ||
| 9 | }, | ||
| 10 | |||
| 11 | [1] = { | ||
| 12 | {KC_PIPE, KC_COLN, KC_LBRC, KC_RBRC, S(KC_P), S(KC_Y), S(KC_F), S(KC_G), S(KC_C), S(KC_R), S(KC_L), KC_AMPR}, | ||
| 13 | {KC_TRNS, S(KC_A), S(KC_O), S(KC_E), S(KC_U), S(KC_I), S(KC_D), S(KC_H), S(KC_T), S(KC_N), S(KC_S), KC_GRV}, | ||
| 14 | {KC_TRNS, KC_SCLN, S(KC_Q), S(KC_J), S(KC_K), S(KC_X), S(KC_B), S(KC_M), S(KC_W), S(KC_V), S(KC_Z), KC_TRNS}, | ||
| 15 | {S(KC_COMM), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_DOT)} | ||
| 16 | }, | ||
| 17 | |||
| 18 | [2] = { | ||
| 19 | {KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO}, | ||
| 20 | {KC_NO, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_NO}, | ||
| 21 | {KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS}, | ||
| 22 | {KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO} | ||
| 23 | }, | ||
| 24 | |||
| 25 | [3] = { | ||
| 26 | {KC_EXLM, KC_7, KC_5, KC_3, KC_1, KC_9, KC_0, KC_2, KC_4, KC_6, KC_8, KC_EQL}, | ||
| 27 | {TG(4), KC_NO, KC_PGUP, KC_HOME, KC_INSERT, KC_NO, KC_NO, BL_DEC, KC_UP, BL_INC, KC_NO, KC_NO}, | ||
| 28 | {KC_TRNS, KC_NO, KC_PGDN, KC_END, KC_DELETE, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS}, | ||
| 29 | {KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO} | ||
| 30 | }, | ||
| 31 | |||
| 32 | [4] = { | ||
| 33 | {KC_TILD, KC_HASH, KC_LPRN, KC_RPRN, S(KC_QUOT), KC_PERC, KC_UNDS, KC_CIRC, KC_DLR, KC_AT, KC_ASTR, KC_PLUS}, | ||
| 34 | {KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, | ||
| 35 | {KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS}, | ||
| 36 | {KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO} | ||
| 37 | } | ||
| 38 | }; | ||
| 39 | |||
| 40 | const uint16_t PROGMEM fn_actions[] = { | ||
| 41 | |||
| 42 | }; \ No newline at end of file | ||
diff --git a/keyboard/planck/keymaps/keymap_lock.c b/keyboard/planck/keymaps/keymap_lock.c index cc9be55f6..c2bf0b7d8 100644 --- a/keyboard/planck/keymaps/keymap_lock.c +++ b/keyboard/planck/keymaps/keymap_lock.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #include "keymap_common.h" | 1 | #include "keymap_common.h" |
| 2 | #include "backlight.h" | 2 | // #include "backlight.h" |
| 3 | #include "action_layer.h" | 3 | #include "action_layer.h" |
| 4 | #include "keymap_midi.h" | 4 | #include "keymap_midi.h" |
| 5 | #include <avr/boot.h> | 5 | #include <avr/boot.h> |
| @@ -71,7 +71,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 71 | if (record->event.pressed) { | 71 | if (record->event.pressed) { |
| 72 | // play_note(440, 20); | 72 | // play_note(440, 20); |
| 73 | // register_code(KC_RSFT); | 73 | // register_code(KC_RSFT); |
| 74 | backlight_set(BACKLIGHT_LEVELS); | 74 | // backlight_set(BACKLIGHT_LEVELS); |
| 75 | default_layer_and(0); | 75 | default_layer_and(0); |
| 76 | default_layer_or((1<<5)); | 76 | default_layer_or((1<<5)); |
| 77 | 77 | ||
| @@ -106,9 +106,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 106 | // note(0+12, 20); | 106 | // note(0+12, 20); |
| 107 | // note(0+24, 20); | 107 | // note(0+24, 20); |
| 108 | } else { | 108 | } else { |
| 109 | // unregister_code(KC_RSFT); | 109 | unregister_code(KC_RSFT); |
| 110 | // stop_note(); | 110 | // stop_all_notes(); |
| 111 | backlight_set(0); | 111 | // backlight_set(0); |
| 112 | default_layer_and(0); | 112 | default_layer_and(0); |
| 113 | default_layer_or(0); | 113 | default_layer_or(0); |
| 114 | // note(0+24, 20); | 114 | // note(0+24, 20); |
diff --git a/keyboard/planck/planck.c b/keyboard/planck/planck.c index b62862af0..a986bd881 100644 --- a/keyboard/planck/planck.c +++ b/keyboard/planck/planck.c | |||
| @@ -19,6 +19,35 @@ void * matrix_init_kb(void) { | |||
| 19 | DDRE |= (1<<6); | 19 | DDRE |= (1<<6); |
| 20 | PORTE |= (1<<6); | 20 | PORTE |= (1<<6); |
| 21 | 21 | ||
| 22 | init_notes(); | ||
| 23 | |||
| 24 | // play_note(((double)261.6*32)*pow(2.0,(36)/12.0), 0xF); | ||
| 25 | // _delay_ms(50); | ||
| 26 | |||
| 27 | // play_note(((double)261.6*32)*pow(2.0,(48)/12.0), 0xF); | ||
| 28 | // _delay_ms(25); | ||
| 29 | // stop_note(((double)261.6*32)*pow(2.0,(48)/12.0)); | ||
| 30 | |||
| 31 | // play_note(((double)261.6*32)*pow(2.0,(48)/12.0), 0xF); | ||
| 32 | // _delay_ms(25); | ||
| 33 | // stop_note(((double)261.6*32)*pow(2.0,(48)/12.0)); | ||
| 34 | |||
| 35 | |||
| 36 | // stop_note(((double)261.6*32)*pow(2.0,(36)/12.0)); | ||
| 37 | |||
| 38 | |||
| 39 | // play_note(((double)261.6*32)*pow(2.0,(62)/12.0), 0xF); | ||
| 40 | // _delay_ms(50); | ||
| 41 | // stop_note(((double)261.6*32)*pow(2.0,(62)/12.0)); | ||
| 42 | |||
| 43 | |||
| 44 | // play_note(((double)261.6*32)*pow(2.0,(64)/12.0), 0xF); | ||
| 45 | // _delay_ms(50); | ||
| 46 | // stop_note(((double)261.6*32)*pow(2.0,(64)/12.0)); | ||
| 47 | |||
| 48 | |||
| 49 | |||
| 50 | |||
| 22 | if (matrix_init_user) { | 51 | if (matrix_init_user) { |
| 23 | (*matrix_init_user)(); | 52 | (*matrix_init_user)(); |
| 24 | } | 53 | } |
diff --git a/keyboard/planck/planck.h b/keyboard/planck/planck.h index 4e59aef56..32c08f3b0 100644 --- a/keyboard/planck/planck.h +++ b/keyboard/planck/planck.h | |||
| @@ -3,8 +3,11 @@ | |||
| 3 | 3 | ||
| 4 | #include "matrix.h" | 4 | #include "matrix.h" |
| 5 | #include "keymap_common.h" | 5 | #include "keymap_common.h" |
| 6 | #include "backlight.h" | 6 | // #include "backlight.h" |
| 7 | #include <stddef.h> | 7 | #include <stddef.h> |
| 8 | #ifdef MIDI_ENABLE | ||
| 9 | #include <keymap_midi.h> | ||
| 10 | #endif | ||
| 8 | 11 | ||
| 9 | #define PLANCK_MIT( \ | 12 | #define PLANCK_MIT( \ |
| 10 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ | 13 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ |
