diff options
| -rw-r--r-- | keyboards/lets_split/keymaps/dale/config.h | 2 | ||||
| -rw-r--r-- | keyboards/lets_split/keymaps/dale/defaultkeymap.c | 214 | ||||
| -rw-r--r-- | keyboards/lets_split/keymaps/dale/keymap.c | 33 | ||||
| -rw-r--r-- | keyboards/lets_split/keymaps/dale/rules.mk | 3 |
4 files changed, 1 insertions, 251 deletions
diff --git a/keyboards/lets_split/keymaps/dale/config.h b/keyboards/lets_split/keymaps/dale/config.h index 5a6261c4f..6b31e8d14 100644 --- a/keyboards/lets_split/keymaps/dale/config.h +++ b/keyboards/lets_split/keymaps/dale/config.h | |||
| @@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 21 | #ifndef CONFIG_USER_H | 21 | #ifndef CONFIG_USER_H |
| 22 | #define CONFIG_USER_H | 22 | #define CONFIG_USER_H |
| 23 | 23 | ||
| 24 | #include "../../config.h" | 24 | #include "config_common.h" |
| 25 | 25 | ||
| 26 | /* Use I2C or Serial, not both */ | 26 | /* Use I2C or Serial, not both */ |
| 27 | 27 | ||
diff --git a/keyboards/lets_split/keymaps/dale/defaultkeymap.c b/keyboards/lets_split/keymaps/dale/defaultkeymap.c deleted file mode 100644 index 42f81a0eb..000000000 --- a/keyboards/lets_split/keymaps/dale/defaultkeymap.c +++ /dev/null | |||
| @@ -1,214 +0,0 @@ | |||
| 1 | #include "lets_split.h" | ||
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | |||
| 5 | extern keymap_config_t keymap_config; | ||
| 6 | |||
| 7 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||
| 8 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||
| 9 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | ||
| 10 | // entirely and just use numbers. | ||
| 11 | #define _QWERTY 0 | ||
| 12 | #define _COLEMAK 1 | ||
| 13 | #define _DVORAK 2 | ||
| 14 | #define _LOWER 3 | ||
| 15 | #define _RAISE 4 | ||
| 16 | #define _ADJUST 16 | ||
| 17 | |||
| 18 | enum custom_keycodes { | ||
| 19 | QWERTY = SAFE_RANGE, | ||
| 20 | COLEMAK, | ||
| 21 | DVORAK, | ||
| 22 | LOWER, | ||
| 23 | RAISE, | ||
| 24 | ADJUST, | ||
| 25 | }; | ||
| 26 | |||
| 27 | // Fillers to make layering more clear | ||
| 28 | #define _______ KC_TRNS | ||
| 29 | #define XXXXXXX KC_NO | ||
| 30 | |||
| 31 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 32 | |||
| 33 | /* Qwerty | ||
| 34 | * ,-----------------------------------------------------------------------------------. | ||
| 35 | * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | | ||
| 36 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 37 | * | Esc | A | S | D | F | G | H | J | K | L | ; | " | | ||
| 38 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 39 | * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | | ||
| 40 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 41 | * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | ||
| 42 | * `-----------------------------------------------------------------------------------' | ||
| 43 | */ | ||
| 44 | [_QWERTY] = KEYMAP( \ | ||
| 45 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | ||
| 46 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | ||
| 47 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | ||
| 48 | ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | ||
| 49 | ), | ||
| 50 | |||
| 51 | /* Colemak | ||
| 52 | * ,-----------------------------------------------------------------------------------. | ||
| 53 | * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | | ||
| 54 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 55 | * | Esc | A | R | S | T | D | H | N | E | I | O | " | | ||
| 56 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 57 | * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | | ||
| 58 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 59 | * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | ||
| 60 | * `-----------------------------------------------------------------------------------' | ||
| 61 | */ | ||
| 62 | [_COLEMAK] = KEYMAP( \ | ||
| 63 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ | ||
| 64 | KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ | ||
| 65 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | ||
| 66 | ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | ||
| 67 | ), | ||
| 68 | |||
| 69 | /* Dvorak | ||
| 70 | * ,-----------------------------------------------------------------------------------. | ||
| 71 | * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | | ||
| 72 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 73 | * | Esc | A | O | E | U | I | D | H | T | N | S | / | | ||
| 74 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 75 | * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | | ||
| 76 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 77 | * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | ||
| 78 | * `-----------------------------------------------------------------------------------' | ||
| 79 | */ | ||
| 80 | [_DVORAK] = KEYMAP( \ | ||
| 81 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ | ||
| 82 | KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ | ||
| 83 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \ | ||
| 84 | ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | ||
| 85 | ), | ||
| 86 | |||
| 87 | /* Lower | ||
| 88 | * ,-----------------------------------------------------------------------------------. | ||
| 89 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | | ||
| 90 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 91 | * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | | ||
| 92 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 93 | * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | | ||
| 94 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 95 | * | | | | | | | | Next | Vol- | Vol+ | Play | | ||
| 96 | * `-----------------------------------------------------------------------------------' | ||
| 97 | */ | ||
| 98 | [_LOWER] = KEYMAP( \ | ||
| 99 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | ||
| 100 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ | ||
| 101 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ | ||
| 102 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ | ||
| 103 | ), | ||
| 104 | |||
| 105 | /* Raise | ||
| 106 | * ,-----------------------------------------------------------------------------------. | ||
| 107 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | | ||
| 108 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 109 | * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | | ||
| 110 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 111 | * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | | ||
| 112 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 113 | * | | | | | | | | Next | Vol- | Vol+ | Play | | ||
| 114 | * `-----------------------------------------------------------------------------------' | ||
| 115 | */ | ||
| 116 | [_RAISE] = KEYMAP( \ | ||
| 117 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | ||
| 118 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ | ||
| 119 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ | ||
| 120 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ | ||
| 121 | ), | ||
| 122 | |||
| 123 | /* Adjust (Lower + Raise) | ||
| 124 | * ,-----------------------------------------------------------------------------------. | ||
| 125 | * | | Reset| | | | | | | | | | Del | | ||
| 126 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 127 | * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | | ||
| 128 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 129 | * | | | | | | | | | | | | | | ||
| 130 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 131 | * | | | | | | | | | | | | | ||
| 132 | * `-----------------------------------------------------------------------------------' | ||
| 133 | */ | ||
| 134 | [_ADJUST] = KEYMAP( \ | ||
| 135 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ | ||
| 136 | _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ | ||
| 137 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 138 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | ||
| 139 | ) | ||
| 140 | |||
| 141 | |||
| 142 | }; | ||
| 143 | |||
| 144 | #ifdef AUDIO_ENABLE | ||
| 145 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | ||
| 146 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | ||
| 147 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | ||
| 148 | #endif | ||
| 149 | |||
| 150 | void persistent_default_layer_set(uint16_t default_layer) { | ||
| 151 | eeconfig_update_default_layer(default_layer); | ||
| 152 | default_layer_set(default_layer); | ||
| 153 | } | ||
| 154 | |||
| 155 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 156 | switch (keycode) { | ||
| 157 | case QWERTY: | ||
| 158 | if (record->event.pressed) { | ||
| 159 | #ifdef AUDIO_ENABLE | ||
| 160 | PLAY_SONG(tone_qwerty); | ||
| 161 | #endif | ||
| 162 | persistent_default_layer_set(1UL<<_QWERTY); | ||
| 163 | } | ||
| 164 | return false; | ||
| 165 | break; | ||
| 166 | case COLEMAK: | ||
| 167 | if (record->event.pressed) { | ||
| 168 | #ifdef AUDIO_ENABLE | ||
| 169 | PLAY_SONG(tone_colemak); | ||
| 170 | #endif | ||
| 171 | persistent_default_layer_set(1UL<<_COLEMAK); | ||
| 172 | } | ||
| 173 | return false; | ||
| 174 | break; | ||
| 175 | case DVORAK: | ||
| 176 | if (record->event.pressed) { | ||
| 177 | #ifdef AUDIO_ENABLE | ||
| 178 | PLAY_SONG(tone_dvorak); | ||
| 179 | #endif | ||
| 180 | persistent_default_layer_set(1UL<<_DVORAK); | ||
| 181 | } | ||
| 182 | return false; | ||
| 183 | break; | ||
| 184 | case LOWER: | ||
| 185 | if (record->event.pressed) { | ||
| 186 | layer_on(_LOWER); | ||
| 187 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
| 188 | } else { | ||
| 189 | layer_off(_LOWER); | ||
| 190 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
| 191 | } | ||
| 192 | return false; | ||
| 193 | break; | ||
| 194 | case RAISE: | ||
| 195 | if (record->event.pressed) { | ||
| 196 | layer_on(_RAISE); | ||
| 197 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
| 198 | } else { | ||
| 199 | layer_off(_RAISE); | ||
| 200 | update_tri_layer(_LOWER, _RAISE, _ADJUST); | ||
| 201 | } | ||
| 202 | return false; | ||
| 203 | break; | ||
| 204 | case ADJUST: | ||
| 205 | if (record->event.pressed) { | ||
| 206 | layer_on(_ADJUST); | ||
| 207 | } else { | ||
| 208 | layer_off(_ADJUST); | ||
| 209 | } | ||
| 210 | return false; | ||
| 211 | break; | ||
| 212 | } | ||
| 213 | return true; | ||
| 214 | } \ No newline at end of file | ||
diff --git a/keyboards/lets_split/keymaps/dale/keymap.c b/keyboards/lets_split/keymaps/dale/keymap.c index 9eb220d43..519fbc4ae 100644 --- a/keyboards/lets_split/keymaps/dale/keymap.c +++ b/keyboards/lets_split/keymaps/dale/keymap.c | |||
| @@ -145,12 +145,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // | |||
| 145 | 145 | ||
| 146 | 146 | ||
| 147 | #ifdef AUDIO_ENABLE | 147 | #ifdef AUDIO_ENABLE |
| 148 | |||
| 149 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 150 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 148 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 151 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | 149 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); |
| 152 | |||
| 153 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 154 | #endif | 150 | #endif |
| 155 | 151 | ||
| 156 | 152 | ||
| @@ -217,34 +213,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 217 | } | 213 | } |
| 218 | 214 | ||
| 219 | void matrix_init_user(void) { | 215 | void matrix_init_user(void) { |
| 220 | #ifdef AUDIO_ENABLE | ||
| 221 | startup_user(); | ||
| 222 | #endif | ||
| 223 | } | ||
| 224 | |||
| 225 | #ifdef AUDIO_ENABLE | ||
| 226 | 216 | ||
| 227 | void startup_user() | ||
| 228 | { | ||
| 229 | _delay_ms(20); // gets rid of tick | ||
| 230 | PLAY_SONG(tone_startup); | ||
| 231 | } | ||
| 232 | |||
| 233 | void shutdown_user() | ||
| 234 | { | ||
| 235 | PLAY_SONG(tone_goodbye); | ||
| 236 | _delay_ms(150); | ||
| 237 | stop_all_notes(); | ||
| 238 | } | 217 | } |
| 239 | |||
| 240 | void music_on_user(void) | ||
| 241 | { | ||
| 242 | music_scale_user(); | ||
| 243 | } | ||
| 244 | |||
| 245 | void music_scale_user(void) | ||
| 246 | { | ||
| 247 | PLAY_SONG(music_scale); | ||
| 248 | } | ||
| 249 | |||
| 250 | #endif | ||
diff --git a/keyboards/lets_split/keymaps/dale/rules.mk b/keyboards/lets_split/keymaps/dale/rules.mk index 457a3d01d..e69de29bb 100644 --- a/keyboards/lets_split/keymaps/dale/rules.mk +++ b/keyboards/lets_split/keymaps/dale/rules.mk | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | ifndef QUANTUM_DIR | ||
| 2 | include ../../../../Makefile | ||
| 3 | endif | ||
