aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboard/atomic/atomic.c31
-rw-r--r--keyboard/atomic/keymaps/pvc/config.h10
-rw-r--r--keyboard/atomic/keymaps/pvc/keymap.c665
-rw-r--r--keyboard/atomic/keymaps/pvc/makefile.mk2
-rw-r--r--keyboard/planck/keymaps/pvc_planck.c24
-rw-r--r--keyboard/retro_refit/retro_refit.c32
-rw-r--r--quantum/audio.c15
-rw-r--r--quantum/audio.h2
-rw-r--r--quantum/keymap_common.c14
-rw-r--r--quantum/musical_notes.h5
-rw-r--r--quantum/song_list.h104
-rw-r--r--tmk_core/common/avr/suspend.c12
-rw-r--r--tmk_core/common/command.c7
13 files changed, 599 insertions, 324 deletions
diff --git a/keyboard/atomic/atomic.c b/keyboard/atomic/atomic.c
index 30e812289..5e31264e6 100644
--- a/keyboard/atomic/atomic.c
+++ b/keyboard/atomic/atomic.c
@@ -2,12 +2,22 @@
2 2
3__attribute__ ((weak)) 3__attribute__ ((weak))
4void matrix_init_user(void) { 4void matrix_init_user(void) {
5 // leave these blank 5 // leave this function blank - it can be defined in a keymap file
6} 6};
7 7
8__attribute__ ((weak)) 8__attribute__ ((weak))
9void matrix_scan_user(void) { 9void matrix_scan_user(void) {
10 // leave these blank 10 // leave this function blank - it can be defined in a keymap file
11}
12
13__attribute__ ((weak))
14void process_action_user(keyrecord_t *record) {
15 // leave this function blank - it can be defined in a keymap file
16}
17
18__attribute__ ((weak))
19void led_set_user(uint8_t usb_led) {
20 // leave this function blank - it can be defined in a keymap file
11} 21}
12 22
13void matrix_init_kb(void) { 23void matrix_init_kb(void) {
@@ -33,4 +43,17 @@ void matrix_scan_kb(void) {
33 // runs every cycle (a lot) 43 // runs every cycle (a lot)
34 44
35 matrix_scan_user(); 45 matrix_scan_user();
36} \ No newline at end of file 46}
47
48void process_action_kb(keyrecord_t *record) {
49 // put your per-action keyboard code here
50 // runs for every action, just before processing by the firmware
51
52 process_action_user(record);
53}
54
55void led_set_kb(uint8_t usb_led) {
56 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
57
58 led_set_user(usb_led);
59}
diff --git a/keyboard/atomic/keymaps/pvc/config.h b/keyboard/atomic/keymaps/pvc/config.h
index 8449fa06d..cb0b78e44 100644
--- a/keyboard/atomic/keymaps/pvc/config.h
+++ b/keyboard/atomic/keymaps/pvc/config.h
@@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
41 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) 41 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
42 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) 42 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
43 * 43 *
44*/ 44*/
45#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } 45#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 }
46#define ROWS (int []){ D0, D5, B5, B6, B3 } 46#define ROWS (int []){ D0, D5, B5, B6, B3 }
47 47
@@ -62,17 +62,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
62/* Locking resynchronize hack */ 62/* Locking resynchronize hack */
63#define LOCKING_RESYNC_ENABLE 63#define LOCKING_RESYNC_ENABLE
64 64
65/* 65/*
66 * Force NKRO 66 * Force NKRO
67 * 67 *
68 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved 68 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
69 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the 69 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
70 * makefile for this to work.) 70 * makefile for this to work.)
71 * 71 *
72 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) 72 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
73 * until the next keyboard reset. 73 * until the next keyboard reset.
74 * 74 *
75 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is 75 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
76 * fully operational during normal computer usage. 76 * fully operational during normal computer usage.
77 * 77 *
78 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) 78 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
@@ -90,7 +90,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
90 * the keyboard. They are best used in combination with the HID Listen program, 90 * the keyboard. They are best used in combination with the HID Listen program,
91 * found here: https://www.pjrc.com/teensy/hid_listen.html 91 * found here: https://www.pjrc.com/teensy/hid_listen.html
92 * 92 *
93 * The options below allow the magic key functionality to be changed. This is 93 * The options below allow the magic key functionality to be changed. This is
94 * useful if your keyboard/keypad is missing keys and you want magic key support. 94 * useful if your keyboard/keypad is missing keys and you want magic key support.
95 * 95 *
96 */ 96 */
diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index aaef6b041..36098f1eb 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -1,36 +1,78 @@
1#include "atomic.h" 1#include "atomic.h"
2#include "action_layer.h" 2#include "action_layer.h"
3#include "eeconfig.h"
4#include "led.h"
3 5
4#ifdef AUDIO_ENABLE 6#ifdef AUDIO_ENABLE
5#include "audio.h" 7 #include "audio.h"
6#include "song_list.h" 8 #include "song_list.h"
7#endif 9#endif
8 10
9 11#define LAYER_QWERTY 0
10#define _QW 0 12#define LAYER_COLEMAK 1
11#define _LW 1 13#define LAYER_DVORAK 2
12#define _RS 2 14#define LAYER_LOWER 3
13#define _AD 3 15#define LAYER_RAISE 4
14#define _FN 4 16#define LAYER_ADJUST 5
15 17#define LAYER_FUNCTION 6
16#define M_QW 0 18#define LAYER_MUSIC 7
17#define M_LW 1 19
18#define M_RS 2 20#define MACRO_QWERTY 0
19#define M_FN 3 21#define MACRO_COLEMAK 1
20#define M_T1 4 22#define MACRO_DVORAK 2
21#define M_T2 5 23#define MACRO_LOWER 3
22#define M_T3 6 24#define MACRO_RAISE 4
23#define M_T4 7 25#define MACRO_FUNCTION 5
24#define M_TU 8 26#define MACRO_TIMBRE_1 6
25#define M_TD 9 27#define MACRO_TIMBRE_2 7
26#define M_DF 10 28#define MACRO_TIMBRE_3 8
27 29#define MACRO_TIMBRE_4 9
28 30#define MACRO_TEMPO_U 10
29#define _______ KC_TRNS 31#define MACRO_TEMPO_D 11
30#define ___T___ KC_TRNS 32#define MACRO_TONE_DEFAULT 12
31#define XXXXXXX KC_NO 33#define MACRO_MUSIC_ON 13
32 34#define MACRO_MUSIC_OFF 14
33/* 35#define MACRO_AUDIO_ON 15
36#define MACRO_AUDIO_OFF 16
37
38#define M_QWRTY M(MACRO_QWERTY)
39#define M_COLMK M(MACRO_COLEMAK)
40#define M_DVORK M(MACRO_DVORAK)
41#define M_LOWER M(MACRO_LOWER)
42#define M_RAISE M(MACRO_RAISE)
43#define M_FUNCT M(MACRO_FUNCTION)
44#define TIMBR_1 M(MACRO_TIMBRE_1)
45#define TIMBR_2 M(MACRO_TIMBRE_2)
46#define TIMBR_3 M(MACRO_TIMBRE_3)
47#define TIMBR_4 M(MACRO_TIMBRE_4)
48#define TMPO_UP M(MACRO_TEMPO_U)
49#define TMPO_DN M(MACRO_TEMPO_D)
50#define TMPO_DF M(MACRO_TONE_DEFAULT)
51
52
53#define MUS_ON M(MACRO_MUSIC_ON)
54#define MUS_OFF M(MACRO_MUSIC_OFF)
55#define AUD_OFF M(MACRO_AUDIO_OFF)
56#define AUD_ON M(MACRO_AUDIO_ON)
57
58
59#define SC_UNDO LCTL(KC_Z)
60#define SC_REDO LCTL(KC_Y)
61#define SC_CUT LCTL(KC_X)
62#define SC_COPY LCTL(KC_C)
63#define SC_PSTE LCTL(KC_V)
64#define SC_SELA LCTL(KC_A)
65#define SC_SAVE LCTL(KC_S)
66#define SC_OPEN LCTL(KC_O)
67#define SC_ACLS LALT(KC_F4)
68#define SC_CCLS LCTL(KC_F4)
69
70
71#define _______ KC_TRNS
72#define ___T___ KC_TRNS
73#define XXXXXXX KC_NO
74
75/* QWERTY
34 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 76 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
35 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | 77 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP |
36 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 78 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
@@ -45,270 +87,383 @@
45 */ 87 */
46 88
47const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 89const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
48 [_QW] = { /* QWERTY */ 90 [LAYER_QWERTY] = { /* QWERTY */
49 { KC_ESC, 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, XXXXXXX }, 91 { KC_ESC, 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, XXXXXXX },
50 { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, 92 { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL },
51 { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, XXXXXXX, KC_PGUP }, 93 { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, XXXXXXX, KC_PGUP },
52 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXXXXX, KC_UP, KC_PGDN }, 94 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, XXXXXXX, KC_UP, KC_PGDN },
53 { KC_LCTL, KC_LGUI, M(M_FN), KC_LALT, M(M_RS), KC_SPC, XXXXXXX, M(M_LW), KC_RALT, KC_HOME, KC_END, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, 95 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, XXXXXXX, M_LOWER, KC_RALT, KC_HOME, KC_END, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT },
96 },
97
98 /* COLEMAK
99 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
100 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP |
101 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
102 * | TAB | Q | W | F | P | G | J | L | U | Y | ; | [ | ] | \ | DEL |
103 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
104 * | CAPS | A | R | S | T | D | H | N | E | I | O | ' | XXXXXX . ENTER | PG UP |
105 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
106 * | LSHIFT | Z | X | C | V | B | K | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN |
107 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
108 * | LCTRL | LWIN | FN | LALT | RAISED | XXXXXX . SPACE | LOWER | RALT | HOME | END | RCTRL | LEFT | DOWN | RIGHT |
109 * '--------------------------------------------------------------------------------------------------------------------------------------'
110 */
111
112 [LAYER_COLEMAK] = { /* COLEMAK */
113 { KC_ESC, 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_BSPC },
114 { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL },
115 { KC_CAPS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP },
116 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN },
117 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, XXXXXXX, M_LOWER, KC_RALT, KC_HOME, KC_END, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT },
54 }, 118 },
55 [_LW] = { /* LOWERED */ 119
120/* DVORAK
121 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
122 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | [ | ] | XXXXXX . BACKSP |
123 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
124 * | TAB | ' | , | . | P | Y | F | G | C | R | L | / | = | \ | DEL |
125 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
126 * | CAPS | A | O | E | U | I | D | H | T | N | S | - | XXXXXX . ENTER | PG UP |
127 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
128 * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | XXXXXX . RSHIFT | UP | PG DN |
129 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
130 * | LCTRL | LWIN | FN | LALT | RAISED | XXXXXX . SPACE | LOWER | RALT | HOME | END | RCTRL | LEFT | DOWN | RIGHT |
131 * '--------------------------------------------------------------------------------------------------------------------------------------'
132 */
133
134 [LAYER_DVORAK] = { /* DVORAK */
135 { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_BSPC },
136 { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_DEL },
137 { KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_ENT, KC_PGUP },
138 { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN },
139 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, XXXXXXX, M_LOWER, KC_RALT, KC_HOME, KC_END, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT },
140 },
141
142
143 [LAYER_LOWER] = { /* LOWERED */
56 { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, 144 { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ },
57 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS }, 145 { _______, _______, _______, _______, SC_CCLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS },
58 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ }, 146 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ },
59 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ }, 147 { _______, SC_REDO, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ },
60 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 148 { _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______ },
61 }, 149 },
62 [_RS] = { /* RAISED */ 150
151 [LAYER_RAISE] = { /* RAISED */
63 { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, 152 { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ },
64 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS }, 153 { _______, _______, _______, _______, SC_ACLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS },
65 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ }, 154 { _______, SC_SELA, SC_SAVE, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ },
66 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ }, 155 { _______, SC_UNDO, SC_CUT, SC_COPY, SC_PSTE, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ },
67 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 156 { _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______, _______, _______, _______, _______, _______, _______ },
68 }, 157 },
69 [_FN] = { /* FUNCTION */ 158
159 [LAYER_FUNCTION] = { /* FUNCTION */
70 { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, 160 { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ },
71 { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR }, 161 { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR },
72 { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U }, 162 { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U },
73 { _______, M(M_T1), M(M_T2), M(M_T3), M(M_T4), M(M_TU), M(M_TD), M(M_DF), _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D }, 163 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D },
74 { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R }, 164 { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R },
75 }, 165 },
76 [_AD] = { /* ADJUST */ 166
167 [LAYER_ADJUST] = { /* ADJUST */
168 { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, _______, MUS_ON, MUS_OFF, AUD_ON, AUD_OFF, ___T___, ___T___ },
169 { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
170 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ },
171 { _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ },
172 { _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______, _______, _______, _______, _______, _______, _______ },
173 },
174
175 [LAYER_MUSIC] = {
77 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___ }, 176 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___ },
78 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 177 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
79 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ }, 178 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______ },
80 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ }, 179 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______ },
81 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 180 { _______, _______, _______, _______, _______, ___T___, ___T___, _______, _______, _______, _______, _______, _______, _______, _______ },
82 }, 181 },
83}; 182};
84 183
85
86
87#ifdef AUDIO_ENABLE 184#ifdef AUDIO_ENABLE
88 185
89float start_up[][2] = SONG(ODE_TO_JOY); 186float tone_my_startup[][2] = SONG(ODE_TO_JOY);
90 187float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY);
91float tone_lw[][2] = {
92
93 Q__NOTE(_C4 ) ,
94 Q__NOTE(_CS4 ) ,
95 Q__NOTE(_D4 ) ,
96 Q__NOTE(_DS4 ) ,
97 Q__NOTE(_E4 ) ,
98 Q__NOTE(_F4 ) ,
99 Q__NOTE(_FS4 ) ,
100 Q__NOTE(_G4 ) ,
101 Q__NOTE(_GS4 ) ,
102 Q__NOTE(_A4 ) ,
103 Q__NOTE(_AS4 ) ,
104
105 Q__NOTE(_B1 ) ,
106
107 Q__NOTE(_C2 ) ,
108 Q__NOTE(_CS2 ) ,
109 Q__NOTE(_D2 ) ,
110 Q__NOTE(_DS2 ) ,
111 Q__NOTE(_E2 ) ,
112 Q__NOTE(_F2 ) ,
113 Q__NOTE(_FS2 ) ,
114 Q__NOTE(_G2 ) ,
115 Q__NOTE(_GS2 ) ,
116 Q__NOTE(_A2 ) ,
117 Q__NOTE(_AS2 ) ,
118 Q__NOTE(_B2 ) ,
119 Q__NOTE(_C3 ) ,
120 Q__NOTE(_CS3 ) ,
121 Q__NOTE(_D3 ) ,
122 Q__NOTE(_DS3 ) ,
123 Q__NOTE(_E3 ) ,
124 Q__NOTE(_F3 ) ,
125 Q__NOTE(_FS3 ) ,
126 Q__NOTE(_G3 ) ,
127 Q__NOTE(_GS3 ) ,
128 Q__NOTE(_A3 ) ,
129 Q__NOTE(_AS3 ) ,
130 Q__NOTE(_B3 ) ,
131 Q__NOTE(_C4 ) ,
132 Q__NOTE(_CS4 ) ,
133 Q__NOTE(_D4 ) ,
134 Q__NOTE(_DS4 ) ,
135 Q__NOTE(_E4 ) ,
136 Q__NOTE(_F4 ) ,
137 Q__NOTE(_FS4 ) ,
138 Q__NOTE(_G4 ) ,
139 Q__NOTE(_GS4 ) ,
140 Q__NOTE(_A4 ) ,
141 Q__NOTE(_AS4 ) ,
142 Q__NOTE(_B4 ) ,
143 Q__NOTE(_C5 ) ,
144 Q__NOTE(_CS5 ) ,
145 Q__NOTE(_D5 ) ,
146 Q__NOTE(_DS5 ) ,
147 Q__NOTE(_E5 ) ,
148 Q__NOTE(_F5 ) ,
149 Q__NOTE(_FS5 ) ,
150 Q__NOTE(_G5 ) ,
151 Q__NOTE(_GS5 ) ,
152 Q__NOTE(_A5 ) ,
153 Q__NOTE(_AS5 ) ,
154 Q__NOTE(_B5 ) ,
155 Q__NOTE(_C6 ) ,
156 Q__NOTE(_CS6 ) ,
157 Q__NOTE(_D6 ) ,
158 Q__NOTE(_DS6 ) ,
159 Q__NOTE(_E6 ) ,
160 Q__NOTE(_F6 ) ,
161 Q__NOTE(_FS6 ) ,
162 Q__NOTE(_G6 ) ,
163 Q__NOTE(_GS6 ) ,
164 Q__NOTE(_A6 ) ,
165 Q__NOTE(_AS6 ) ,
166 Q__NOTE(_B6 ) ,
167 Q__NOTE(_C7 ) ,
168 Q__NOTE(_CS7 ) ,
169 Q__NOTE(_D7 ) ,
170 Q__NOTE(_DS7 ) ,
171 Q__NOTE(_E7 ) ,
172 Q__NOTE(_F7 ) ,
173 Q__NOTE(_FS7 ) ,
174 Q__NOTE(_G7 ) ,
175 Q__NOTE(_GS7 ) ,
176 Q__NOTE(_A7 ) ,
177 Q__NOTE(_AS7 ) ,
178 Q__NOTE(_B7 ) ,
179 Q__NOTE(_C8 ) ,
180 Q__NOTE(_CS8 ) ,
181 Q__NOTE(_D8 ) ,
182 Q__NOTE(_DS8 ) ,
183 Q__NOTE(_E8 ) ,
184 Q__NOTE(_F8 ) ,
185 Q__NOTE(_FS8 ) ,
186 Q__NOTE(_G8 ) ,
187 Q__NOTE(_GS8 ) ,
188 Q__NOTE(_A8 ) ,
189 Q__NOTE(_AS8 ) ,
190 Q__NOTE(_B8 ) ,
191};
192 188
193float tone_rs[][2] = SONG(ROCK_A_BYE_BABY); 189float tone_qwerty[][2] = SONG(QWERTY_SOUND);
190float tone_dvorak[][2] = SONG(COLEMAK_SOUND);
191float tone_colemak[][2] = SONG(DVORAK_SOUND);
194 192
195void matrix_init_user(void) { 193float tone_audio_on[][2] = SONG(CLOSE_ENCOUNTERS_5_NOTE);
196 init_notes(); 194float tone_music_on[][2] = SONG(DOE_A_DEER);
197 PLAY_NOTE_ARRAY(start_up, false, STACCATO); 195float tone_caps_on[][2] = SONG(CAPS_LOCK_ON_SOUND);
198 println("Matrix Init"); 196float tone_caps_off[][2] = SONG(CAPS_LOCK_OFF_SOUND);
199} 197float tone_numlk_on[][2] = SONG(NUM_LOCK_ON_SOUND);
200 198float tone_numlk_off[][2] = SONG(NUM_LOCK_OFF_SOUND);
201#endif 199float tone_scroll_on[][2] = SONG(SCROLL_LOCK_ON_SOUND);
200float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
202 201
202#endif /* AUDIO_ENABLE */
203 203
204/*
204void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order) 205void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
205{ 206{
206 if (order) 207 if (order)
207 { 208 {
208 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) 209 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
209 { 210 {
210 layer_on(layer3); 211 layer_on(layer3);
211 } 212 }
212 else 213 else
213 { 214 {
214 layer_off(layer3); 215 layer_off(layer3);
215 layer_off(layer4); 216 layer_off(layer4);
216 } 217 }
217 } 218 }
218 else 219 else
219 { 220 {
220 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) 221 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2))
221 { 222 {
222 layer_on(layer4); 223 layer_on(layer4);
223 } 224 }
224 else 225 else
225 { 226 {
226 layer_off(layer3); 227 layer_off(layer3);
227 layer_off(layer4); 228 layer_off(layer4);
228 } 229 }
229 } 230 }
230} 231}
232*/
231 233
234void persistant_default_layer_set(uint16_t default_layer)
235{
236 eeconfig_write_default_layer(default_layer);
237 default_layer_set(default_layer);
238}
232 239
233const uint16_t PROGMEM fn_actions[] = { 240const uint16_t PROGMEM fn_actions[] = {
234}; 241};
235 242
236
237const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 243const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
238{ 244{
239 245
240 // MACRODOWN only works in this function 246 // MACRODOWN only works in this function
241 switch(id) 247 switch(id)
242 { 248 {
243 case M_LW: 249
244 if (record->event.pressed) { 250 case MACRO_QWERTY:
245 #ifdef AUDIO_ENABLE 251 if (record->event.pressed)
246 PLAY_NOTE_ARRAY(tone_lw, false, STACCATO); 252 {
247 #endif 253 persistant_default_layer_set(1UL<<LAYER_QWERTY);
248 layer_on(_LW); 254 PLAY_NOTE_ARRAY(tone_qwerty, false, STACCATO);
249 update_tri_layer(_LW, _RS, _AD); 255 }
250 } else { 256 break;
251 layer_off(_LW); 257
252 update_tri_layer(_LW, _RS, _AD); 258 case MACRO_COLEMAK:
253 } 259 if (record->event.pressed)
254 break; 260 {
255 case M_RS: 261 persistant_default_layer_set(1UL<<LAYER_COLEMAK);
256 if (record->event.pressed) { 262 PLAY_NOTE_ARRAY(tone_colemak, false, STACCATO);
257 #ifdef AUDIO_ENABLE 263 }
258 PLAY_NOTE_ARRAY(tone_rs, false, LEGATO); 264 break;
259 #endif 265
260 layer_on(_RS); 266 case MACRO_DVORAK:
261 update_tri_layer(_LW, _RS, _AD); 267 if (record->event.pressed)
262 } else { 268 {
263 layer_off(_RS); 269 persistant_default_layer_set(1UL<<LAYER_DVORAK);
264 update_tri_layer(_LW, _RS, _AD); 270 PLAY_NOTE_ARRAY(tone_dvorak, false, STACCATO);
265 } 271 }
266 break; 272 break;
267 273
268 case M_FN: 274
269 if (record->event.pressed) { 275 case MACRO_LOWER:
270 layer_on(_FN); 276 if (record->event.pressed)
271 } else { 277 {
272 layer_off(_FN); 278 layer_on(LAYER_LOWER);
273 } 279 update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
274 break; 280 }
275 281 else
276 case M_T1: 282 {
277 if (record->event.pressed) set_timbre(TIMBRE_12); 283 layer_off(LAYER_LOWER);
278 break; 284 update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
279 285 }
280 case M_T2: 286 break;
281 if (record->event.pressed) set_timbre(TIMBRE_25); 287
282 break; 288 case MACRO_RAISE:
283 289 if (record->event.pressed)
284 case M_T3: 290 {
285 if (record->event.pressed) set_timbre(TIMBRE_50); 291 layer_on(LAYER_RAISE);
286 break; 292 update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
287 293 }
288 case M_T4: 294 else
289 if (record->event.pressed) set_timbre(TIMBRE_75); 295 {
290 break; 296 layer_off(LAYER_RAISE);
291 297 update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
292 298 }
293 case M_TU: 299 break;
294 if (record->event.pressed) increase_tempo(10); 300
295 break; 301 case MACRO_FUNCTION:
296 302 if (record->event.pressed)
297 case M_TD: 303 {
298 if (record->event.pressed) decrease_tempo(10); 304 layer_on(LAYER_FUNCTION);
299 break; 305 }
300 306 else
301 case M_DF: 307 {
302 if (record->event.pressed) 308 layer_off(LAYER_FUNCTION);
303 { 309 }
304 set_timbre(TIMBRE_DEFAULT); 310 break;
305 set_tempo(TEMPO_DEFAULT); 311
306 } 312 case MACRO_TIMBRE_1:
307 break; 313 if (record->event.pressed) set_timbre(TIMBRE_12);
308 314 break;
309 default: 315
310 break; 316 case MACRO_TIMBRE_2:
311 317 if (record->event.pressed) set_timbre(TIMBRE_25);
312 } 318 break;
313 return MACRO_NONE; 319
314}; \ No newline at end of file 320 case MACRO_TIMBRE_3:
321 if (record->event.pressed) set_timbre(TIMBRE_50);
322 break;
323
324 case MACRO_TIMBRE_4:
325 if (record->event.pressed) set_timbre(TIMBRE_75);
326 break;
327
328 case MACRO_TEMPO_U:
329 if (record->event.pressed) increase_tempo(10);
330 break;
331
332 case MACRO_TEMPO_D:
333 if (record->event.pressed) decrease_tempo(10);
334 break;
335
336 case MACRO_TONE_DEFAULT:
337 if (record->event.pressed)
338 {
339 set_timbre(TIMBRE_DEFAULT);
340 set_tempo(TEMPO_DEFAULT);
341 }
342 break;
343
344 case MACRO_AUDIO_OFF:
345 if (record->event.pressed)
346 {
347 #ifdef AUDIO_ENABLE
348 audio_off();
349 #endif
350 }
351 break;
352
353 case MACRO_AUDIO_ON:
354 if (record->event.pressed)
355 {
356 #ifdef AUDIO_ENABLE
357 audio_on();
358 PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
359 #endif
360 }
361 break;
362
363 case MACRO_MUSIC_ON:
364 if (record->event.pressed)
365 {
366 #ifdef AUDIO_ENABLE
367 PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
368 layer_on(LAYER_MUSIC);
369 #endif
370 }
371 break;
372
373 case MACRO_MUSIC_OFF:
374 if (record->event.pressed)
375 {
376 #ifdef AUDIO_ENABLE
377 layer_off(LAYER_MUSIC);
378 stop_all_notes();
379 #endif
380 }
381 break;
382
383 default:
384 break;
385
386 }
387 return MACRO_NONE;
388};
389
390
391#ifdef AUDIO_ENABLE
392
393uint8_t starting_note = 0x0C;
394int offset = 7;
395
396
397void process_action_user(keyrecord_t *record)
398{
399 if (IS_LAYER_ON(LAYER_MUSIC))
400 {
401 if (record->event.pressed)
402 {
403 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);
404 }
405 else
406 {
407 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)));
408 }
409 }
410}
411
412
413void matrix_init_user(void)
414{
415 init_notes();
416 play_startup_tone();
417 println("Matrix Init");
418}
419
420void led_set_user(uint8_t usb_led)
421{
422 static uint8_t old_usb_led = 0;
423
424 if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
425 {
426 // If CAPS LK LED is turning on...
427 PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO);
428 }
429 else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
430 {
431 // If CAPS LK LED is turning off...
432 PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
433 }
434 else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
435 {
436 // If NUM LK LED is turning on...
437 PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO);
438 }
439 else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
440 {
441 // If NUM LED is turning off...
442 PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
443 }
444 else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
445 {
446 // If SCROLL LK LED is turning on...
447 PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO);
448 }
449 else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
450 {
451 // If SCROLL LED is turning off...
452 PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
453 }
454 old_usb_led = usb_led;
455}
456
457
458void play_startup_tone()
459{
460 PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
461}
462
463void play_goodbye_tone()
464{
465 PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
466 _delay_ms(2000);
467}
468
469#endif /* AUDIO_ENABLE */
diff --git a/keyboard/atomic/keymaps/pvc/makefile.mk b/keyboard/atomic/keymaps/pvc/makefile.mk
index d46996650..eefa42855 100644
--- a/keyboard/atomic/keymaps/pvc/makefile.mk
+++ b/keyboard/atomic/keymaps/pvc/makefile.mk
@@ -1,7 +1,7 @@
1BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) 1BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
2MOUSEKEY_ENABLE = yes # Mouse keys(+4700) 2MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
3EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 3EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
4CONSOLE_ENABLE = yes # Console for debug(+400) 4CONSOLE_ENABLE = no # Console for debug(+400)
5COMMAND_ENABLE = yes # Commands for debug and configuration 5COMMAND_ENABLE = yes # Commands for debug and configuration
6NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 6NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
7BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 7BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
diff --git a/keyboard/planck/keymaps/pvc_planck.c b/keyboard/planck/keymaps/pvc_planck.c
index 20bb5d86d..1de8acb1e 100644
--- a/keyboard/planck/keymaps/pvc_planck.c
+++ b/keyboard/planck/keymaps/pvc_planck.c
@@ -131,8 +131,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
131 */ 131 */
132[_FN] = { 132[_FN] = {
133 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, 133 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
134 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MG_H, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
135 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, 134 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
135 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
136 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} 136 {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
137} 137}
138}; 138};
@@ -142,16 +142,6 @@ const uint16_t PROGMEM fn_actions[] = {
142}; 142};
143 143
144 144
145int tri_layer = 0;
146void update_tri_layer(int layer) {
147 if (tri_layer > 1) {
148 layer_on(layer);
149 } else {
150 layer_off(layer);
151 }
152}
153
154
155const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 145const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
156{ 146{
157 // MACRODOWN only works in this function 147 // MACRODOWN only works in this function
@@ -161,13 +151,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
161 if (record->event.pressed) { 151 if (record->event.pressed) {
162 print("RS_DN"); 152 print("RS_DN");
163 layer_on(_RS); 153 layer_on(_RS);
164 tri_layer++; 154 update_tri_layer(_RS, _LW, _FN);
165 update_tri_layer(_FN);
166 } else { 155 } else {
167 print("RS_UP"); 156 print("RS_UP");
168 layer_off(_RS); 157 layer_off(_RS);
169 tri_layer--; 158 update_tri_layer(_RS, _LW, _FN);
170 update_tri_layer(_FN);
171 phex(layer_state); 159 phex(layer_state);
172 } 160 }
173 break; 161 break;
@@ -176,13 +164,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
176 if (record->event.pressed) { 164 if (record->event.pressed) {
177 print("LW_DN"); 165 print("LW_DN");
178 layer_on(_LW); 166 layer_on(_LW);
179 tri_layer++; 167 update_tri_layer(_RS, _LW, _FN);
180 update_tri_layer(_FN);
181 } else { 168 } else {
182 print("LW_UP"); 169 print("LW_UP");
183 layer_off(_LW); 170 layer_off(_LW);
184 tri_layer--; 171 update_tri_layer(_RS, _LW, _FN);
185 update_tri_layer(_FN);
186 } 172 }
187 break; 173 break;
188 174
diff --git a/keyboard/retro_refit/retro_refit.c b/keyboard/retro_refit/retro_refit.c
index 0b13eb830..78b6edca7 100644
--- a/keyboard/retro_refit/retro_refit.c
+++ b/keyboard/retro_refit/retro_refit.c
@@ -2,39 +2,39 @@
2 2
3__attribute__ ((weak)) 3__attribute__ ((weak))
4void matrix_init_user(void) { 4void matrix_init_user(void) {
5 // leave this function blank - it can be defined in a keymap file 5 // leave this function blank - it can be defined in a keymap file
6}; 6};
7 7
8__attribute__ ((weak)) 8__attribute__ ((weak))
9void matrix_scan_user(void) { 9void matrix_scan_user(void) {
10 // leave this function blank - it can be defined in a keymap file 10 // leave this function blank - it can be defined in a keymap file
11}; 11};
12 12
13__attribute__ ((weak)) 13__attribute__ ((weak))
14void led_set_user(uint8_t usb_led) { 14void led_set_user(uint8_t usb_led) {
15 // leave this function blank - it can be defined in a keymap file 15 // leave this function blank - it can be defined in a keymap file
16}; 16};
17 17
18void matrix_init_kb(void) { 18void matrix_init_kb(void) {
19 // put your keyboard start-up code here 19 // put your keyboard start-up code here
20 // runs once when the firmware starts up 20 // runs once when the firmware starts up
21 21
22 // Disable status LED on KB, enable status LED on Teensy (KB_STATUS = !TEENSY_STATUS) 22 // Disable status LED on KB, enable status LED on Teensy (KB_STATUS = !TEENSY_STATUS)
23 DDRD |= (1<<6); 23 DDRD |= (1<<6);
24 PORTD |= (1<<6); 24 PORTD |= (1<<6);
25 25
26 matrix_init_user(); 26 matrix_init_user();
27}; 27};
28 28
29void amatrix_scan_kb(void) { 29void amatrix_scan_kb(void) {
30 // put your looping keyboard code here 30 // put your looping keyboard code here
31 // runs every cycle (a lot) 31 // runs every cycle (a lot)
32 32
33 matrix_scan_user(); 33 matrix_scan_user();
34}; 34};
35 35
36void led_set_kb(uint8_t usb_led) { 36void led_set_kb(uint8_t usb_led) {
37 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here 37 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
38 38
39 if (usb_led & (1<<USB_LED_CAPS_LOCK)) { 39 if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
40 // output low 40 // output low
@@ -62,7 +62,7 @@ void led_set_kb(uint8_t usb_led) {
62 // Hi-Z 62 // Hi-Z
63 DDRC &= ~(1<<6); 63 DDRC &= ~(1<<6);
64 PORTC &= ~(1<<6); 64 PORTC &= ~(1<<6);
65 } 65 }
66 66
67 led_set_user(usb_led); 67 led_set_user(usb_led);
68}; \ No newline at end of file 68}; \ No newline at end of file
diff --git a/quantum/audio.c b/quantum/audio.c
index e0413051a..627e3d80a 100644
--- a/quantum/audio.c
+++ b/quantum/audio.c
@@ -351,6 +351,7 @@ void play_notes(float (*np)[][2], uint8_t n_count, bool n_repeat, float n_rest)
351 351
352if (audio_config.enable) { 352if (audio_config.enable) {
353 353
354 // Cancel note if a note is playing
354 if (note) 355 if (note)
355 stop_all_notes(); 356 stop_all_notes();
356 notes = true; 357 notes = true;
@@ -406,6 +407,7 @@ void play_note(double freq, int vol) {
406 407
407if (audio_config.enable && voices < 8) { 408if (audio_config.enable && voices < 8) {
408 409
410 // Cancel notes if notes are playing
409 if (notes) 411 if (notes)
410 stop_all_notes(); 412 stop_all_notes();
411 note = true; 413 note = true;
@@ -471,3 +473,16 @@ void increase_tempo(uint8_t tempo_change)
471 } 473 }
472} 474}
473 475
476//------------------------------------------------------------------------------
477// Override these functions in your keymap file to play different tunes on
478// startup and bootloader jump
479__attribute__ ((weak))
480void play_startup_tone()
481{
482}
483
484__attribute__ ((weak))
485void play_goodbye_tone()
486{
487}
488//------------------------------------------------------------------------------
diff --git a/quantum/audio.h b/quantum/audio.h
index 05d314c94..44cafccd6 100644
--- a/quantum/audio.h
+++ b/quantum/audio.h
@@ -44,5 +44,7 @@ void decrease_tempo(uint8_t tempo_change);
44#define NOTE_ARRAY_SIZE(x) ((int)(sizeof(x) / (sizeof(x[0])))) 44#define NOTE_ARRAY_SIZE(x) ((int)(sizeof(x) / (sizeof(x[0]))))
45#define PLAY_NOTE_ARRAY(note_array, note_repeat, note_rest_style) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat), (note_rest_style)); 45#define PLAY_NOTE_ARRAY(note_array, note_repeat, note_rest_style) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat), (note_rest_style));
46 46
47void play_goodbye_tone(void);
48void play_startup_tone(void);
47 49
48#endif \ No newline at end of file 50#endif \ No newline at end of file
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 2001438b9..4ee290ad0 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -34,12 +34,6 @@ extern keymap_config_t keymap_config;
34#include <inttypes.h> 34#include <inttypes.h>
35#ifdef AUDIO_ENABLE 35#ifdef AUDIO_ENABLE
36 #include "audio.h" 36 #include "audio.h"
37
38 #ifndef TONE_GOODBYE
39 #define TONE_GOODBYE OLKB_GOODBYE
40 #endif /*! TONE_GOODBYE */
41
42 float tone_goodbye[][2] = SONG(TONE_GOODBYE);
43#endif /* AUDIO_ENABLE */ 37#endif /* AUDIO_ENABLE */
44 38
45static action_t keycode_to_action(uint16_t keycode); 39static action_t keycode_to_action(uint16_t keycode);
@@ -47,7 +41,7 @@ static action_t keycode_to_action(uint16_t keycode);
47/* converts key to action */ 41/* converts key to action */
48action_t action_for_key(uint8_t layer, keypos_t key) 42action_t action_for_key(uint8_t layer, keypos_t key)
49{ 43{
50 // 16bit keycodes - important 44 // 16bit keycodes - important
51 uint16_t keycode = keymap_key_to_keycode(layer, key); 45 uint16_t keycode = keymap_key_to_keycode(layer, key);
52 46
53 switch (keycode) { 47 switch (keycode) {
@@ -190,7 +184,7 @@ static action_t keycode_to_action(uint16_t keycode)
190 case RESET: ; // RESET is 0x5000, which is why this is here 184 case RESET: ; // RESET is 0x5000, which is why this is here
191 clear_keyboard(); 185 clear_keyboard();
192 #ifdef AUDIO_ENABLE 186 #ifdef AUDIO_ENABLE
193 PLAY_NOTE_ARRAY(tone_goodbye, false, 0); 187 play_goodbye_tone();
194 #endif 188 #endif
195 _delay_ms(250); 189 _delay_ms(250);
196 #ifdef ATREUS_ASTAR 190 #ifdef ATREUS_ASTAR
@@ -303,7 +297,7 @@ static action_t keycode_to_action(uint16_t keycode)
303/* translates key to keycode */ 297/* translates key to keycode */
304uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) 298uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
305{ 299{
306 // Read entire word (16bits) 300 // Read entire word (16bits)
307 return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]); 301 return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]);
308} 302}
309 303
@@ -315,7 +309,7 @@ action_t keymap_fn_to_action(uint16_t keycode)
315 309
316action_t keymap_func_to_action(uint16_t keycode) 310action_t keymap_func_to_action(uint16_t keycode)
317{ 311{
318 // For FUNC without 8bit limit 312 // For FUNC without 8bit limit
319 return (action_t){ .code = pgm_read_word(&fn_actions[(int)keycode]) }; 313 return (action_t){ .code = pgm_read_word(&fn_actions[(int)keycode]) };
320} 314}
321 315
diff --git a/quantum/musical_notes.h b/quantum/musical_notes.h
index ccdc34f27..b08d16a6f 100644
--- a/quantum/musical_notes.h
+++ b/quantum/musical_notes.h
@@ -51,7 +51,10 @@
51 51
52 52
53// Notes - # = Octave 53// Notes - # = Octave
54
54#define NOTE_REST 0.00 55#define NOTE_REST 0.00
56
57/* These notes are currently bugged
55#define NOTE_C0 16.35 58#define NOTE_C0 16.35
56#define NOTE_CS0 17.32 59#define NOTE_CS0 17.32
57#define NOTE_D0 18.35 60#define NOTE_D0 18.35
@@ -75,6 +78,8 @@
75#define NOTE_GS1 51.91 78#define NOTE_GS1 51.91
76#define NOTE_A1 55.00 79#define NOTE_A1 55.00
77#define NOTE_AS1 58.27 80#define NOTE_AS1 58.27
81*/
82
78#define NOTE_B1 61.74 83#define NOTE_B1 61.74
79#define NOTE_C2 65.41 84#define NOTE_C2 65.41
80#define NOTE_CS2 69.30 85#define NOTE_CS2 69.30
diff --git a/quantum/song_list.h b/quantum/song_list.h
index b626c3fa6..e992bd18a 100644
--- a/quantum/song_list.h
+++ b/quantum/song_list.h
@@ -4,20 +4,98 @@
4#define SONG_LIST_H 4#define SONG_LIST_H
5 5
6#define ODE_TO_JOY \ 6#define ODE_TO_JOY \
7 Q__NOTE(_E4), Q__NOTE(_E4), Q__NOTE(_F4), Q__NOTE(_G4), \ 7 Q__NOTE(_E4), Q__NOTE(_E4), Q__NOTE(_F4), Q__NOTE(_G4), \
8 Q__NOTE(_G4), Q__NOTE(_F4), Q__NOTE(_E4), Q__NOTE(_D4), \ 8 Q__NOTE(_G4), Q__NOTE(_F4), Q__NOTE(_E4), Q__NOTE(_D4), \
9 Q__NOTE(_C4), Q__NOTE(_C4), Q__NOTE(_D4), Q__NOTE(_E4), \ 9 Q__NOTE(_C4), Q__NOTE(_C4), Q__NOTE(_D4), Q__NOTE(_E4), \
10 QD_NOTE(_E4), E__NOTE(_D4), H__NOTE(_D4), 10 QD_NOTE(_E4), E__NOTE(_D4), H__NOTE(_D4),
11 11
12#define ROCK_A_BYE_BABY \ 12#define ROCK_A_BYE_BABY \
13 QD_NOTE(_B4), E__NOTE(_D4), Q__NOTE(_B5), \ 13 QD_NOTE(_B4), E__NOTE(_D4), Q__NOTE(_B5), \
14 H__NOTE(_A5), Q__NOTE(_G5), \ 14 H__NOTE(_A5), Q__NOTE(_G5), \
15 QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5), \ 15 QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5), \
16 H__NOTE(_FS5), 16 H__NOTE(_FS5),
17 17
18#define OLKB_GOODBYE \ 18#define CLOSE_ENCOUNTERS_5_NOTE \
19 E__NOTE(_E7), \ 19 Q__NOTE(_D5), \
20 E__NOTE(_A6), \ 20 Q__NOTE(_E5), \
21 ED_NOTE(_E6), 21 Q__NOTE(_C5), \
22 Q__NOTE(_C4), \
23 Q__NOTE(_G4),
24
25#define DOE_A_DEER \
26 QD_NOTE(_C4), E__NOTE(_D4), \
27 QD_NOTE(_E4), E__NOTE(_C4), \
28 Q__NOTE(_E4), Q__NOTE(_C4), \
29 Q__NOTE(_E4),
30
31#define GOODBYE_SOUND \
32 E__NOTE(_E7), \
33 E__NOTE(_A6), \
34 ED_NOTE(_E6),
35
36#define STARTUP_SOUND \
37 ED_NOTE(_E7 ), \
38 E__NOTE(_CS7), \
39 E__NOTE(_E6 ), \
40 E__NOTE(_A6 ), \
41 M__NOTE(_CS7, 20),
42
43#define QWERTY_SOUND \
44 E__NOTE(_GS6 ), \
45 E__NOTE(_A6 ), \
46 S__NOTE(_REST), \
47 Q__NOTE(_E7 ),
48
49#define COLEMAK_SOUND \
50 E__NOTE(_GS6 ), \
51 E__NOTE(_A6 ), \
52 S__NOTE(_REST), \
53 ED_NOTE(_E7 ), \
54 S__NOTE(_REST), \
55 ED_NOTE(_GS7 ),
56
57#define DVORAK_SOUND \
58 E__NOTE(_GS6 ), \
59 E__NOTE(_A6 ), \
60 S__NOTE(_REST), \
61 E__NOTE(_E7 ), \
62 S__NOTE(_REST), \
63 E__NOTE(_FS7 ), \
64 S__NOTE(_REST), \
65 E__NOTE(_E7 ),
66
67#define MUSIC_SCALE_SOUND \
68 E__NOTE(_A5 ), \
69 E__NOTE(_B5 ), \
70 E__NOTE(_CS6), \
71 E__NOTE(_D6 ), \
72 E__NOTE(_E6 ), \
73 E__NOTE(_FS6), \
74 E__NOTE(_GS6), \
75 E__NOTE(_A6 ),
76
77#define CAPS_LOCK_ON_SOUND \
78 E__NOTE(_A3), \
79 E__NOTE(_B3),
80
81#define CAPS_LOCK_OFF_SOUND \
82 E__NOTE(_B3), \
83 E__NOTE(_A3),
84
85#define SCROLL_LOCK_ON_SOUND \
86 E__NOTE(_D4), \
87 E__NOTE(_E4),
88
89#define SCROLL_LOCK_OFF_SOUND \
90 E__NOTE(_E4), \
91 E__NOTE(_D4),
92
93#define NUM_LOCK_ON_SOUND \
94 E__NOTE(_D5), \
95 E__NOTE(_E5),
96
97#define NUM_LOCK_OFF_SOUND \
98 E__NOTE(_E5), \
99 E__NOTE(_D5),
22 100
23#endif 101#endif
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index c07c2801d..e295dbe18 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -9,10 +9,16 @@
9#include "suspend.h" 9#include "suspend.h"
10#include "timer.h" 10#include "timer.h"
11#include "led.h" 11#include "led.h"
12
12#ifdef PROTOCOL_LUFA 13#ifdef PROTOCOL_LUFA
13#include "lufa.h" 14 #include "lufa.h"
14#endif 15#endif
15 16
17#ifdef AUDIO_ENABLE
18 #include "audio.h"
19#endif /* AUDIO_ENABLE */
20
21
16 22
17#define wdt_intr_enable(value) \ 23#define wdt_intr_enable(value) \
18__asm__ __volatile__ ( \ 24__asm__ __volatile__ ( \
@@ -72,6 +78,10 @@ static void power_down(uint8_t wdto)
72 // Turn off LED indicators 78 // Turn off LED indicators
73 led_set(0); 79 led_set(0);
74 80
81 #ifdef AUDIO_ENABLE
82 stop_all_notes();
83 #endif /* AUDIO_ENABLE */
84
75 // TODO: more power saving 85 // TODO: more power saving
76 // See PicoPower application note 86 // See PicoPower application note
77 // - I/O port input with pullup 87 // - I/O port input with pullup
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index 7572b9597..f06abaf7f 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -49,6 +49,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
49# include "usbdrv.h" 49# include "usbdrv.h"
50#endif 50#endif
51 51
52#ifdef AUDIO_ENABLE
53 #include "audio.h"
54#endif /* AUDIO_ENABLE */
55
52 56
53static bool command_common(uint8_t code); 57static bool command_common(uint8_t code);
54static void command_common_help(void); 58static void command_common_help(void);
@@ -352,6 +356,9 @@ static bool command_common(uint8_t code)
352 case MAGIC_KC(MAGIC_KEY_BOOTLOADER): 356 case MAGIC_KC(MAGIC_KEY_BOOTLOADER):
353 clear_keyboard(); // clear to prevent stuck keys 357 clear_keyboard(); // clear to prevent stuck keys
354 print("\n\nJumping to bootloader... "); 358 print("\n\nJumping to bootloader... ");
359 #ifdef AUDIO_ENABLE
360 play_goodbye_tone();
361 #endif
355 _delay_ms(1000); 362 _delay_ms(1000);
356 bootloader_jump(); // not return 363 bootloader_jump(); // not return
357 break; 364 break;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 08:57:34 +0000