diff options
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/api.c | 43 | ||||
| -rw-r--r-- | quantum/api/api_sysex.c | 60 | ||||
| -rw-r--r-- | quantum/audio/audio.c | 15 | ||||
| -rw-r--r-- | quantum/audio/voices.c | 102 | ||||
| -rw-r--r-- | quantum/audio/voices.h | 3 | ||||
| -rw-r--r-- | quantum/config_common.h | 2 | ||||
| -rw-r--r-- | quantum/keymap.h | 313 | ||||
| -rw-r--r-- | quantum/keymap_common.c | 16 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_br_abnt2.h | 16 | ||||
| -rwxr-xr-x | quantum/light_ws2812.h | 7 | ||||
| -rw-r--r-- | quantum/process_keycode/process_music.c | 12 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 7 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 1 | ||||
| -rw-r--r-- | quantum/process_keycode/process_unicode.c | 52 | ||||
| -rw-r--r-- | quantum/quantum.c | 34 | ||||
| -rw-r--r-- | quantum/quantum_keycodes.h | 317 | ||||
| -rw-r--r-- | quantum/rgblight.c | 22 | ||||
| -rw-r--r-- | quantum/rgblight.h | 5 | ||||
| -rw-r--r-- | quantum/visualizer/visualizer.c | 58 | ||||
| -rw-r--r-- | quantum/visualizer/visualizer.h | 9 |
20 files changed, 713 insertions, 381 deletions
diff --git a/quantum/api.c b/quantum/api.c index 4ca3b9676..6a7c0a433 100644 --- a/quantum/api.c +++ b/quantum/api.c | |||
| @@ -116,28 +116,29 @@ void process_api(uint16_t length, uint8_t * data) { | |||
| 116 | MT_GET_DATA_ACK(DT_KEYMAP_SIZE, keymap_size, 2); | 116 | MT_GET_DATA_ACK(DT_KEYMAP_SIZE, keymap_size, 2); |
| 117 | break; | 117 | break; |
| 118 | } | 118 | } |
| 119 | case DT_KEYMAP: { | 119 | // This may be too much |
| 120 | uint8_t keymap_data[MATRIX_ROWS * MATRIX_COLS * 4 + 3]; | 120 | // case DT_KEYMAP: { |
| 121 | keymap_data[0] = data[2]; | 121 | // uint8_t keymap_data[MATRIX_ROWS * MATRIX_COLS * 4 + 3]; |
| 122 | keymap_data[1] = MATRIX_ROWS; | 122 | // keymap_data[0] = data[2]; |
| 123 | keymap_data[2] = MATRIX_COLS; | 123 | // keymap_data[1] = MATRIX_ROWS; |
| 124 | for (int i = 0; i < MATRIX_ROWS; i++) { | 124 | // keymap_data[2] = MATRIX_COLS; |
| 125 | for (int j = 0; j < MATRIX_COLS; j++) { | 125 | // for (int i = 0; i < MATRIX_ROWS; i++) { |
| 126 | keymap_data[3 + (i*MATRIX_COLS*2) + (j*2)] = pgm_read_word(&keymaps[data[2]][i][j]) >> 8; | 126 | // for (int j = 0; j < MATRIX_COLS; j++) { |
| 127 | keymap_data[3 + (i*MATRIX_COLS*2) + (j*2) + 1] = pgm_read_word(&keymaps[data[2]][i][j]) & 0xFF; | 127 | // keymap_data[3 + (i*MATRIX_COLS*2) + (j*2)] = pgm_read_word(&keymaps[data[2]][i][j]) >> 8; |
| 128 | } | 128 | // keymap_data[3 + (i*MATRIX_COLS*2) + (j*2) + 1] = pgm_read_word(&keymaps[data[2]][i][j]) & 0xFF; |
| 129 | } | 129 | // } |
| 130 | MT_GET_DATA_ACK(DT_KEYMAP, keymap_data, MATRIX_ROWS * MATRIX_COLS * 4 + 3); | 130 | // } |
| 131 | // uint8_t keymap_data[5]; | 131 | // MT_GET_DATA_ACK(DT_KEYMAP, keymap_data, MATRIX_ROWS * MATRIX_COLS * 4 + 3); |
| 132 | // keymap_data[0] = data[2]; | 132 | // // uint8_t keymap_data[5]; |
| 133 | // keymap_data[1] = data[3]; | 133 | // // keymap_data[0] = data[2]; |
| 134 | // keymap_data[2] = data[4]; | 134 | // // keymap_data[1] = data[3]; |
| 135 | // keymap_data[3] = pgm_read_word(&keymaps[data[2]][data[3]][data[4]]) >> 8; | 135 | // // keymap_data[2] = data[4]; |
| 136 | // keymap_data[4] = pgm_read_word(&keymaps[data[2]][data[3]][data[4]]) & 0xFF; | 136 | // // keymap_data[3] = pgm_read_word(&keymaps[data[2]][data[3]][data[4]]) >> 8; |
| 137 | // // keymap_data[4] = pgm_read_word(&keymaps[data[2]][data[3]][data[4]]) & 0xFF; | ||
| 137 | 138 | ||
| 138 | // MT_GET_DATA_ACK(DT_KEYMAP, keymap_data, 5); | 139 | // // MT_GET_DATA_ACK(DT_KEYMAP, keymap_data, 5); |
| 139 | break; | 140 | // break; |
| 140 | } | 141 | // } |
| 141 | default: | 142 | default: |
| 142 | break; | 143 | break; |
| 143 | } | 144 | } |
diff --git a/quantum/api/api_sysex.c b/quantum/api/api_sysex.c index a4a554e76..868f854b9 100644 --- a/quantum/api/api_sysex.c +++ b/quantum/api/api_sysex.c | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | #include "api_sysex.h" | 1 | #include "api_sysex.h" |
| 2 | #include "sysex_tools.h" | ||
| 3 | #include "print.h" | ||
| 2 | 4 | ||
| 3 | void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, uint16_t length) { | 5 | void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, uint16_t length) { |
| 4 | // SEND_STRING("\nTX: "); | 6 | // SEND_STRING("\nTX: "); |
| @@ -6,24 +8,50 @@ void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, | |||
| 6 | // send_byte(bytes[i]); | 8 | // send_byte(bytes[i]); |
| 7 | // SEND_STRING(" "); | 9 | // SEND_STRING(" "); |
| 8 | // } | 10 | // } |
| 9 | uint8_t * precode = malloc(sizeof(uint8_t) * (length + 2)); | 11 | if (length > API_SYSEX_MAX_SIZE) { |
| 10 | precode[0] = message_type; | 12 | xprintf("Sysex msg too big %d %d %d", message_type, data_type, length); |
| 11 | precode[1] = data_type; | 13 | return; |
| 12 | memcpy(precode + 2, bytes, length); | 14 | } |
| 13 | uint8_t * encoded = malloc(sizeof(uint8_t) * (sysex_encoded_length(length + 2))); | 15 | |
| 14 | uint16_t encoded_length = sysex_encode(encoded, precode, length + 2); | 16 | |
| 15 | uint8_t * array = malloc(sizeof(uint8_t) * (encoded_length + 5)); | 17 | // The buffer size required is calculated as the following |
| 16 | array[0] = 0xF0; | 18 | // API_SYSEX_MAX_SIZE is the maximum length |
| 17 | array[1] = 0x00; | 19 | // In addition to that we have a two byte message header consisting of the message_type and data_type |
| 18 | array[2] = 0x00; | 20 | // This has to be encoded with an additional overhead of one byte for every starting 7 bytes |
| 19 | array[3] = 0x00; | 21 | // We just add one extra byte in case it's not divisible by 7 |
| 20 | array[encoded_length + 4] = 0xF7; | 22 | // Then we have an unencoded header consisting of 4 bytes |
| 21 | memcpy(array + 4, encoded, encoded_length); | 23 | // Plus a one byte terminator |
| 22 | midi_send_array(&midi_device, encoded_length + 5, array); | 24 | const unsigned message_header = 2; |
| 25 | const unsigned unencoded_message = API_SYSEX_MAX_SIZE + message_header; | ||
| 26 | const unsigned encoding_overhead = unencoded_message / 7 + 1; | ||
| 27 | const unsigned encoded_size = unencoded_message + encoding_overhead; | ||
| 28 | const unsigned unencoded_header = 4; | ||
| 29 | const unsigned terminator = 1; | ||
| 30 | const unsigned buffer_size = encoded_size + unencoded_header + terminator; | ||
| 31 | uint8_t buffer[encoded_size + unencoded_header + terminator]; | ||
| 32 | // The unencoded header | ||
| 33 | buffer[0] = 0xF0; | ||
| 34 | buffer[1] = 0x00; | ||
| 35 | buffer[2] = 0x00; | ||
| 36 | buffer[3] = 0x00; | ||
| 37 | |||
| 38 | // We copy the message to the end of the array, this way we can do an inplace encoding, using the same | ||
| 39 | // buffer for both input and output | ||
| 40 | const unsigned message_size = length + message_header; | ||
| 41 | uint8_t* unencoded_start = buffer + buffer_size - message_size; | ||
| 42 | uint8_t* ptr = unencoded_start; | ||
| 43 | *(ptr++) = message_type; | ||
| 44 | *(ptr++) = data_type; | ||
| 45 | memcpy(ptr, bytes, length); | ||
| 46 | |||
| 47 | unsigned encoded_length = sysex_encode(buffer + unencoded_header, unencoded_start, message_size); | ||
| 48 | unsigned final_size = unencoded_header + encoded_length + terminator; | ||
| 49 | buffer[final_size - 1] = 0xF7; | ||
| 50 | midi_send_array(&midi_device, final_size, buffer); | ||
| 23 | 51 | ||
| 24 | // SEND_STRING("\nTD: "); | 52 | // SEND_STRING("\nTD: "); |
| 25 | // for (uint8_t i = 0; i < encoded_length + 5; i++) { | 53 | // for (uint8_t i = 0; i < encoded_length + 5; i++) { |
| 26 | // send_byte(array[i]); | 54 | // send_byte(buffer[i]); |
| 27 | // SEND_STRING(" "); | 55 | // SEND_STRING(" "); |
| 28 | // } | 56 | // } |
| 29 | } \ No newline at end of file | 57 | } |
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c index ead5fbf3e..2a315fd16 100644 --- a/quantum/audio/audio.c +++ b/quantum/audio/audio.c | |||
| @@ -77,6 +77,7 @@ static bool audio_initialized = false; | |||
| 77 | audio_config_t audio_config; | 77 | audio_config_t audio_config; |
| 78 | 78 | ||
| 79 | uint16_t envelope_index = 0; | 79 | uint16_t envelope_index = 0; |
| 80 | bool glissando = true; | ||
| 80 | 81 | ||
| 81 | void audio_init() | 82 | void audio_init() |
| 82 | { | 83 | { |
| @@ -205,13 +206,17 @@ ISR(TIMER3_COMPA_vect) | |||
| 205 | freq = frequencies[voice_place]; | 206 | freq = frequencies[voice_place]; |
| 206 | #endif | 207 | #endif |
| 207 | } else { | 208 | } else { |
| 208 | if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) { | 209 | if (glissando) { |
| 209 | frequency = frequency * pow(2, 440/frequency/12/2); | 210 | if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) { |
| 210 | } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) { | 211 | frequency = frequency * pow(2, 440/frequency/12/2); |
| 211 | frequency = frequency * pow(2, -440/frequency/12/2); | 212 | } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) { |
| 213 | frequency = frequency * pow(2, -440/frequency/12/2); | ||
| 214 | } else { | ||
| 215 | frequency = frequencies[voices - 1]; | ||
| 216 | } | ||
| 212 | } else { | 217 | } else { |
| 213 | frequency = frequencies[voices - 1]; | 218 | frequency = frequencies[voices - 1]; |
| 214 | } | 219 | } |
| 215 | 220 | ||
| 216 | #ifdef VIBRATO_ENABLE | 221 | #ifdef VIBRATO_ENABLE |
| 217 | if (vibrato_strength > 0) { | 222 | if (vibrato_strength > 0) { |
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c index 19f7b646e..8326e91ea 100644 --- a/quantum/audio/voices.c +++ b/quantum/audio/voices.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | extern uint16_t envelope_index; | 6 | extern uint16_t envelope_index; |
| 7 | extern float note_timbre; | 7 | extern float note_timbre; |
| 8 | extern float polyphony_rate; | 8 | extern float polyphony_rate; |
| 9 | extern bool glissando; | ||
| 9 | 10 | ||
| 10 | voice_type voice = default_voice; | 11 | voice_type voice = default_voice; |
| 11 | 12 | ||
| @@ -27,11 +28,15 @@ float voice_envelope(float frequency) { | |||
| 27 | 28 | ||
| 28 | switch (voice) { | 29 | switch (voice) { |
| 29 | case default_voice: | 30 | case default_voice: |
| 31 | glissando = true; | ||
| 30 | note_timbre = TIMBRE_50; | 32 | note_timbre = TIMBRE_50; |
| 31 | polyphony_rate = 0; | 33 | polyphony_rate = 0; |
| 32 | break; | 34 | break; |
| 33 | 35 | ||
| 36 | #ifdef AUDIO_VOICES | ||
| 37 | |||
| 34 | case something: | 38 | case something: |
| 39 | glissando = false; | ||
| 35 | polyphony_rate = 0; | 40 | polyphony_rate = 0; |
| 36 | switch (compensated_index) { | 41 | switch (compensated_index) { |
| 37 | case 0 ... 9: | 42 | case 0 ... 9: |
| @@ -43,16 +48,102 @@ float voice_envelope(float frequency) { | |||
| 43 | break; | 48 | break; |
| 44 | 49 | ||
| 45 | case 20 ... 200: | 50 | case 20 ... 200: |
| 46 | note_timbre = .25 + .125 + pow(((float)compensated_index - 20) / (200 - 20), 2)*.125; | 51 | note_timbre = .125 + .125; |
| 47 | break; | 52 | break; |
| 48 | 53 | ||
| 49 | default: | 54 | default: |
| 50 | note_timbre = .25; | 55 | note_timbre = .125; |
| 51 | break; | 56 | break; |
| 52 | } | 57 | } |
| 53 | break; | 58 | break; |
| 54 | 59 | ||
| 60 | case drums: | ||
| 61 | glissando = false; | ||
| 62 | polyphony_rate = 0; | ||
| 63 | // switch (compensated_index) { | ||
| 64 | // case 0 ... 10: | ||
| 65 | // note_timbre = 0.5; | ||
| 66 | // break; | ||
| 67 | // case 11 ... 20: | ||
| 68 | // note_timbre = 0.5 * (21 - compensated_index) / 10; | ||
| 69 | // break; | ||
| 70 | // default: | ||
| 71 | // note_timbre = 0; | ||
| 72 | // break; | ||
| 73 | // } | ||
| 74 | // frequency = (rand() % (int)(frequency * 1.2 - frequency)) + (frequency * 0.8); | ||
| 75 | |||
| 76 | if (frequency < 80.0) { | ||
| 77 | |||
| 78 | } else if (frequency < 160.0) { | ||
| 79 | |||
| 80 | // Bass drum: 60 - 100 Hz | ||
| 81 | frequency = (rand() % (int)(40)) + 60; | ||
| 82 | switch (envelope_index) { | ||
| 83 | case 0 ... 10: | ||
| 84 | note_timbre = 0.5; | ||
| 85 | break; | ||
| 86 | case 11 ... 20: | ||
| 87 | note_timbre = 0.5 * (21 - envelope_index) / 10; | ||
| 88 | break; | ||
| 89 | default: | ||
| 90 | note_timbre = 0; | ||
| 91 | break; | ||
| 92 | } | ||
| 93 | |||
| 94 | } else if (frequency < 320.0) { | ||
| 95 | |||
| 96 | |||
| 97 | // Snare drum: 1 - 2 KHz | ||
| 98 | frequency = (rand() % (int)(1000)) + 1000; | ||
| 99 | switch (envelope_index) { | ||
| 100 | case 0 ... 5: | ||
| 101 | note_timbre = 0.5; | ||
| 102 | break; | ||
| 103 | case 6 ... 20: | ||
| 104 | note_timbre = 0.5 * (21 - envelope_index) / 15; | ||
| 105 | break; | ||
| 106 | default: | ||
| 107 | note_timbre = 0; | ||
| 108 | break; | ||
| 109 | } | ||
| 110 | |||
| 111 | } else if (frequency < 640.0) { | ||
| 112 | |||
| 113 | // Closed Hi-hat: 3 - 5 KHz | ||
| 114 | frequency = (rand() % (int)(2000)) + 3000; | ||
| 115 | switch (envelope_index) { | ||
| 116 | case 0 ... 15: | ||
| 117 | note_timbre = 0.5; | ||
| 118 | break; | ||
| 119 | case 16 ... 20: | ||
| 120 | note_timbre = 0.5 * (21 - envelope_index) / 5; | ||
| 121 | break; | ||
| 122 | default: | ||
| 123 | note_timbre = 0; | ||
| 124 | break; | ||
| 125 | } | ||
| 126 | |||
| 127 | } else if (frequency < 1280.0) { | ||
| 128 | |||
| 129 | // Open Hi-hat: 3 - 5 KHz | ||
| 130 | frequency = (rand() % (int)(2000)) + 3000; | ||
| 131 | switch (envelope_index) { | ||
| 132 | case 0 ... 35: | ||
| 133 | note_timbre = 0.5; | ||
| 134 | break; | ||
| 135 | case 36 ... 50: | ||
| 136 | note_timbre = 0.5 * (51 - envelope_index) / 15; | ||
| 137 | break; | ||
| 138 | default: | ||
| 139 | note_timbre = 0; | ||
| 140 | break; | ||
| 141 | } | ||
| 142 | |||
| 143 | } | ||
| 144 | break; | ||
| 55 | case butts_fader: | 145 | case butts_fader: |
| 146 | glissando = true; | ||
| 56 | polyphony_rate = 0; | 147 | polyphony_rate = 0; |
| 57 | switch (compensated_index) { | 148 | switch (compensated_index) { |
| 58 | case 0 ... 9: | 149 | case 0 ... 9: |
| @@ -100,6 +191,7 @@ float voice_envelope(float frequency) { | |||
| 100 | 191 | ||
| 101 | case duty_osc: | 192 | case duty_osc: |
| 102 | // This slows the loop down a substantial amount, so higher notes may freeze | 193 | // This slows the loop down a substantial amount, so higher notes may freeze |
| 194 | glissando = true; | ||
| 103 | polyphony_rate = 0; | 195 | polyphony_rate = 0; |
| 104 | switch (compensated_index) { | 196 | switch (compensated_index) { |
| 105 | default: | 197 | default: |
| @@ -114,6 +206,7 @@ float voice_envelope(float frequency) { | |||
| 114 | break; | 206 | break; |
| 115 | 207 | ||
| 116 | case duty_octave_down: | 208 | case duty_octave_down: |
| 209 | glissando = true; | ||
| 117 | polyphony_rate = 0; | 210 | polyphony_rate = 0; |
| 118 | note_timbre = (envelope_index % 2) * .125 + .375 * 2; | 211 | note_timbre = (envelope_index % 2) * .125 + .375 * 2; |
| 119 | if ((envelope_index % 4) == 0) | 212 | if ((envelope_index % 4) == 0) |
| @@ -122,6 +215,7 @@ float voice_envelope(float frequency) { | |||
| 122 | note_timbre = 0; | 215 | note_timbre = 0; |
| 123 | break; | 216 | break; |
| 124 | case delayed_vibrato: | 217 | case delayed_vibrato: |
| 218 | glissando = true; | ||
| 125 | polyphony_rate = 0; | 219 | polyphony_rate = 0; |
| 126 | note_timbre = TIMBRE_50; | 220 | note_timbre = TIMBRE_50; |
| 127 | #define VOICE_VIBRATO_DELAY 150 | 221 | #define VOICE_VIBRATO_DELAY 150 |
| @@ -176,11 +270,11 @@ float voice_envelope(float frequency) { | |||
| 176 | // note_timbre = 0.25; | 270 | // note_timbre = 0.25; |
| 177 | // break; | 271 | // break; |
| 178 | 272 | ||
| 273 | #endif | ||
| 274 | |||
| 179 | default: | 275 | default: |
| 180 | break; | 276 | break; |
| 181 | } | 277 | } |
| 182 | 278 | ||
| 183 | return frequency; | 279 | return frequency; |
| 184 | } | 280 | } |
| 185 | |||
| 186 | |||
diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h index b43def3d7..52f7e006d 100644 --- a/quantum/audio/voices.h +++ b/quantum/audio/voices.h | |||
| @@ -11,7 +11,9 @@ float voice_envelope(float frequency); | |||
| 11 | 11 | ||
| 12 | typedef enum { | 12 | typedef enum { |
| 13 | default_voice, | 13 | default_voice, |
| 14 | #ifdef AUDIO_VOICES | ||
| 14 | something, | 15 | something, |
| 16 | drums, | ||
| 15 | butts_fader, | 17 | butts_fader, |
| 16 | octave_crunch, | 18 | octave_crunch, |
| 17 | duty_osc, | 19 | duty_osc, |
| @@ -22,6 +24,7 @@ typedef enum { | |||
| 22 | // duty_fourth_down, | 24 | // duty_fourth_down, |
| 23 | // duty_third_down, | 25 | // duty_third_down, |
| 24 | // duty_fifth_third_down, | 26 | // duty_fifth_third_down, |
| 27 | #endif | ||
| 25 | number_of_voices // important that this is last | 28 | number_of_voices // important that this is last |
| 26 | } voice_type; | 29 | } voice_type; |
| 27 | 30 | ||
diff --git a/quantum/config_common.h b/quantum/config_common.h index 17c11faeb..4bdb2065d 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h | |||
| @@ -80,4 +80,6 @@ | |||
| 80 | # endif | 80 | # endif |
| 81 | #endif | 81 | #endif |
| 82 | 82 | ||
| 83 | #define API_SYSEX_MAX_SIZE 32 | ||
| 84 | |||
| 83 | #endif | 85 | #endif |
diff --git a/quantum/keymap.h b/quantum/keymap.h index ae56d16c7..c000d2da8 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h | |||
| @@ -38,317 +38,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 38 | #define RESET QK_RESET | 38 | #define RESET QK_RESET |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | /* translates key to keycode */ | 41 | #include "quantum_keycodes.h" |
| 42 | |||
| 43 | // translates key to keycode | ||
| 42 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); | 44 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); |
| 43 | 45 | ||
| 46 | // translates function id to action | ||
| 47 | uint16_t keymap_function_id_to_action( uint16_t function_id ); | ||
| 48 | |||
| 44 | extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | 49 | extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; |
| 45 | extern const uint16_t fn_actions[]; | 50 | extern const uint16_t fn_actions[]; |
| 46 | 51 | ||
| 47 | enum quantum_keycodes { | ||
| 48 | // Ranges used in shortucuts - not to be used directly | ||
| 49 | QK_TMK = 0x0000, | ||
| 50 | QK_TMK_MAX = 0x00FF, | ||
| 51 | QK_MODS = 0x0100, | ||
| 52 | QK_LCTL = 0x0100, | ||
| 53 | QK_LSFT = 0x0200, | ||
| 54 | QK_LALT = 0x0400, | ||
| 55 | QK_LGUI = 0x0800, | ||
| 56 | QK_RCTL = 0x1100, | ||
| 57 | QK_RSFT = 0x1200, | ||
| 58 | QK_RALT = 0x1400, | ||
| 59 | QK_RGUI = 0x1800, | ||
| 60 | QK_MODS_MAX = 0x1FFF, | ||
| 61 | QK_FUNCTION = 0x2000, | ||
| 62 | QK_FUNCTION_MAX = 0x2FFF, | ||
| 63 | QK_MACRO = 0x3000, | ||
| 64 | QK_MACRO_MAX = 0x3FFF, | ||
| 65 | QK_LAYER_TAP = 0x4000, | ||
| 66 | QK_LAYER_TAP_MAX = 0x4FFF, | ||
| 67 | QK_TO = 0x5000, | ||
| 68 | QK_TO_MAX = 0x50FF, | ||
| 69 | QK_MOMENTARY = 0x5100, | ||
| 70 | QK_MOMENTARY_MAX = 0x51FF, | ||
| 71 | QK_DEF_LAYER = 0x5200, | ||
| 72 | QK_DEF_LAYER_MAX = 0x52FF, | ||
| 73 | QK_TOGGLE_LAYER = 0x5300, | ||
| 74 | QK_TOGGLE_LAYER_MAX = 0x53FF, | ||
| 75 | QK_ONE_SHOT_LAYER = 0x5400, | ||
| 76 | QK_ONE_SHOT_LAYER_MAX = 0x54FF, | ||
| 77 | QK_ONE_SHOT_MOD = 0x5500, | ||
| 78 | QK_ONE_SHOT_MOD_MAX = 0x55FF, | ||
| 79 | #ifndef DISABLE_CHORDING | ||
| 80 | QK_CHORDING = 0x5600, | ||
| 81 | QK_CHORDING_MAX = 0x56FF, | ||
| 82 | #endif | ||
| 83 | QK_MOD_TAP = 0x6000, | ||
| 84 | QK_MOD_TAP_MAX = 0x6FFF, | ||
| 85 | QK_TAP_DANCE = 0x7100, | ||
| 86 | QK_TAP_DANCE_MAX = 0x71FF, | ||
| 87 | #ifdef UNICODEMAP_ENABLE | ||
| 88 | QK_UNICODE_MAP = 0x7800, | ||
| 89 | QK_UNICODE_MAP_MAX = 0x7FFF, | ||
| 90 | #endif | ||
| 91 | #ifdef UNICODE_ENABLE | ||
| 92 | QK_UNICODE = 0x8000, | ||
| 93 | QK_UNICODE_MAX = 0xFFFF, | ||
| 94 | #endif | ||
| 95 | |||
| 96 | // Loose keycodes - to be used directly | ||
| 97 | |||
| 98 | RESET = 0x7000, | ||
| 99 | DEBUG, | ||
| 100 | MAGIC_SWAP_CONTROL_CAPSLOCK, | ||
| 101 | MAGIC_CAPSLOCK_TO_CONTROL, | ||
| 102 | MAGIC_SWAP_LALT_LGUI, | ||
| 103 | MAGIC_SWAP_RALT_RGUI, | ||
| 104 | MAGIC_NO_GUI, | ||
| 105 | MAGIC_SWAP_GRAVE_ESC, | ||
| 106 | MAGIC_SWAP_BACKSLASH_BACKSPACE, | ||
| 107 | MAGIC_HOST_NKRO, | ||
| 108 | MAGIC_SWAP_ALT_GUI, | ||
| 109 | MAGIC_UNSWAP_CONTROL_CAPSLOCK, | ||
| 110 | MAGIC_UNCAPSLOCK_TO_CONTROL, | ||
| 111 | MAGIC_UNSWAP_LALT_LGUI, | ||
| 112 | MAGIC_UNSWAP_RALT_RGUI, | ||
| 113 | MAGIC_UNNO_GUI, | ||
| 114 | MAGIC_UNSWAP_GRAVE_ESC, | ||
| 115 | MAGIC_UNSWAP_BACKSLASH_BACKSPACE, | ||
| 116 | MAGIC_UNHOST_NKRO, | ||
| 117 | MAGIC_UNSWAP_ALT_GUI, | ||
| 118 | MAGIC_TOGGLE_NKRO, | ||
| 119 | |||
| 120 | // Leader key | ||
| 121 | #ifndef DISABLE_LEADER | ||
| 122 | KC_LEAD, | ||
| 123 | #endif | ||
| 124 | |||
| 125 | // Audio on/off/toggle | ||
| 126 | AU_ON, | ||
| 127 | AU_OFF, | ||
| 128 | AU_TOG, | ||
| 129 | |||
| 130 | // Music mode on/off/toggle | ||
| 131 | MU_ON, | ||
| 132 | MU_OFF, | ||
| 133 | MU_TOG, | ||
| 134 | |||
| 135 | // Music voice iterate | ||
| 136 | MUV_IN, | ||
| 137 | MUV_DE, | ||
| 138 | |||
| 139 | // Midi mode on/off | ||
| 140 | MIDI_ON, | ||
| 141 | MIDI_OFF, | ||
| 142 | |||
| 143 | // Backlight functionality | ||
| 144 | BL_0, | ||
| 145 | BL_1, | ||
| 146 | BL_2, | ||
| 147 | BL_3, | ||
| 148 | BL_4, | ||
| 149 | BL_5, | ||
| 150 | BL_6, | ||
| 151 | BL_7, | ||
| 152 | BL_8, | ||
| 153 | BL_9, | ||
| 154 | BL_10, | ||
| 155 | BL_11, | ||
| 156 | BL_12, | ||
| 157 | BL_13, | ||
| 158 | BL_14, | ||
| 159 | BL_15, | ||
| 160 | BL_DEC, | ||
| 161 | BL_INC, | ||
| 162 | BL_TOGG, | ||
| 163 | BL_STEP, | ||
| 164 | |||
| 165 | // RGB functionality | ||
| 166 | RGB_TOG, | ||
| 167 | RGB_MOD, | ||
| 168 | RGB_HUI, | ||
| 169 | RGB_HUD, | ||
| 170 | RGB_SAI, | ||
| 171 | RGB_SAD, | ||
| 172 | RGB_VAI, | ||
| 173 | RGB_VAD, | ||
| 174 | |||
| 175 | // Left shift, open paren | ||
| 176 | KC_LSPO, | ||
| 177 | |||
| 178 | // Right shift, close paren | ||
| 179 | KC_RSPC, | ||
| 180 | |||
| 181 | // Printing | ||
| 182 | PRINT_ON, | ||
| 183 | PRINT_OFF, | ||
| 184 | |||
| 185 | // always leave at the end | ||
| 186 | SAFE_RANGE | ||
| 187 | }; | ||
| 188 | |||
| 189 | // Ability to use mods in layouts | ||
| 190 | #define LCTL(kc) (kc | QK_LCTL) | ||
| 191 | #define LSFT(kc) (kc | QK_LSFT) | ||
| 192 | #define LALT(kc) (kc | QK_LALT) | ||
| 193 | #define LGUI(kc) (kc | QK_LGUI) | ||
| 194 | #define RCTL(kc) (kc | QK_RCTL) | ||
| 195 | #define RSFT(kc) (kc | QK_RSFT) | ||
| 196 | #define RALT(kc) (kc | QK_RALT) | ||
| 197 | #define RGUI(kc) (kc | QK_RGUI) | ||
| 198 | |||
| 199 | #define HYPR(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI) | ||
| 200 | #define MEH(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT) | ||
| 201 | #define LCAG(kc) (kc | QK_LCTL | QK_LALT | QK_LGUI) | ||
| 202 | #define ALTG(kc) (kc | QK_RCTL | QK_RALT) | ||
| 203 | |||
| 204 | #define MOD_HYPR 0xf | ||
| 205 | #define MOD_MEH 0x7 | ||
| 206 | |||
| 207 | |||
| 208 | // Aliases for shifted symbols | ||
| 209 | // Each key has a 4-letter code, and some have longer aliases too. | ||
| 210 | // While the long aliases are descriptive, the 4-letter codes | ||
| 211 | // make for nicer grid layouts (everything lines up), and are | ||
| 212 | // the preferred style for Quantum. | ||
| 213 | #define KC_TILD LSFT(KC_GRV) // ~ | ||
| 214 | #define KC_TILDE KC_TILD | ||
| 215 | |||
| 216 | #define KC_EXLM LSFT(KC_1) // ! | ||
| 217 | #define KC_EXCLAIM KC_EXLM | ||
| 218 | |||
| 219 | #define KC_AT LSFT(KC_2) // @ | ||
| 220 | |||
| 221 | #define KC_HASH LSFT(KC_3) // # | ||
| 222 | |||
| 223 | #define KC_DLR LSFT(KC_4) // $ | ||
| 224 | #define KC_DOLLAR KC_DLR | ||
| 225 | |||
| 226 | #define KC_PERC LSFT(KC_5) // % | ||
| 227 | #define KC_PERCENT KC_PERC | ||
| 228 | |||
| 229 | #define KC_CIRC LSFT(KC_6) // ^ | ||
| 230 | #define KC_CIRCUMFLEX KC_CIRC | ||
| 231 | |||
| 232 | #define KC_AMPR LSFT(KC_7) // & | ||
| 233 | #define KC_AMPERSAND KC_AMPR | ||
| 234 | |||
| 235 | #define KC_ASTR LSFT(KC_8) // * | ||
| 236 | #define KC_ASTERISK KC_ASTR | ||
| 237 | |||
| 238 | #define KC_LPRN LSFT(KC_9) // ( | ||
| 239 | #define KC_LEFT_PAREN KC_LPRN | ||
| 240 | |||
| 241 | #define KC_RPRN LSFT(KC_0) // ) | ||
| 242 | #define KC_RIGHT_PAREN KC_RPRN | ||
| 243 | |||
| 244 | #define KC_UNDS LSFT(KC_MINS) // _ | ||
| 245 | #define KC_UNDERSCORE KC_UNDS | ||
| 246 | |||
| 247 | #define KC_PLUS LSFT(KC_EQL) // + | ||
| 248 | |||
| 249 | #define KC_LCBR LSFT(KC_LBRC) // { | ||
| 250 | #define KC_LEFT_CURLY_BRACE KC_LCBR | ||
| 251 | |||
| 252 | #define KC_RCBR LSFT(KC_RBRC) // } | ||
| 253 | #define KC_RIGHT_CURLY_BRACE KC_RCBR | ||
| 254 | |||
| 255 | #define KC_LABK LSFT(KC_COMM) // < | ||
| 256 | #define KC_LEFT_ANGLE_BRACKET KC_LABK | ||
| 257 | |||
| 258 | #define KC_RABK LSFT(KC_DOT) // > | ||
| 259 | #define KC_RIGHT_ANGLE_BRACKET KC_RABK | ||
| 260 | |||
| 261 | #define KC_COLN LSFT(KC_SCLN) // : | ||
| 262 | #define KC_COLON KC_COLN | ||
| 263 | |||
| 264 | #define KC_PIPE LSFT(KC_BSLS) // | | ||
| 265 | |||
| 266 | #define KC_LT LSFT(KC_COMM) // < | ||
| 267 | |||
| 268 | #define KC_GT LSFT(KC_DOT) // > | ||
| 269 | |||
| 270 | #define KC_QUES LSFT(KC_SLSH) // ? | ||
| 271 | #define KC_QUESTION KC_QUES | ||
| 272 | |||
| 273 | #define KC_DQT LSFT(KC_QUOT) // " | ||
| 274 | #define KC_DOUBLE_QUOTE KC_DQT | ||
| 275 | #define KC_DQUO KC_DQT | ||
| 276 | |||
| 277 | #define KC_DELT KC_DELETE // Del key (four letter code) | ||
| 278 | |||
| 279 | // Alias for function layers than expand past FN31 | ||
| 280 | #define FUNC(kc) (kc | QK_FUNCTION) | ||
| 281 | |||
| 282 | // Aliases | ||
| 283 | #define S(kc) LSFT(kc) | ||
| 284 | #define F(kc) FUNC(kc) | ||
| 285 | |||
| 286 | #define M(kc) (kc | QK_MACRO) | ||
| 287 | |||
| 288 | #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) | ||
| 289 | |||
| 290 | // L-ayer, T-ap - 256 keycode max, 16 layer max | ||
| 291 | #define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8)) | ||
| 292 | |||
| 293 | #define AG_SWAP MAGIC_SWAP_ALT_GUI | ||
| 294 | #define AG_NORM MAGIC_UNSWAP_ALT_GUI | ||
| 295 | |||
| 296 | #define BL_ON BL_9 | ||
| 297 | #define BL_OFF BL_0 | ||
| 298 | |||
| 299 | #define MI_ON MIDI_ON | ||
| 300 | #define MI_OFF MIDI_OFF | ||
| 301 | |||
| 302 | // GOTO layer - 16 layers max | ||
| 303 | // when: | ||
| 304 | // ON_PRESS = 1 | ||
| 305 | // ON_RELEASE = 2 | ||
| 306 | // Unless you have a good reason not to do so, prefer ON_PRESS (1) as your default. | ||
| 307 | // In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own | ||
| 308 | // keycode modeled after the old version, kept below for this. | ||
| 309 | /* #define TO(layer, when) (layer | QK_TO | (when << 0x4)) */ | ||
| 310 | #define TO(layer) (layer | QK_TO | (ON_PRESS << 0x4)) | ||
| 311 | |||
| 312 | // Momentary switch layer - 256 layer max | ||
| 313 | #define MO(layer) (layer | QK_MOMENTARY) | ||
| 314 | |||
| 315 | // Set default layer - 256 layer max | ||
| 316 | #define DF(layer) (layer | QK_DEF_LAYER) | ||
| 317 | |||
| 318 | // Toggle to layer - 256 layer max | ||
| 319 | #define TG(layer) (layer | QK_TOGGLE_LAYER) | ||
| 320 | |||
| 321 | // One-shot layer - 256 layer max | ||
| 322 | #define OSL(layer) (layer | QK_ONE_SHOT_LAYER) | ||
| 323 | |||
| 324 | // One-shot mod | ||
| 325 | #define OSM(mod) (mod | QK_ONE_SHOT_MOD) | ||
| 326 | |||
| 327 | // M-od, T-ap - 256 keycode max | ||
| 328 | #define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0xF) << 8)) | ||
| 329 | #define CTL_T(kc) MT(MOD_LCTL, kc) | ||
| 330 | #define SFT_T(kc) MT(MOD_LSFT, kc) | ||
| 331 | #define ALT_T(kc) MT(MOD_LALT, kc) | ||
| 332 | #define GUI_T(kc) MT(MOD_LGUI, kc) | ||
| 333 | #define C_S_T(kc) MT((MOD_LCTL | MOD_LSFT), kc) // Control + Shift e.g. for gnome-terminal | ||
| 334 | #define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl | ||
| 335 | #define LCAG_T(kc) MT((MOD_LCTL | MOD_LALT | MOD_LGUI), kc) // Left control alt and gui | ||
| 336 | #define ALL_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI), kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/ | ||
| 337 | |||
| 338 | // Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap | ||
| 339 | #define KC_HYPR HYPR(KC_NO) | ||
| 340 | #define KC_MEH MEH(KC_NO) | ||
| 341 | |||
| 342 | #ifdef UNICODE_ENABLE | ||
| 343 | // For sending unicode codes. | ||
| 344 | // You may not send codes over 7FFF -- this supports most of UTF8. | ||
| 345 | // To have a key that sends out Å’, go UC(0x0152) | ||
| 346 | #define UNICODE(n) (n | QK_UNICODE) | ||
| 347 | #define UC(n) UNICODE(n) | ||
| 348 | #endif | ||
| 349 | |||
| 350 | #ifdef UNICODEMAP_ENABLE | ||
| 351 | #define X(n) (n | QK_UNICODE_MAP) | ||
| 352 | #endif | ||
| 353 | 52 | ||
| 354 | #endif | 53 | #endif |
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 833e5a8f8..eced3d2bb 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c | |||
| @@ -48,12 +48,10 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| 48 | 48 | ||
| 49 | action_t action; | 49 | action_t action; |
| 50 | uint8_t action_layer, when, mod; | 50 | uint8_t action_layer, when, mod; |
| 51 | // The arm-none-eabi compiler generates out of bounds warnings when using the fn_actions directly for some reason | ||
| 52 | const uint16_t* actions = fn_actions; | ||
| 53 | 51 | ||
| 54 | switch (keycode) { | 52 | switch (keycode) { |
| 55 | case KC_FN0 ... KC_FN31: | 53 | case KC_FN0 ... KC_FN31: |
| 56 | action.code = pgm_read_word(&actions[FN_INDEX(keycode)]); | 54 | action.code = keymap_function_id_to_action(FN_INDEX(keycode)); |
| 57 | break; | 55 | break; |
| 58 | case KC_A ... KC_EXSEL: | 56 | case KC_A ... KC_EXSEL: |
| 59 | case KC_LCTRL ... KC_RGUI: | 57 | case KC_LCTRL ... KC_RGUI: |
| @@ -79,7 +77,7 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| 79 | case QK_FUNCTION ... QK_FUNCTION_MAX: ; | 77 | case QK_FUNCTION ... QK_FUNCTION_MAX: ; |
| 80 | // Is a shortcut for function action_layer, pull last 12bits | 78 | // Is a shortcut for function action_layer, pull last 12bits |
| 81 | // This means we have 4,096 FN macros at our disposal | 79 | // This means we have 4,096 FN macros at our disposal |
| 82 | action.code = pgm_read_word(&actions[(int)keycode & 0xFFF]); | 80 | action.code = keymap_function_id_to_action( (int)keycode & 0xFFF ); |
| 83 | break; | 81 | break; |
| 84 | case QK_MACRO ... QK_MACRO_MAX: | 82 | case QK_MACRO ... QK_MACRO_MAX: |
| 85 | action.code = ACTION_MACRO(keycode & 0xFF); | 83 | action.code = ACTION_MACRO(keycode & 0xFF); |
| @@ -163,9 +161,17 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 163 | { | 161 | { |
| 164 | } | 162 | } |
| 165 | 163 | ||
| 166 | /* translates key to keycode */ | 164 | // translates key to keycode |
| 165 | __attribute__ ((weak)) | ||
| 167 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | 166 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 168 | { | 167 | { |
| 169 | // Read entire word (16bits) | 168 | // Read entire word (16bits) |
| 170 | return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]); | 169 | return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]); |
| 171 | } | 170 | } |
| 171 | |||
| 172 | // translates function id to action | ||
| 173 | __attribute__ ((weak)) | ||
| 174 | uint16_t keymap_function_id_to_action( uint16_t function_id ) | ||
| 175 | { | ||
| 176 | return pgm_read_word(&fn_actions[function_id]); | ||
| 177 | } | ||
diff --git a/quantum/keymap_extras/keymap_br_abnt2.h b/quantum/keymap_extras/keymap_br_abnt2.h index 0df177721..b001139dd 100644 --- a/quantum/keymap_extras/keymap_br_abnt2.h +++ b/quantum/keymap_extras/keymap_br_abnt2.h | |||
| @@ -1,3 +1,19 @@ | |||
| 1 | /* Copyright 2017 Potiguar Faga | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 1 | #ifndef KEYMAP_BR_ABNT2_H | 17 | #ifndef KEYMAP_BR_ABNT2_H |
| 2 | #define KEYMAP_BR_ABNT2_H | 18 | #define KEYMAP_BR_ABNT2_H |
| 3 | 19 | ||
diff --git a/quantum/light_ws2812.h b/quantum/light_ws2812.h index 9498e550e..2f78c20fc 100755 --- a/quantum/light_ws2812.h +++ b/quantum/light_ws2812.h | |||
| @@ -18,13 +18,6 @@ | |||
| 18 | //#include "ws2812_config.h" | 18 | //#include "ws2812_config.h" |
| 19 | //#include "i2cmaster.h" | 19 | //#include "i2cmaster.h" |
| 20 | 20 | ||
| 21 | #define LIGHT_I2C 1 | ||
| 22 | #define LIGHT_I2C_ADDR 0x84 | ||
| 23 | #define LIGHT_I2C_ADDR_WRITE ( (LIGHT_I2C_ADDR<<1) | I2C_WRITE ) | ||
| 24 | #define LIGHT_I2C_ADDR_READ ( (LIGHT_I2C_ADDR<<1) | I2C_READ ) | ||
| 25 | |||
| 26 | #define RGBW 1 | ||
| 27 | |||
| 28 | #ifdef RGBW | 21 | #ifdef RGBW |
| 29 | #define LED_TYPE struct cRGBW | 22 | #define LED_TYPE struct cRGBW |
| 30 | #else | 23 | #else |
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c index bae43943e..1e2648bff 100644 --- a/quantum/process_keycode/process_music.c +++ b/quantum/process_keycode/process_music.c | |||
| @@ -114,8 +114,18 @@ bool process_music(uint16_t keycode, keyrecord_t *record) { | |||
| 114 | music_sequence_interval+=10; | 114 | music_sequence_interval+=10; |
| 115 | return false; | 115 | return false; |
| 116 | } | 116 | } |
| 117 | 117 | #define MUSIC_MODE_GUITAR | |
| 118 | |||
| 119 | #ifdef MUSIC_MODE_CHROMATIC | ||
| 120 | float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + record->event.key.col + music_offset)/12.0+(MATRIX_ROWS - record->event.key.row)); | ||
| 121 | #elif defined(MUSIC_MODE_GUITAR) | ||
| 122 | float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + record->event.key.col + music_offset)/12.0+(float)(MATRIX_ROWS - record->event.key.row + 7)*5.0/12); | ||
| 123 | #elif defined(MUSIC_MODE_VIOLIN) | ||
| 124 | float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + record->event.key.col + music_offset)/12.0+(float)(MATRIX_ROWS - record->event.key.row + 5)*7.0/12); | ||
| 125 | #else | ||
| 118 | float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + SCALE[record->event.key.col + music_offset])/12.0+(MATRIX_ROWS - record->event.key.row)); | 126 | float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + SCALE[record->event.key.col + music_offset])/12.0+(MATRIX_ROWS - record->event.key.row)); |
| 127 | #endif | ||
| 128 | |||
| 119 | if (record->event.pressed) { | 129 | if (record->event.pressed) { |
| 120 | play_note(freq, 0xF); | 130 | play_note(freq, 0xF); |
| 121 | if (music_sequence_recording) { | 131 | if (music_sequence_recording) { |
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 6ae362c4c..403dca538 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c | |||
| @@ -43,12 +43,16 @@ static inline void process_tap_dance_action_on_dance_finished (qk_tap_dance_acti | |||
| 43 | if (action->state.finished) | 43 | if (action->state.finished) |
| 44 | return; | 44 | return; |
| 45 | action->state.finished = true; | 45 | action->state.finished = true; |
| 46 | add_mods(action->state.oneshot_mods); | ||
| 47 | send_keyboard_report(); | ||
| 46 | _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_dance_finished); | 48 | _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_dance_finished); |
| 47 | } | 49 | } |
| 48 | 50 | ||
| 49 | static inline void process_tap_dance_action_on_reset (qk_tap_dance_action_t *action) | 51 | static inline void process_tap_dance_action_on_reset (qk_tap_dance_action_t *action) |
| 50 | { | 52 | { |
| 51 | _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_reset); | 53 | _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_reset); |
| 54 | del_mods(action->state.oneshot_mods); | ||
| 55 | send_keyboard_report(); | ||
| 52 | } | 56 | } |
| 53 | 57 | ||
| 54 | bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { | 58 | bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { |
| @@ -70,6 +74,7 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { | |||
| 70 | action->state.keycode = keycode; | 74 | action->state.keycode = keycode; |
| 71 | action->state.count++; | 75 | action->state.count++; |
| 72 | action->state.timer = timer_read(); | 76 | action->state.timer = timer_read(); |
| 77 | action->state.oneshot_mods = get_oneshot_mods(); | ||
| 73 | process_tap_dance_action_on_each_tap (action); | 78 | process_tap_dance_action_on_each_tap (action); |
| 74 | 79 | ||
| 75 | if (last_td && last_td != keycode) { | 80 | if (last_td && last_td != keycode) { |
| @@ -109,7 +114,7 @@ void matrix_scan_tap_dance () { | |||
| 109 | if (highest_td == -1) | 114 | if (highest_td == -1) |
| 110 | return; | 115 | return; |
| 111 | 116 | ||
| 112 | for (int i = 0; i <= highest_td; i++) { | 117 | for (int i = 0; i <= highest_td; i++) { |
| 113 | qk_tap_dance_action_t *action = &tap_dance_actions[i]; | 118 | qk_tap_dance_action_t *action = &tap_dance_actions[i]; |
| 114 | 119 | ||
| 115 | if (action->state.count && timer_elapsed (action->state.timer) > TAPPING_TERM) { | 120 | if (action->state.count && timer_elapsed (action->state.timer) > TAPPING_TERM) { |
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index f753cbba6..726752ecc 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | typedef struct | 9 | typedef struct |
| 10 | { | 10 | { |
| 11 | uint8_t count; | 11 | uint8_t count; |
| 12 | uint8_t oneshot_mods; | ||
| 12 | uint16_t keycode; | 13 | uint16_t keycode; |
| 13 | uint16_t timer; | 14 | uint16_t timer; |
| 14 | bool interrupted; | 15 | bool interrupted; |
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c index cd3a610b4..9995ba9bd 100644 --- a/quantum/process_keycode/process_unicode.c +++ b/quantum/process_keycode/process_unicode.c | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #include "process_unicode.h" | 1 | #include "process_unicode.h" |
| 2 | #include "action_util.h" | ||
| 2 | 3 | ||
| 3 | static uint8_t input_mode; | 4 | static uint8_t input_mode; |
| 5 | uint8_t mods; | ||
| 4 | 6 | ||
| 5 | __attribute__((weak)) | 7 | __attribute__((weak)) |
| 6 | uint16_t hex_to_keycode(uint8_t hex) | 8 | uint16_t hex_to_keycode(uint8_t hex) |
| @@ -25,6 +27,19 @@ uint8_t get_unicode_input_mode(void) { | |||
| 25 | 27 | ||
| 26 | __attribute__((weak)) | 28 | __attribute__((weak)) |
| 27 | void unicode_input_start (void) { | 29 | void unicode_input_start (void) { |
| 30 | // save current mods | ||
| 31 | mods = keyboard_report->mods; | ||
| 32 | |||
| 33 | // unregister all mods to start from clean state | ||
| 34 | if (mods & MOD_BIT(KC_LSFT)) unregister_code(KC_LSFT); | ||
| 35 | if (mods & MOD_BIT(KC_RSFT)) unregister_code(KC_RSFT); | ||
| 36 | if (mods & MOD_BIT(KC_LCTL)) unregister_code(KC_LCTL); | ||
| 37 | if (mods & MOD_BIT(KC_RCTL)) unregister_code(KC_RCTL); | ||
| 38 | if (mods & MOD_BIT(KC_LALT)) unregister_code(KC_LALT); | ||
| 39 | if (mods & MOD_BIT(KC_RALT)) unregister_code(KC_RALT); | ||
| 40 | if (mods & MOD_BIT(KC_LGUI)) unregister_code(KC_LGUI); | ||
| 41 | if (mods & MOD_BIT(KC_RGUI)) unregister_code(KC_RGUI); | ||
| 42 | |||
| 28 | switch(input_mode) { | 43 | switch(input_mode) { |
| 29 | case UC_OSX: | 44 | case UC_OSX: |
| 30 | register_code(KC_LALT); | 45 | register_code(KC_LALT); |
| @@ -54,15 +69,25 @@ void unicode_input_start (void) { | |||
| 54 | __attribute__((weak)) | 69 | __attribute__((weak)) |
| 55 | void unicode_input_finish (void) { | 70 | void unicode_input_finish (void) { |
| 56 | switch(input_mode) { | 71 | switch(input_mode) { |
| 57 | case UC_OSX: | 72 | case UC_OSX: |
| 58 | case UC_WIN: | 73 | case UC_WIN: |
| 59 | unregister_code(KC_LALT); | 74 | unregister_code(KC_LALT); |
| 60 | break; | 75 | break; |
| 61 | case UC_LNX: | 76 | case UC_LNX: |
| 62 | register_code(KC_SPC); | 77 | register_code(KC_SPC); |
| 63 | unregister_code(KC_SPC); | 78 | unregister_code(KC_SPC); |
| 64 | break; | 79 | break; |
| 65 | } | 80 | } |
| 81 | |||
| 82 | // reregister previously set mods | ||
| 83 | if (mods & MOD_BIT(KC_LSFT)) register_code(KC_LSFT); | ||
| 84 | if (mods & MOD_BIT(KC_RSFT)) register_code(KC_RSFT); | ||
| 85 | if (mods & MOD_BIT(KC_LCTL)) register_code(KC_LCTL); | ||
| 86 | if (mods & MOD_BIT(KC_RCTL)) register_code(KC_RCTL); | ||
| 87 | if (mods & MOD_BIT(KC_LALT)) register_code(KC_LALT); | ||
| 88 | if (mods & MOD_BIT(KC_RALT)) register_code(KC_RALT); | ||
| 89 | if (mods & MOD_BIT(KC_LGUI)) register_code(KC_LGUI); | ||
| 90 | if (mods & MOD_BIT(KC_RGUI)) register_code(KC_RGUI); | ||
| 66 | } | 91 | } |
| 67 | 92 | ||
| 68 | void register_hex(uint16_t hex) { | 93 | void register_hex(uint16_t hex) { |
| @@ -116,7 +141,16 @@ bool process_unicode_map(uint16_t keycode, keyrecord_t *record) { | |||
| 116 | const uint32_t* map = unicode_map; | 141 | const uint32_t* map = unicode_map; |
| 117 | uint16_t index = keycode & 0x7FF; | 142 | uint16_t index = keycode & 0x7FF; |
| 118 | uint32_t code = pgm_read_dword_far(&map[index]); | 143 | uint32_t code = pgm_read_dword_far(&map[index]); |
| 119 | if ((code > 0xFFFF && input_mode == UC_OSX) || (code > 0xFFFFF && input_mode == UC_LNX)) { | 144 | if (code > 0xFFFF && code <= 0x10ffff && input_mode == UC_OSX) { |
| 145 | // Convert to UTF-16 surrogate pair | ||
| 146 | code -= 0x10000; | ||
| 147 | uint32_t lo = code & 0x3ff; | ||
| 148 | uint32_t hi = (code & 0xffc00) >> 10; | ||
| 149 | unicode_input_start(); | ||
| 150 | register_hex32(hi + 0xd800); | ||
| 151 | register_hex32(lo + 0xdc00); | ||
| 152 | unicode_input_finish(); | ||
| 153 | } else if ((code > 0x10ffff && input_mode == UC_OSX) || (code > 0xFFFFF && input_mode == UC_LNX)) { | ||
| 120 | // when character is out of range supported by the OS | 154 | // when character is out of range supported by the OS |
| 121 | unicode_map_input_error(); | 155 | unicode_map_input_error(); |
| 122 | } else { | 156 | } else { |
diff --git a/quantum/quantum.c b/quantum/quantum.c index e5385bc21..b83ae433e 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -21,6 +21,8 @@ static void do_code16 (uint16_t code, void (*f) (uint8_t)) { | |||
| 21 | if (code & QK_LGUI) | 21 | if (code & QK_LGUI) |
| 22 | f(KC_LGUI); | 22 | f(KC_LGUI); |
| 23 | 23 | ||
| 24 | if (code < QK_RMODS_MIN) return; | ||
| 25 | |||
| 24 | if (code & QK_RCTL) | 26 | if (code & QK_RCTL) |
| 25 | f(KC_RCTL); | 27 | f(KC_RCTL); |
| 26 | if (code & QK_RSFT) | 28 | if (code & QK_RSFT) |
| @@ -31,14 +33,42 @@ static void do_code16 (uint16_t code, void (*f) (uint8_t)) { | |||
| 31 | f(KC_RGUI); | 33 | f(KC_RGUI); |
| 32 | } | 34 | } |
| 33 | 35 | ||
| 36 | static inline void qk_register_weak_mods(uint8_t kc) { | ||
| 37 | add_weak_mods(MOD_BIT(kc)); | ||
| 38 | send_keyboard_report(); | ||
| 39 | } | ||
| 40 | |||
| 41 | static inline void qk_unregister_weak_mods(uint8_t kc) { | ||
| 42 | del_weak_mods(MOD_BIT(kc)); | ||
| 43 | send_keyboard_report(); | ||
| 44 | } | ||
| 45 | |||
| 46 | static inline void qk_register_mods(uint8_t kc) { | ||
| 47 | add_weak_mods(MOD_BIT(kc)); | ||
| 48 | send_keyboard_report(); | ||
| 49 | } | ||
| 50 | |||
| 51 | static inline void qk_unregister_mods(uint8_t kc) { | ||
| 52 | del_weak_mods(MOD_BIT(kc)); | ||
| 53 | send_keyboard_report(); | ||
| 54 | } | ||
| 55 | |||
| 34 | void register_code16 (uint16_t code) { | 56 | void register_code16 (uint16_t code) { |
| 35 | do_code16 (code, register_code); | 57 | if (IS_MOD(code) || code == KC_NO) { |
| 58 | do_code16 (code, qk_register_mods); | ||
| 59 | } else { | ||
| 60 | do_code16 (code, qk_register_weak_mods); | ||
| 61 | } | ||
| 36 | register_code (code); | 62 | register_code (code); |
| 37 | } | 63 | } |
| 38 | 64 | ||
| 39 | void unregister_code16 (uint16_t code) { | 65 | void unregister_code16 (uint16_t code) { |
| 40 | unregister_code (code); | 66 | unregister_code (code); |
| 41 | do_code16 (code, unregister_code); | 67 | if (IS_MOD(code) || code == KC_NO) { |
| 68 | do_code16 (code, qk_unregister_mods); | ||
| 69 | } else { | ||
| 70 | do_code16 (code, qk_unregister_weak_mods); | ||
| 71 | } | ||
| 42 | } | 72 | } |
| 43 | 73 | ||
| 44 | __attribute__ ((weak)) | 74 | __attribute__ ((weak)) |
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h new file mode 100644 index 000000000..4853655f9 --- /dev/null +++ b/quantum/quantum_keycodes.h | |||
| @@ -0,0 +1,317 @@ | |||
| 1 | |||
| 2 | #ifndef QUANTUM_KEYCODES_H | ||
| 3 | #define QUANTUM_KEYCODES_H | ||
| 4 | |||
| 5 | enum quantum_keycodes { | ||
| 6 | // Ranges used in shortucuts - not to be used directly | ||
| 7 | QK_TMK = 0x0000, | ||
| 8 | QK_TMK_MAX = 0x00FF, | ||
| 9 | QK_MODS = 0x0100, | ||
| 10 | QK_LCTL = 0x0100, | ||
| 11 | QK_LSFT = 0x0200, | ||
| 12 | QK_LALT = 0x0400, | ||
| 13 | QK_LGUI = 0x0800, | ||
| 14 | QK_RMODS_MIN = 0x1000, | ||
| 15 | QK_RCTL = 0x1100, | ||
| 16 | QK_RSFT = 0x1200, | ||
| 17 | QK_RALT = 0x1400, | ||
| 18 | QK_RGUI = 0x1800, | ||
| 19 | QK_MODS_MAX = 0x1FFF, | ||
| 20 | QK_FUNCTION = 0x2000, | ||
| 21 | QK_FUNCTION_MAX = 0x2FFF, | ||
| 22 | QK_MACRO = 0x3000, | ||
| 23 | QK_MACRO_MAX = 0x3FFF, | ||
| 24 | QK_LAYER_TAP = 0x4000, | ||
| 25 | QK_LAYER_TAP_MAX = 0x4FFF, | ||
| 26 | QK_TO = 0x5000, | ||
| 27 | QK_TO_MAX = 0x50FF, | ||
| 28 | QK_MOMENTARY = 0x5100, | ||
| 29 | QK_MOMENTARY_MAX = 0x51FF, | ||
| 30 | QK_DEF_LAYER = 0x5200, | ||
| 31 | QK_DEF_LAYER_MAX = 0x52FF, | ||
| 32 | QK_TOGGLE_LAYER = 0x5300, | ||
| 33 | QK_TOGGLE_LAYER_MAX = 0x53FF, | ||
| 34 | QK_ONE_SHOT_LAYER = 0x5400, | ||
| 35 | QK_ONE_SHOT_LAYER_MAX = 0x54FF, | ||
| 36 | QK_ONE_SHOT_MOD = 0x5500, | ||
| 37 | QK_ONE_SHOT_MOD_MAX = 0x55FF, | ||
| 38 | #ifndef DISABLE_CHORDING | ||
| 39 | QK_CHORDING = 0x5600, | ||
| 40 | QK_CHORDING_MAX = 0x56FF, | ||
| 41 | #endif | ||
| 42 | QK_MOD_TAP = 0x6000, | ||
| 43 | QK_MOD_TAP_MAX = 0x6FFF, | ||
| 44 | QK_TAP_DANCE = 0x7100, | ||
| 45 | QK_TAP_DANCE_MAX = 0x71FF, | ||
| 46 | #ifdef UNICODEMAP_ENABLE | ||
| 47 | QK_UNICODE_MAP = 0x7800, | ||
| 48 | QK_UNICODE_MAP_MAX = 0x7FFF, | ||
| 49 | #endif | ||
| 50 | #ifdef UNICODE_ENABLE | ||
| 51 | QK_UNICODE = 0x8000, | ||
| 52 | QK_UNICODE_MAX = 0xFFFF, | ||
| 53 | #endif | ||
| 54 | |||
| 55 | // Loose keycodes - to be used directly | ||
| 56 | |||
| 57 | RESET = 0x7000, | ||
| 58 | DEBUG, | ||
| 59 | MAGIC_SWAP_CONTROL_CAPSLOCK, | ||
| 60 | MAGIC_CAPSLOCK_TO_CONTROL, | ||
| 61 | MAGIC_SWAP_LALT_LGUI, | ||
| 62 | MAGIC_SWAP_RALT_RGUI, | ||
| 63 | MAGIC_NO_GUI, | ||
| 64 | MAGIC_SWAP_GRAVE_ESC, | ||
| 65 | MAGIC_SWAP_BACKSLASH_BACKSPACE, | ||
| 66 | MAGIC_HOST_NKRO, | ||
| 67 | MAGIC_SWAP_ALT_GUI, | ||
| 68 | MAGIC_UNSWAP_CONTROL_CAPSLOCK, | ||
| 69 | MAGIC_UNCAPSLOCK_TO_CONTROL, | ||
| 70 | MAGIC_UNSWAP_LALT_LGUI, | ||
| 71 | MAGIC_UNSWAP_RALT_RGUI, | ||
| 72 | MAGIC_UNNO_GUI, | ||
| 73 | MAGIC_UNSWAP_GRAVE_ESC, | ||
| 74 | MAGIC_UNSWAP_BACKSLASH_BACKSPACE, | ||
| 75 | MAGIC_UNHOST_NKRO, | ||
| 76 | MAGIC_UNSWAP_ALT_GUI, | ||
| 77 | MAGIC_TOGGLE_NKRO, | ||
| 78 | |||
| 79 | // Leader key | ||
| 80 | #ifndef DISABLE_LEADER | ||
| 81 | KC_LEAD, | ||
| 82 | #endif | ||
| 83 | |||
| 84 | // Audio on/off/toggle | ||
| 85 | AU_ON, | ||
| 86 | AU_OFF, | ||
| 87 | AU_TOG, | ||
| 88 | |||
| 89 | // Music mode on/off/toggle | ||
| 90 | MU_ON, | ||
| 91 | MU_OFF, | ||
| 92 | MU_TOG, | ||
| 93 | |||
| 94 | // Music voice iterate | ||
| 95 | MUV_IN, | ||
| 96 | MUV_DE, | ||
| 97 | |||
| 98 | // Midi mode on/off | ||
| 99 | MIDI_ON, | ||
| 100 | MIDI_OFF, | ||
| 101 | |||
| 102 | // Backlight functionality | ||
| 103 | BL_0, | ||
| 104 | BL_1, | ||
| 105 | BL_2, | ||
| 106 | BL_3, | ||
| 107 | BL_4, | ||
| 108 | BL_5, | ||
| 109 | BL_6, | ||
| 110 | BL_7, | ||
| 111 | BL_8, | ||
| 112 | BL_9, | ||
| 113 | BL_10, | ||
| 114 | BL_11, | ||
| 115 | BL_12, | ||
| 116 | BL_13, | ||
| 117 | BL_14, | ||
| 118 | BL_15, | ||
| 119 | BL_DEC, | ||
| 120 | BL_INC, | ||
| 121 | BL_TOGG, | ||
| 122 | BL_STEP, | ||
| 123 | |||
| 124 | // RGB functionality | ||
| 125 | RGB_TOG, | ||
| 126 | RGB_MOD, | ||
| 127 | RGB_HUI, | ||
| 128 | RGB_HUD, | ||
| 129 | RGB_SAI, | ||
| 130 | RGB_SAD, | ||
| 131 | RGB_VAI, | ||
| 132 | RGB_VAD, | ||
| 133 | |||
| 134 | // Left shift, open paren | ||
| 135 | KC_LSPO, | ||
| 136 | |||
| 137 | // Right shift, close paren | ||
| 138 | KC_RSPC, | ||
| 139 | |||
| 140 | // Printing | ||
| 141 | PRINT_ON, | ||
| 142 | PRINT_OFF, | ||
| 143 | |||
| 144 | // always leave at the end | ||
| 145 | SAFE_RANGE | ||
| 146 | }; | ||
| 147 | |||
| 148 | // Ability to use mods in layouts | ||
| 149 | #define LCTL(kc) (kc | QK_LCTL) | ||
| 150 | #define LSFT(kc) (kc | QK_LSFT) | ||
| 151 | #define LALT(kc) (kc | QK_LALT) | ||
| 152 | #define LGUI(kc) (kc | QK_LGUI) | ||
| 153 | #define RCTL(kc) (kc | QK_RCTL) | ||
| 154 | #define RSFT(kc) (kc | QK_RSFT) | ||
| 155 | #define RALT(kc) (kc | QK_RALT) | ||
| 156 | #define RGUI(kc) (kc | QK_RGUI) | ||
| 157 | |||
| 158 | #define HYPR(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI) | ||
| 159 | #define MEH(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT) | ||
| 160 | #define LCAG(kc) (kc | QK_LCTL | QK_LALT | QK_LGUI) | ||
| 161 | #define ALTG(kc) (kc | QK_RCTL | QK_RALT) | ||
| 162 | #define SCMD(kc) (kc | QK_LGUI | QK_LSFT) | ||
| 163 | #define SWIN(kc) SCMD(kc) | ||
| 164 | |||
| 165 | #define MOD_HYPR 0xf | ||
| 166 | #define MOD_MEH 0x7 | ||
| 167 | |||
| 168 | |||
| 169 | // Aliases for shifted symbols | ||
| 170 | // Each key has a 4-letter code, and some have longer aliases too. | ||
| 171 | // While the long aliases are descriptive, the 4-letter codes | ||
| 172 | // make for nicer grid layouts (everything lines up), and are | ||
| 173 | // the preferred style for Quantum. | ||
| 174 | #define KC_TILD LSFT(KC_GRV) // ~ | ||
| 175 | #define KC_TILDE KC_TILD | ||
| 176 | |||
| 177 | #define KC_EXLM LSFT(KC_1) // ! | ||
| 178 | #define KC_EXCLAIM KC_EXLM | ||
| 179 | |||
| 180 | #define KC_AT LSFT(KC_2) // @ | ||
| 181 | |||
| 182 | #define KC_HASH LSFT(KC_3) // # | ||
| 183 | |||
| 184 | #define KC_DLR LSFT(KC_4) // $ | ||
| 185 | #define KC_DOLLAR KC_DLR | ||
| 186 | |||
| 187 | #define KC_PERC LSFT(KC_5) // % | ||
| 188 | #define KC_PERCENT KC_PERC | ||
| 189 | |||
| 190 | #define KC_CIRC LSFT(KC_6) // ^ | ||
| 191 | #define KC_CIRCUMFLEX KC_CIRC | ||
| 192 | |||
| 193 | #define KC_AMPR LSFT(KC_7) // & | ||
| 194 | #define KC_AMPERSAND KC_AMPR | ||
| 195 | |||
| 196 | #define KC_ASTR LSFT(KC_8) // * | ||
| 197 | #define KC_ASTERISK KC_ASTR | ||
| 198 | |||
| 199 | #define KC_LPRN LSFT(KC_9) // ( | ||
| 200 | #define KC_LEFT_PAREN KC_LPRN | ||
| 201 | |||
| 202 | #define KC_RPRN LSFT(KC_0) // ) | ||
| 203 | #define KC_RIGHT_PAREN KC_RPRN | ||
| 204 | |||
| 205 | #define KC_UNDS LSFT(KC_MINS) // _ | ||
| 206 | #define KC_UNDERSCORE KC_UNDS | ||
| 207 | |||
| 208 | #define KC_PLUS LSFT(KC_EQL) // + | ||
| 209 | |||
| 210 | #define KC_LCBR LSFT(KC_LBRC) // { | ||
| 211 | #define KC_LEFT_CURLY_BRACE KC_LCBR | ||
| 212 | |||
| 213 | #define KC_RCBR LSFT(KC_RBRC) // } | ||
| 214 | #define KC_RIGHT_CURLY_BRACE KC_RCBR | ||
| 215 | |||
| 216 | #define KC_LABK LSFT(KC_COMM) // < | ||
| 217 | #define KC_LEFT_ANGLE_BRACKET KC_LABK | ||
| 218 | |||
| 219 | #define KC_RABK LSFT(KC_DOT) // > | ||
| 220 | #define KC_RIGHT_ANGLE_BRACKET KC_RABK | ||
| 221 | |||
| 222 | #define KC_COLN LSFT(KC_SCLN) // : | ||
| 223 | #define KC_COLON KC_COLN | ||
| 224 | |||
| 225 | #define KC_PIPE LSFT(KC_BSLS) // | | ||
| 226 | |||
| 227 | #define KC_LT LSFT(KC_COMM) // < | ||
| 228 | |||
| 229 | #define KC_GT LSFT(KC_DOT) // > | ||
| 230 | |||
| 231 | #define KC_QUES LSFT(KC_SLSH) // ? | ||
| 232 | #define KC_QUESTION KC_QUES | ||
| 233 | |||
| 234 | #define KC_DQT LSFT(KC_QUOT) // " | ||
| 235 | #define KC_DOUBLE_QUOTE KC_DQT | ||
| 236 | #define KC_DQUO KC_DQT | ||
| 237 | |||
| 238 | #define KC_DELT KC_DELETE // Del key (four letter code) | ||
| 239 | |||
| 240 | // Alias for function layers than expand past FN31 | ||
| 241 | #define FUNC(kc) (kc | QK_FUNCTION) | ||
| 242 | |||
| 243 | // Aliases | ||
| 244 | #define S(kc) LSFT(kc) | ||
| 245 | #define F(kc) FUNC(kc) | ||
| 246 | |||
| 247 | #define M(kc) (kc | QK_MACRO) | ||
| 248 | |||
| 249 | #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) | ||
| 250 | |||
| 251 | // L-ayer, T-ap - 256 keycode max, 16 layer max | ||
| 252 | #define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8)) | ||
| 253 | |||
| 254 | #define AG_SWAP MAGIC_SWAP_ALT_GUI | ||
| 255 | #define AG_NORM MAGIC_UNSWAP_ALT_GUI | ||
| 256 | |||
| 257 | #define BL_ON BL_9 | ||
| 258 | #define BL_OFF BL_0 | ||
| 259 | |||
| 260 | #define MI_ON MIDI_ON | ||
| 261 | #define MI_OFF MIDI_OFF | ||
| 262 | |||
| 263 | // GOTO layer - 16 layers max | ||
| 264 | // when: | ||
| 265 | // ON_PRESS = 1 | ||
| 266 | // ON_RELEASE = 2 | ||
| 267 | // Unless you have a good reason not to do so, prefer ON_PRESS (1) as your default. | ||
| 268 | // In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own | ||
| 269 | // keycode modeled after the old version, kept below for this. | ||
| 270 | /* #define TO(layer, when) (layer | QK_TO | (when << 0x4)) */ | ||
| 271 | #define TO(layer) (layer | QK_TO | (ON_PRESS << 0x4)) | ||
| 272 | |||
| 273 | // Momentary switch layer - 256 layer max | ||
| 274 | #define MO(layer) (layer | QK_MOMENTARY) | ||
| 275 | |||
| 276 | // Set default layer - 256 layer max | ||
| 277 | #define DF(layer) (layer | QK_DEF_LAYER) | ||
| 278 | |||
| 279 | // Toggle to layer - 256 layer max | ||
| 280 | #define TG(layer) (layer | QK_TOGGLE_LAYER) | ||
| 281 | |||
| 282 | // One-shot layer - 256 layer max | ||
| 283 | #define OSL(layer) (layer | QK_ONE_SHOT_LAYER) | ||
| 284 | |||
| 285 | // One-shot mod | ||
| 286 | #define OSM(mod) (mod | QK_ONE_SHOT_MOD) | ||
| 287 | |||
| 288 | // M-od, T-ap - 256 keycode max | ||
| 289 | #define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0xF) << 8)) | ||
| 290 | #define CTL_T(kc) MT(MOD_LCTL, kc) | ||
| 291 | #define SFT_T(kc) MT(MOD_LSFT, kc) | ||
| 292 | #define ALT_T(kc) MT(MOD_LALT, kc) | ||
| 293 | #define GUI_T(kc) MT(MOD_LGUI, kc) | ||
| 294 | #define C_S_T(kc) MT((MOD_LCTL | MOD_LSFT), kc) // Control + Shift e.g. for gnome-terminal | ||
| 295 | #define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl | ||
| 296 | #define LCAG_T(kc) MT((MOD_LCTL | MOD_LALT | MOD_LGUI), kc) // Left control alt and gui | ||
| 297 | #define ALL_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI), kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/ | ||
| 298 | #define SCMD_T(kc) MT((MOD_LGUI | MOD_LSFT), kc) | ||
| 299 | #define SWIN_T(kc) SCMD_T(kc) | ||
| 300 | |||
| 301 | // Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap | ||
| 302 | #define KC_HYPR HYPR(KC_NO) | ||
| 303 | #define KC_MEH MEH(KC_NO) | ||
| 304 | |||
| 305 | #ifdef UNICODE_ENABLE | ||
| 306 | // For sending unicode codes. | ||
| 307 | // You may not send codes over 7FFF -- this supports most of UTF8. | ||
| 308 | // To have a key that sends out Å’, go UC(0x0152) | ||
| 309 | #define UNICODE(n) (n | QK_UNICODE) | ||
| 310 | #define UC(n) UNICODE(n) | ||
| 311 | #endif | ||
| 312 | |||
| 313 | #ifdef UNICODEMAP_ENABLE | ||
| 314 | #define X(n) (n | QK_UNICODE_MAP) | ||
| 315 | #endif | ||
| 316 | |||
| 317 | #endif // QUANTUM_KEYCODES_H | ||
diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 625971e0f..52a09817a 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c | |||
| @@ -370,6 +370,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) { | |||
| 370 | rgblight_set(); | 370 | rgblight_set(); |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | __attribute__ ((weak)) | ||
| 373 | void rgblight_set(void) { | 374 | void rgblight_set(void) { |
| 374 | if (rgblight_config.enable) { | 375 | if (rgblight_config.enable) { |
| 375 | #ifdef RGBW | 376 | #ifdef RGBW |
| @@ -449,6 +450,9 @@ void rgblight_task(void) { | |||
| 449 | } else if (rgblight_config.mode >= 21 && rgblight_config.mode <= 23) { | 450 | } else if (rgblight_config.mode >= 21 && rgblight_config.mode <= 23) { |
| 450 | // mode = 21 to 23, knight mode | 451 | // mode = 21 to 23, knight mode |
| 451 | rgblight_effect_knight(rgblight_config.mode - 21); | 452 | rgblight_effect_knight(rgblight_config.mode - 21); |
| 453 | } else { | ||
| 454 | // mode = 24, christmas mode | ||
| 455 | rgblight_effect_christmas(); | ||
| 452 | } | 456 | } |
| 453 | } | 457 | } |
| 454 | } | 458 | } |
| @@ -594,4 +598,22 @@ void rgblight_effect_knight(uint8_t interval) { | |||
| 594 | } | 598 | } |
| 595 | } | 599 | } |
| 596 | 600 | ||
| 601 | |||
| 602 | void rgblight_effect_christmas(void) { | ||
| 603 | static uint16_t current_offset = 0; | ||
| 604 | static uint16_t last_timer = 0; | ||
| 605 | uint16_t hue; | ||
| 606 | uint8_t i; | ||
| 607 | if (timer_elapsed(last_timer) < 1000) { | ||
| 608 | return; | ||
| 609 | } | ||
| 610 | last_timer = timer_read(); | ||
| 611 | current_offset = (current_offset + 1) % 2; | ||
| 612 | for (i = 0; i < RGBLED_NUM; i++) { | ||
| 613 | hue = 0 + ((RGBLED_NUM * (i + current_offset)) % 2) * 80; | ||
| 614 | sethsv(hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]); | ||
| 615 | } | ||
| 616 | rgblight_set(); | ||
| 617 | } | ||
| 618 | |||
| 597 | #endif | 619 | #endif |
diff --git a/quantum/rgblight.h b/quantum/rgblight.h index aa1d026e0..726b8de72 100644 --- a/quantum/rgblight.h +++ b/quantum/rgblight.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define RGBLIGHT_H | 2 | #define RGBLIGHT_H |
| 3 | 3 | ||
| 4 | #ifdef RGBLIGHT_ANIMATIONS | 4 | #ifdef RGBLIGHT_ANIMATIONS |
| 5 | #define RGBLIGHT_MODES 23 | 5 | #define RGBLIGHT_MODES 24 |
| 6 | #else | 6 | #else |
| 7 | #define RGBLIGHT_MODES 1 | 7 | #define RGBLIGHT_MODES 1 |
| 8 | #endif | 8 | #endif |
| @@ -40,6 +40,8 @@ | |||
| 40 | #include "eeconfig.h" | 40 | #include "eeconfig.h" |
| 41 | #include "light_ws2812.h" | 41 | #include "light_ws2812.h" |
| 42 | 42 | ||
| 43 | extern LED_TYPE led[RGBLED_NUM]; | ||
| 44 | |||
| 43 | extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM; | 45 | extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM; |
| 44 | extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM; | 46 | extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM; |
| 45 | extern const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[3] PROGMEM; | 47 | extern const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[3] PROGMEM; |
| @@ -98,5 +100,6 @@ void rgblight_effect_rainbow_mood(uint8_t interval); | |||
| 98 | void rgblight_effect_rainbow_swirl(uint8_t interval); | 100 | void rgblight_effect_rainbow_swirl(uint8_t interval); |
| 99 | void rgblight_effect_snake(uint8_t interval); | 101 | void rgblight_effect_snake(uint8_t interval); |
| 100 | void rgblight_effect_knight(uint8_t interval); | 102 | void rgblight_effect_knight(uint8_t interval); |
| 103 | void rgblight_effect_christmas(void); | ||
| 101 | 104 | ||
| 102 | #endif | 105 | #endif |
diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 54f6faaa4..5826d909e 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c | |||
| @@ -53,10 +53,13 @@ SOFTWARE. | |||
| 53 | #define "Visualizer thread priority not defined" | 53 | #define "Visualizer thread priority not defined" |
| 54 | #endif | 54 | #endif |
| 55 | 55 | ||
| 56 | // mods status | ||
| 57 | #include "action_util.h" | ||
| 56 | 58 | ||
| 57 | static visualizer_keyboard_status_t current_status = { | 59 | static visualizer_keyboard_status_t current_status = { |
| 58 | .layer = 0xFFFFFFFF, | 60 | .layer = 0xFFFFFFFF, |
| 59 | .default_layer = 0xFFFFFFFF, | 61 | .default_layer = 0xFFFFFFFF, |
| 62 | .mods = 0xFF, | ||
| 60 | .leds = 0xFFFFFFFF, | 63 | .leds = 0xFFFFFFFF, |
| 61 | .suspended = false, | 64 | .suspended = false, |
| 62 | }; | 65 | }; |
| @@ -64,6 +67,7 @@ static visualizer_keyboard_status_t current_status = { | |||
| 64 | static bool same_status(visualizer_keyboard_status_t* status1, visualizer_keyboard_status_t* status2) { | 67 | static bool same_status(visualizer_keyboard_status_t* status1, visualizer_keyboard_status_t* status2) { |
| 65 | return status1->layer == status2->layer && | 68 | return status1->layer == status2->layer && |
| 66 | status1->default_layer == status2->default_layer && | 69 | status1->default_layer == status2->default_layer && |
| 70 | status1->mods == status2->mods && | ||
| 67 | status1->leds == status2->leds && | 71 | status1->leds == status2->leds && |
| 68 | status1->suspended == status2->suspended; | 72 | status1->suspended == status2->suspended; |
| 69 | } | 73 | } |
| @@ -307,6 +311,45 @@ bool keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_s | |||
| 307 | gdispFlush(); | 311 | gdispFlush(); |
| 308 | return false; | 312 | return false; |
| 309 | } | 313 | } |
| 314 | |||
| 315 | static void format_mods_bitmap_string(uint8_t mods, char* buffer) { | ||
| 316 | *buffer = ' '; | ||
| 317 | ++buffer; | ||
| 318 | |||
| 319 | for (int i = 0; i<8; i++) | ||
| 320 | { | ||
| 321 | uint32_t mask = (1u << i); | ||
| 322 | if (mods & mask) { | ||
| 323 | *buffer = '1'; | ||
| 324 | } else { | ||
| 325 | *buffer = '0'; | ||
| 326 | } | ||
| 327 | ++buffer; | ||
| 328 | |||
| 329 | if (i==3) { | ||
| 330 | *buffer = ' '; | ||
| 331 | ++buffer; | ||
| 332 | } | ||
| 333 | } | ||
| 334 | *buffer = 0; | ||
| 335 | } | ||
| 336 | |||
| 337 | bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state) { | ||
| 338 | (void)animation; | ||
| 339 | |||
| 340 | const char* title = "Modifier states"; | ||
| 341 | const char* mods_header = " CSAG CSAG "; | ||
| 342 | char status_buffer[12]; | ||
| 343 | |||
| 344 | gdispClear(White); | ||
| 345 | gdispDrawString(0, 0, title, state->font_fixed5x8, Black); | ||
| 346 | gdispDrawString(0, 10, mods_header, state->font_fixed5x8, Black); | ||
| 347 | format_mods_bitmap_string(state->status.mods, status_buffer); | ||
| 348 | gdispDrawString(0, 20, status_buffer, state->font_fixed5x8, Black); | ||
| 349 | |||
| 350 | gdispFlush(); | ||
| 351 | return false; | ||
| 352 | } | ||
| 310 | #endif // LCD_ENABLE | 353 | #endif // LCD_ENABLE |
| 311 | 354 | ||
| 312 | bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { | 355 | bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { |
| @@ -350,6 +393,7 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) { | |||
| 350 | visualizer_keyboard_status_t initial_status = { | 393 | visualizer_keyboard_status_t initial_status = { |
| 351 | .default_layer = 0xFFFFFFFF, | 394 | .default_layer = 0xFFFFFFFF, |
| 352 | .layer = 0xFFFFFFFF, | 395 | .layer = 0xFFFFFFFF, |
| 396 | .mods = 0xFF, | ||
| 353 | .leds = 0xFFFFFFFF, | 397 | .leds = 0xFFFFFFFF, |
| 354 | .suspended = false, | 398 | .suspended = false, |
| 355 | }; | 399 | }; |
| @@ -499,7 +543,18 @@ void update_status(bool changed) { | |||
| 499 | #endif | 543 | #endif |
| 500 | } | 544 | } |
| 501 | 545 | ||
| 502 | void visualizer_update(uint32_t default_state, uint32_t state, uint32_t leds) { | 546 | uint8_t visualizer_get_mods() { |
| 547 | uint8_t mods = get_mods(); | ||
| 548 | |||
| 549 | #ifndef NO_ACTION_ONESHOT | ||
| 550 | if (!has_oneshot_mods_timed_out()) { | ||
| 551 | mods |= get_oneshot_mods(); | ||
| 552 | } | ||
| 553 | #endif | ||
| 554 | return mods; | ||
| 555 | } | ||
| 556 | |||
| 557 | void visualizer_update(uint32_t default_state, uint32_t state, uint8_t mods, uint32_t leds) { | ||
| 503 | // Note that there's a small race condition here, the thread could read | 558 | // Note that there's a small race condition here, the thread could read |
| 504 | // a state where one of these are set but not the other. But this should | 559 | // a state where one of these are set but not the other. But this should |
| 505 | // not really matter as it will be fixed during the next loop step. | 560 | // not really matter as it will be fixed during the next loop step. |
| @@ -523,6 +578,7 @@ void visualizer_update(uint32_t default_state, uint32_t state, uint32_t leds) { | |||
| 523 | visualizer_keyboard_status_t new_status = { | 578 | visualizer_keyboard_status_t new_status = { |
| 524 | .layer = state, | 579 | .layer = state, |
| 525 | .default_layer = default_state, | 580 | .default_layer = default_state, |
| 581 | .mods = mods, | ||
| 526 | .leds = leds, | 582 | .leds = leds, |
| 527 | .suspended = current_status.suspended, | 583 | .suspended = current_status.suspended, |
| 528 | }; | 584 | }; |
diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 53e250725..315af5022 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h | |||
| @@ -34,10 +34,14 @@ SOFTWARE. | |||
| 34 | #include "lcd_backlight.h" | 34 | #include "lcd_backlight.h" |
| 35 | #endif | 35 | #endif |
| 36 | 36 | ||
| 37 | // use this function to merget both real_mods and oneshot_mods in a uint16_t | ||
| 38 | uint8_t visualizer_get_mods(void); | ||
| 39 | |||
| 37 | // This need to be called once at the start | 40 | // This need to be called once at the start |
| 38 | void visualizer_init(void); | 41 | void visualizer_init(void); |
| 39 | // This should be called at every matrix scan | 42 | // This should be called at every matrix scan |
| 40 | void visualizer_update(uint32_t default_state, uint32_t state, uint32_t leds); | 43 | void visualizer_update(uint32_t default_state, uint32_t state, uint8_t mods, uint32_t leds); |
| 44 | |||
| 41 | // This should be called when the keyboard goes to suspend state | 45 | // This should be called when the keyboard goes to suspend state |
| 42 | void visualizer_suspend(void); | 46 | void visualizer_suspend(void); |
| 43 | // This should be called when the keyboard wakes up from suspend state | 47 | // This should be called when the keyboard wakes up from suspend state |
| @@ -61,6 +65,7 @@ struct keyframe_animation_t; | |||
| 61 | typedef struct { | 65 | typedef struct { |
| 62 | uint32_t layer; | 66 | uint32_t layer; |
| 63 | uint32_t default_layer; | 67 | uint32_t default_layer; |
| 68 | uint8_t mods; | ||
| 64 | uint32_t leds; // See led.h for available statuses | 69 | uint32_t leds; // See led.h for available statuses |
| 65 | bool suspended; | 70 | bool suspended; |
| 66 | } visualizer_keyboard_status_t; | 71 | } visualizer_keyboard_status_t; |
| @@ -129,6 +134,8 @@ bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_st | |||
| 129 | bool keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state); | 134 | bool keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state); |
| 130 | // Displays a bitmap (0/1) of all the currently active layers | 135 | // Displays a bitmap (0/1) of all the currently active layers |
| 131 | bool keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); | 136 | bool keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); |
| 137 | // Displays a bitmap (0/1) of all the currently active mods | ||
| 138 | bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); | ||
| 132 | 139 | ||
| 133 | bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); | 140 | bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); |
| 134 | bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); | 141 | bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); |
