aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboard/atomic/atomic.h6
-rw-r--r--keyboard/planck/keymaps/default/keymap.c86
-rw-r--r--keyboard/preonic/keymaps/default/keymap.c85
-rw-r--r--keyboard/preonic/preonic.h14
4 files changed, 7 insertions, 184 deletions
diff --git a/keyboard/atomic/atomic.h b/keyboard/atomic/atomic.h
index 2d6b4c6cb..456c3fbdf 100644
--- a/keyboard/atomic/atomic.h
+++ b/keyboard/atomic/atomic.h
@@ -1,11 +1,7 @@
1#ifndef ATOMIC_H 1#ifndef ATOMIC_H
2#define ATOMIC_H 2#define ATOMIC_H
3 3
4#include "matrix.h" 4#include "quantum.h"
5#include "keymap_common.h"
6#ifdef BACKLIGHT_ENABLE
7 #include "backlight.h"
8#endif
9#include <stddef.h> 5#include <stddef.h>
10#include <avr/io.h> 6#include <avr/io.h>
11 7
diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c
index 56f20a3b9..79bf62436 100644
--- a/keyboard/planck/keymaps/default/keymap.c
+++ b/keyboard/planck/keymaps/default/keymap.c
@@ -19,8 +19,7 @@ extern keymap_config_t keymap_config;
19#define _DVORAK 2 19#define _DVORAK 2
20#define _LOWER 3 20#define _LOWER 3
21#define _RAISE 4 21#define _RAISE 4
22#define _MUSIC 5 22#define _PLOVER 5
23#define _PLOVER 6
24#define _ADJUST 16 23#define _ADJUST 16
25 24
26// Macro name shortcuts 25// Macro name shortcuts
@@ -30,12 +29,6 @@ extern keymap_config_t keymap_config;
30#define LOWER M(_LOWER) 29#define LOWER M(_LOWER)
31#define RAISE M(_RAISE) 30#define RAISE M(_RAISE)
32#define M_BL 5 31#define M_BL 5
33#define AUD_OFF M(6)
34#define AUD_ON M(7)
35#define MUS_OFF M(8)
36#define MUS_ON M(9)
37#define VC_IN M(10)
38#define VC_DE M(11)
39#define PLOVER M(12) 32#define PLOVER M(12)
40#define EXT_PLV M(13) 33#define EXT_PLV M(13)
41#define TOG_OUT M(14) 34#define TOG_OUT M(14)
@@ -136,16 +129,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
136 {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} 129 {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
137}, 130},
138 131
139/* Music (reserved for process_action_user)
140 *
141 */
142[_MUSIC] = {
143 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
144 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
145 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
146 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
147},
148
149/* Plover layer (http://opensteno.org) 132/* Plover layer (http://opensteno.org)
150 * ,-----------------------------------------------------------------------------------. 133 * ,-----------------------------------------------------------------------------------.
151 * | # | # | # | # | # | # | # | # | # | # | # | # | 134 * | # | # | # | # | # | # | # | # | # | # | # | # |
@@ -178,8 +161,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
178 */ 161 */
179[_ADJUST] = { 162[_ADJUST] = {
180 {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, 163 {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL},
181 {_______, _______, _______, AUD_ON, AUD_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______}, 164 {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______},
182 {_______, VC_DE, VC_IN, MUS_ON, MUS_OFF, _______, _______, _______, _______, _______, _______, _______}, 165 {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______},
183 {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} 166 {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
184} 167}
185 168
@@ -205,7 +188,6 @@ float tone_colemak[][2] = SONG(COLEMAK_SOUND);
205float tone_plover[][2] = SONG(PLOVER_SOUND); 188float tone_plover[][2] = SONG(PLOVER_SOUND);
206float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); 189float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
207 190
208float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
209float goodbye[][2] = SONG(GOODBYE_SOUND); 191float goodbye[][2] = SONG(GOODBYE_SOUND);
210#endif 192#endif
211 193
@@ -270,53 +252,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
270 unregister_code(KC_RSFT); 252 unregister_code(KC_RSFT);
271 } 253 }
272 break; 254 break;
273 case 6:
274 if (record->event.pressed) {
275 #ifdef AUDIO_ENABLE
276 audio_off();
277 #endif
278 }
279 break;
280 case 7:
281 if (record->event.pressed) {
282 #ifdef AUDIO_ENABLE
283 audio_on();
284 PLAY_NOTE_ARRAY(tone_startup, false, 0);
285 #endif
286 }
287 break;
288 case 8:
289 if (record->event.pressed) {
290 #ifdef AUDIO_ENABLE
291 layer_off(_MUSIC);
292 stop_all_notes();
293 #endif
294 }
295 break;
296 case 9:
297 if (record->event.pressed) {
298 #ifdef AUDIO_ENABLE
299 PLAY_NOTE_ARRAY(music_scale, false, 0);
300 layer_on(_MUSIC);
301 #endif
302 }
303 break;
304 case 10:
305 if (record->event.pressed) {
306 #ifdef AUDIO_ENABLE
307 voice_iterate();
308 PLAY_NOTE_ARRAY(music_scale, false, 0);
309 #endif
310 }
311 break;
312 case 11:
313 if (record->event.pressed) {
314 #ifdef AUDIO_ENABLE
315 voice_deiterate();
316 PLAY_NOTE_ARRAY(music_scale, false, 0);
317 #endif
318 }
319 break;
320 case 12: 255 case 12:
321 if (record->event.pressed) { 256 if (record->event.pressed) {
322 #ifdef AUDIO_ENABLE 257 #ifdef AUDIO_ENABLE
@@ -366,19 +301,4 @@ void play_goodbye_tone()
366 PLAY_NOTE_ARRAY(goodbye, false, 0); 301 PLAY_NOTE_ARRAY(goodbye, false, 0);
367 _delay_ms(150); 302 _delay_ms(150);
368} 303}
369
370uint8_t starting_note = 0x0C;
371int offset = 0;
372
373void process_action_user(keyrecord_t *record) {
374
375 if (IS_LAYER_ON(_MUSIC)) {
376 if (record->event.pressed) {
377 play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
378 } else {
379 stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
380 }
381 }
382
383}
384#endif 304#endif
diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c
index b3aa14dcb..f808ab1ce 100644
--- a/keyboard/preonic/keymaps/default/keymap.c
+++ b/keyboard/preonic/keymaps/default/keymap.c
@@ -14,7 +14,6 @@
14#define _DVORAK 2 14#define _DVORAK 2
15#define _LOWER 3 15#define _LOWER 3
16#define _RAISE 4 16#define _RAISE 4
17#define _MUSIC 5
18#define _ADJUST 16 17#define _ADJUST 16
19 18
20// Macro name shortcuts 19// Macro name shortcuts
@@ -24,12 +23,6 @@
24#define LOWER M(_LOWER) 23#define LOWER M(_LOWER)
25#define RAISE M(_RAISE) 24#define RAISE M(_RAISE)
26#define M_BL 5 25#define M_BL 5
27#define AUD_OFF M(6)
28#define AUD_ON M(7)
29#define MUS_OFF M(8)
30#define MUS_ON M(9)
31#define VC_IN M(10)
32#define VC_DE M(11)
33 26
34// Fillers to make layering more clear 27// Fillers to make layering more clear
35#define _______ KC_TRNS 28#define _______ KC_TRNS
@@ -142,17 +135,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
142 {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} 135 {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
143}, 136},
144 137
145/* Music (reserved for process_action_user)
146 *
147 */
148[_MUSIC] = {
149 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
150 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
151 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
152 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
153 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
154},
155
156/* Adjust (Lower + Raise) 138/* Adjust (Lower + Raise)
157 * ,-----------------------------------------------------------------------------------. 139 * ,-----------------------------------------------------------------------------------.
158 * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | 140 * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
@@ -169,8 +151,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
169[_ADJUST] = { 151[_ADJUST] = {
170 {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, 152 {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12},
171 {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, 153 {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL},
172 {_______, _______, _______, AUD_ON, AUD_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, 154 {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______},
173 {_______, VC_DE, VC_IN, MUS_ON, MUS_OFF, _______, _______, _______, _______, _______, _______, _______}, 155 {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______},
174 {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} 156 {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
175} 157}
176 158
@@ -193,7 +175,6 @@ float tone_qwerty[][2] = SONG(QWERTY_SOUND);
193float tone_dvorak[][2] = SONG(DVORAK_SOUND); 175float tone_dvorak[][2] = SONG(DVORAK_SOUND);
194float tone_colemak[][2] = SONG(COLEMAK_SOUND); 176float tone_colemak[][2] = SONG(COLEMAK_SOUND);
195 177
196float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
197float goodbye[][2] = SONG(GOODBYE_SOUND); 178float goodbye[][2] = SONG(GOODBYE_SOUND);
198#endif 179#endif
199 180
@@ -257,53 +238,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
257 unregister_code(KC_RSFT); 238 unregister_code(KC_RSFT);
258 } 239 }
259 break; 240 break;
260 case 6:
261 if (record->event.pressed) {
262 #ifdef AUDIO_ENABLE
263 audio_off();
264 #endif
265 }
266 break;
267 case 7:
268 if (record->event.pressed) {
269 #ifdef AUDIO_ENABLE
270 audio_on();
271 PLAY_NOTE_ARRAY(start_up, false, 0);
272 #endif
273 }
274 break;
275 case 8:
276 if (record->event.pressed) {
277 #ifdef AUDIO_ENABLE
278 layer_off(_MUSIC);
279 stop_all_notes();
280 #endif
281 }
282 break;
283 case 9:
284 if (record->event.pressed) {
285 #ifdef AUDIO_ENABLE
286 PLAY_NOTE_ARRAY(music_scale, false, 0);
287 layer_on(_MUSIC);
288 #endif
289 }
290 break;
291 case 10:
292 if (record->event.pressed) {
293 #ifdef AUDIO_ENABLE
294 voice_iterate();
295 PLAY_NOTE_ARRAY(music_scale, false, 0);
296 #endif
297 }
298 break;
299 case 11:
300 if (record->event.pressed) {
301 #ifdef AUDIO_ENABLE
302 voice_deiterate();
303 PLAY_NOTE_ARRAY(music_scale, false, 0);
304 #endif
305 }
306 break;
307 } 241 }
308 return MACRO_NONE; 242 return MACRO_NONE;
309}; 243};
@@ -318,21 +252,6 @@ void matrix_init_user(void) {
318 252
319#ifdef AUDIO_ENABLE 253#ifdef AUDIO_ENABLE
320 254
321uint8_t starting_note = 0x0C;
322int offset = 0;
323
324void process_action_user(keyrecord_t *record) {
325
326 if (IS_LAYER_ON(_MUSIC)) {
327 if (record->event.pressed) {
328 play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
329 } else {
330 stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
331 }
332 }
333
334}
335
336void play_goodbye_tone() 255void play_goodbye_tone()
337{ 256{
338 PLAY_NOTE_ARRAY(goodbye, false, 0); 257 PLAY_NOTE_ARRAY(goodbye, false, 0);
diff --git a/keyboard/preonic/preonic.h b/keyboard/preonic/preonic.h
index 2406a11d7..feb879774 100644
--- a/keyboard/preonic/preonic.h
+++ b/keyboard/preonic/preonic.h
@@ -1,19 +1,7 @@
1#ifndef PREONIC_H 1#ifndef PREONIC_H
2#define PREONIC_H 2#define PREONIC_H
3 3
4#include "matrix.h" 4#include "quantum.h"
5#include "keymap_common.h"
6#ifdef BACKLIGHT_ENABLE
7 #include "backlight.h"
8#endif
9#ifdef RGBLIGHT_ENABLE
10 #include "rgblight.h"
11#endif
12#include <stddef.h>
13#include <avr/io.h>
14#ifdef MIDI_ENABLE
15 #include <keymap_midi.h>
16#endif
17 5
18#define PREONIC_MIT( \ 6#define PREONIC_MIT( \
19 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ 7 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-07 09:14:32 +0000