summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
Diffstat (limited to 'quantum')
-rw-r--r--quantum/audio/audio_arm.c612
-rw-r--r--quantum/keymap_common.c2
-rw-r--r--quantum/keymap_extras/sendstring_german.h4
-rw-r--r--quantum/led_matrix.c391
-rw-r--r--quantum/led_matrix_drivers.c149
-rw-r--r--quantum/ledmatrix.h129
-rw-r--r--quantum/matrix.c2
-rw-r--r--quantum/process_keycode/process_clicky.c26
-rw-r--r--quantum/quantum.c69
-rw-r--r--quantum/quantum.h6
-rw-r--r--quantum/rgblight.c13
-rw-r--r--quantum/template/avr/config.h5
-rw-r--r--quantum/template/ps2avrgb/config.h5
13 files changed, 1079 insertions, 334 deletions
diff --git a/quantum/audio/audio_arm.c b/quantum/audio/audio_arm.c
index 989f7a64b..f24ce4bd0 100644
--- a/quantum/audio/audio_arm.c
+++ b/quantum/audio/audio_arm.c
@@ -273,19 +273,24 @@ static const DACConversionGroup dacgrpcfg2 = {
.trigger = DAC_TRG(0)
};
-void audio_init()
-{
-
- if (audio_initialized)
- return;
-
- // Check EEPROM
- // if (!eeconfig_is_enabled())
- // {
- // eeconfig_init();
- // }
- // audio_config.raw = eeconfig_read_audio();
+void audio_init() {
+
+ if (audio_initialized) {
+ return;
+ }
+
+ // Check EEPROM
+ #if defined(STM32_EEPROM_ENABLE) || defined(PROTOCOL_ARM_ATSAM) || defined(EEPROM_SIZE)
+ if (!eeconfig_is_enabled()) {
+ eeconfig_init();
+ }
+ audio_config.raw = eeconfig_read_audio();
+#else // ARM EEPROM
audio_config.enable = true;
+ #ifdef AUDIO_CLICKY_ON
+ audio_config.clicky_enable = true;
+ #endif
+#endif // ARM EEPROM
/*
* Starting DAC1 driver, setting up the output pin as analog as suggested
@@ -308,16 +313,15 @@ void audio_init()
dacStartConversion(&DACD1, &dacgrpcfg1, (dacsample_t *)dac_buffer, DAC_BUFFER_SIZE);
dacStartConversion(&DACD2, &dacgrpcfg2, (dacsample_t *)dac_buffer_2, DAC_BUFFER_SIZE);
- audio_initialized = true;
+ audio_initialized = true;
- if (audio_config.enable) {
- PLAY_SONG(startup_song);
- }
+ if (audio_config.enable) {
+ PLAY_SONG(startup_song);
+ }
}
-void stop_all_notes()
-{
+void stop_all_notes() {
dprintf("audio stop all notes");
if (!audio_initialized) {
@@ -342,347 +346,347 @@ void stop_all_notes()
}
}
-void stop_note(float freq)
-{
- dprintf("audio stop note freq=%d", (int)freq);
+void stop_note(float freq) {
+ dprintf("audio stop note freq=%d", (int)freq);
- if (playing_note) {
- if (!audio_initialized) {
- audio_init();
- }
- for (int i = 7; i >= 0; i--) {
- if (frequencies[i] == freq) {
- frequencies[i] = 0;
- volumes[i] = 0;
- for (int j = i; (j < 7); j++) {
- frequencies[j] = frequencies[j+1];
- frequencies[j+1] = 0;
- volumes[j] = volumes[j+1];
- volumes[j+1] = 0;
- }
- break;
- }
- }
- voices--;
- if (voices < 0)
- voices = 0;
- if (voice_place >= voices) {
- voice_place = 0;
- }
- if (voices == 0) {
- STOP_CHANNEL_1();
- STOP_CHANNEL_2();
- gptStopTimer(&GPTD8);
- frequency = 0;
- frequency_alt = 0;
- volume = 0;
- playing_note = false;
+ if (playing_note) {
+ if (!audio_initialized) {
+ audio_init();
+ }
+ for (int i = 7; i >= 0; i--) {
+ if (frequencies[i] == freq) {
+ frequencies[i] = 0;
+ volumes[i] = 0;
+ for (int j = i; (j < 7); j++) {
+ frequencies[j] = frequencies[j+1];
+ frequencies[j+1] = 0;
+ volumes[j] = volumes[j+1];
+ volumes[j+1] = 0;
}
+ break;
+ }
+ }
+ voices--;
+ if (voices < 0) {
+ voices = 0;
+ }
+ if (voice_place >= voices) {
+ voice_place = 0;
+ }
+ if (voices == 0) {
+ STOP_CHANNEL_1();
+ STOP_CHANNEL_2();
+ gptStopTimer(&GPTD8);
+ frequency = 0;
+ frequency_alt = 0;
+ volume = 0;
+ playing_note = false;
}
+ }
}
#ifdef VIBRATO_ENABLE
-float mod(float a, int b)
-{
- float r = fmod(a, b);
- return r < 0 ? r + b : r;
+float mod(float a, int b) {
+ float r = fmod(a, b);
+ return r < 0 ? r + b : r;
}
float vibrato(float average_freq) {
- #ifdef VIBRATO_STRENGTH_ENABLE
- float vibrated_freq = average_freq * pow(vibrato_lut[(int)vibrato_counter], vibrato_strength);
- #else
- float vibrated_freq = average_freq * vibrato_lut[(int)vibrato_counter];
- #endif
- vibrato_counter = mod((vibrato_counter + vibrato_rate * (1.0 + 440.0/average_freq)), VIBRATO_LUT_LENGTH);
- return vibrated_freq;
+ #ifdef VIBRATO_STRENGTH_ENABLE
+ float vibrated_freq = average_freq * pow(vibrato_lut[(int)vibrato_counter], vibrato_strength);
+ #else
+ float vibrated_freq = average_freq * vibrato_lut[(int)vibrato_counter];
+ #endif
+ vibrato_counter = mod((vibrato_counter + vibrato_rate * (1.0 + 440.0/average_freq)), VIBRATO_LUT_LENGTH);
+ return vibrated_freq;
}
#endif
static void gpt_cb8(GPTDriver *gptp) {
- float freq;
-
- if (playing_note) {
- if (voices > 0) {
-
- float freq_alt = 0;
- if (voices > 1) {
- if (polyphony_rate == 0) {
- if (glissando) {
- if (frequency_alt != 0 && frequency_alt < frequencies[voices - 2] && frequency_alt < frequencies[voices - 2] * pow(2, -440/frequencies[voices - 2]/12/2)) {
- frequency_alt = frequency_alt * pow(2, 440/frequency_alt/12/2);
- } else if (frequency_alt != 0 && frequency_alt > frequencies[voices - 2] && frequency_alt > frequencies[voices - 2] * pow(2, 440/frequencies[voices - 2]/12/2)) {
- frequency_alt = frequency_alt * pow(2, -440/frequency_alt/12/2);
- } else {
- frequency_alt = frequencies[voices - 2];
- }
- } else {
- frequency_alt = frequencies[voices - 2];
- }
-
- #ifdef VIBRATO_ENABLE
- if (vibrato_strength > 0) {
- freq_alt = vibrato(frequency_alt);
- } else {
- freq_alt = frequency_alt;
- }
- #else
- freq_alt = frequency_alt;
- #endif
- }
-
- if (envelope_index < 65535) {
- envelope_index++;
- }
-
- freq_alt = voice_envelope(freq_alt);
-
- if (freq_alt < 30.517578125) {
- freq_alt = 30.52;
- }
-
- if (GET_CHANNEL_2_FREQ != (uint16_t)freq_alt) {
- UPDATE_CHANNEL_2_FREQ(freq_alt);
- } else {
- RESTART_CHANNEL_2();
- }
- //note_timbre;
- }
-
- if (polyphony_rate > 0) {
- if (voices > 1) {
- voice_place %= voices;
- if (place++ > (frequencies[voice_place] / polyphony_rate)) {
- voice_place = (voice_place + 1) % voices;
- place = 0.0;
- }
- }
-
- #ifdef VIBRATO_ENABLE
- if (vibrato_strength > 0) {
- freq = vibrato(frequencies[voice_place]);
- } else {
- freq = frequencies[voice_place];
- }
- #else
- freq = frequencies[voice_place];
- #endif
+ float freq;
+
+ if (playing_note) {
+ if (voices > 0) {
+
+ float freq_alt = 0;
+ if (voices > 1) {
+ if (polyphony_rate == 0) {
+ if (glissando) {
+ if (frequency_alt != 0 && frequency_alt < frequencies[voices - 2] && frequency_alt < frequencies[voices - 2] * pow(2, -440/frequencies[voices - 2]/12/2)) {
+ frequency_alt = frequency_alt * pow(2, 440/frequency_alt/12/2);
+ } else if (frequency_alt != 0 && frequency_alt > frequencies[voices - 2] && frequency_alt > frequencies[voices - 2] * pow(2, 440/frequencies[voices - 2]/12/2)) {
+ frequency_alt = frequency_alt * pow(2, -440/frequency_alt/12/2);
} else {
- if (glissando) {
- if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) {
- frequency = frequency * pow(2, 440/frequency/12/2);
- } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) {
- frequency = frequency * pow(2, -440/frequency/12/2);
- } else {
- frequency = frequencies[voices - 1];
- }
- } else {
- frequency = frequencies[voices - 1];
- }
-
- #ifdef VIBRATO_ENABLE
- if (vibrato_strength > 0) {
- freq = vibrato(frequency);
- } else {
- freq = frequency;
- }
- #else
- freq = frequency;
- #endif
+ frequency_alt = frequencies[voices - 2];
}
+ } else {
+ frequency_alt = frequencies[voices - 2];
+ }
- if (envelope_index < 65535) {
- envelope_index++;
- }
-
- freq = voice_envelope(freq);
-
- if (freq < 30.517578125) {
- freq = 30.52;
- }
-
-
- if (GET_CHANNEL_1_FREQ != (uint16_t)freq) {
- UPDATE_CHANNEL_1_FREQ(freq);
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq_alt = vibrato(frequency_alt);
} else {
- RESTART_CHANNEL_1();
+ freq_alt = frequency_alt;
}
- //note_timbre;
+ #else
+ freq_alt = frequency_alt;
+ #endif
}
- }
- if (playing_notes) {
- if (note_frequency > 0) {
- #ifdef VIBRATO_ENABLE
- if (vibrato_strength > 0) {
- freq = vibrato(note_frequency);
- } else {
- freq = note_frequency;
- }
- #else
- freq = note_frequency;
- #endif
-
- if (envelope_index < 65535) {
- envelope_index++;
- }
- freq = voice_envelope(freq);
+ if (envelope_index < 65535) {
+ envelope_index++;
+ }
+ freq_alt = voice_envelope(freq_alt);
- if (GET_CHANNEL_1_FREQ != (uint16_t)freq) {
- UPDATE_CHANNEL_1_FREQ(freq);
- UPDATE_CHANNEL_2_FREQ(freq);
- }
- //note_timbre;
+ if (freq_alt < 30.517578125) {
+ freq_alt = 30.52;
+ }
+
+ if (GET_CHANNEL_2_FREQ != (uint16_t)freq_alt) {
+ UPDATE_CHANNEL_2_FREQ(freq_alt);
} else {
- // gptStopTimer(&GPTD6);
- // gptStopTimer(&GPTD7);
+ RESTART_CHANNEL_2();
+ }
+ //note_timbre;
+ }
+
+ if (polyphony_rate > 0) {
+ if (voices > 1) {
+ voice_place %= voices;
+ if (place++ > (frequencies[voice_place] / polyphony_rate)) {
+ voice_place = (voice_place + 1) % voices;
+ place = 0.0;
+ }
}
- note_position++;
- bool end_of_note = false;
- if (GET_CHANNEL_1_FREQ > 0) {
- if (!note_resting)
- end_of_note = (note_position >= (note_length*8 - 1));
- else
- end_of_note = (note_position >= (note_length*8));
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq = vibrato(frequencies[voice_place]);
+ } else {
+ freq = frequencies[voice_place];
+ }
+ #else
+ freq = frequencies[voice_place];
+ #endif
+ } else {
+ if (glissando) {
+ if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) {
+ frequency = frequency * pow(2, 440/frequency/12/2);
+ } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) {
+ frequency = frequency * pow(2, -440/frequency/12/2);
+ } else {
+ frequency = frequencies[voices - 1];
+ }
} else {
- end_of_note = (note_position >= (note_length*8));
+ frequency = frequencies[voices - 1];
}
- if (end_of_note) {
- current_note++;
- if (current_note >= notes_count) {
- if (notes_repeat) {
- current_note = 0;
- } else {
- STOP_CHANNEL_1();
- STOP_CHANNEL_2();
- // gptStopTimer(&GPTD8);
- playing_notes = false;
- return;
- }
- }
- if (!note_resting) {
- note_resting = true;
- current_note--;
- if ((*notes_pointer)[current_note][0] == (*notes_pointer)[current_note + 1][0]) {
- note_frequency = 0;
- note_length = 1;
- } else {
- note_frequency = (*notes_pointer)[current_note][0];
- note_length = 1;
- }
- } else {
- note_resting = false;
- envelope_index = 0;
- note_frequency = (*notes_pointer)[current_note][0];
- note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
- }
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq = vibrato(frequency);
+ } else {
+ freq = frequency;
+ }
+ #else
+ freq = frequency;
+ #endif
+ }
- note_position = 0;
- }
- }
+ if (envelope_index < 65535) {
+ envelope_index++;
+ }
- if (!audio_config.enable) {
- playing_notes = false;
- playing_note = false;
- }
-}
+ freq = voice_envelope(freq);
-void play_note(float freq, int vol) {
+ if (freq < 30.517578125) {
+ freq = 30.52;
+ }
- dprintf("audio play note freq=%d vol=%d", (int)freq, vol);
- if (!audio_initialized) {
- audio_init();
+ if (GET_CHANNEL_1_FREQ != (uint16_t)freq) {
+ UPDATE_CHANNEL_1_FREQ(freq);
+ } else {
+ RESTART_CHANNEL_1();
+ }
+ //note_timbre;
}
+ }
- if (audio_config.enable && voices < 8) {
+ if (playing_notes) {
+ if (note_frequency > 0) {
+ #ifdef VIBRATO_ENABLE
+ if (vibrato_strength > 0) {
+ freq = vibrato(note_frequency);
+ } else {
+ freq = note_frequency;
+ }
+ #else
+ freq = note_frequency;
+ #endif
+ if (envelope_index < 65535) {
+ envelope_index++;
+ }
+ freq = voice_envelope(freq);
- // Cancel notes if notes are playing
- if (playing_notes)
- stop_all_notes();
- playing_note = true;
+ if (GET_CHANNEL_1_FREQ != (uint16_t)freq) {
+ UPDATE_CHANNEL_1_FREQ(freq);
+ UPDATE_CHANNEL_2_FREQ(freq);
+ }
+ //note_timbre;
+ } else {
+ // gptStopTimer(&GPTD6);
+ // gptStopTimer(&GPTD7);
+ }
- envelope_index = 0;
+ note_position++;
+ bool end_of_note = false;
+ if (GET_CHANNEL_1_FREQ > 0) {
+ if (!note_resting)
+ end_of_note = (note_position >= (note_length*8 - 1));
+ else
+ end_of_note = (note_position >= (note_length*8));
+ } else {
+ end_of_note = (note_position >= (note_length*8));
+ }
- if (freq > 0) {
- frequencies[voices] = freq;
- volumes[voices] = vol;
- voices++;
+ if (end_of_note) {
+ current_note++;
+ if (current_note >= notes_count) {
+ if (notes_repeat) {
+ current_note = 0;
+ } else {
+ STOP_CHANNEL_1();
+ STOP_CHANNEL_2();
+ // gptStopTimer(&GPTD8);
+ playing_notes = false;
+ return;
+ }
+ }
+ if (!note_resting) {
+ note_resting = true;
+ current_note--;
+ if ((*notes_pointer)[current_note][0] == (*notes_pointer)[current_note + 1][0]) {
+ note_frequency = 0;
+ note_length = 1;
+ } else {
+ note_frequency = (*notes_pointer)[current_note][0];
+ note_length = 1;
}
+ } else {
+ note_resting = false;
+ envelope_index = 0;
+ note_frequency = (*notes_pointer)[current_note][0];
+ note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
+ }
- gptStart(&GPTD8, &gpt8cfg1);
- gptStartContinuous(&GPTD8, 2U);
- RESTART_CHANNEL_1();
- RESTART_CHANNEL_2();
+ note_position = 0;
}
+ }
+ if (!audio_config.enable) {
+ playing_notes = false;
+ playing_note = false;
+ }
}
-void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat)
-{
+void play_note(float freq, int vol) {
- if (!audio_initialized) {
- audio_init();
+ dprintf("audio play note freq=%d vol=%d", (int)freq, vol);
+
+ if (!audio_initialized) {
+ audio_init();
+ }
+
+ if (audio_config.enable && voices < 8) {
+
+ // Cancel notes if notes are playing
+ if (playing_notes) {
+ stop_all_notes();
}
- if (audio_config.enable) {
+ playing_note = true;
- // Cancel note if a note is playing
- if (playing_note)
- stop_all_notes();
+ envelope_index = 0;
- playing_notes = true;
+ if (freq > 0) {
+ frequencies[voices] = freq;
+ volumes[voices] = vol;
+ voices++;
+ }
- notes_pointer = np;
- notes_count = n_count;
- notes_repeat = n_repeat;
+ gptStart(&GPTD8, &gpt8cfg1);
+ gptStartContinuous(&GPTD8, 2U);
+ RESTART_CHANNEL_1();
+ RESTART_CHANNEL_2();
+ }
- place = 0;
- current_note = 0;
+}
- note_frequency = (*notes_pointer)[current_note][0];
- note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
- note_position = 0;
+void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat) {
- gptStart(&GPTD8, &gpt8cfg1);
- gptStartContinuous(&GPTD8, 2U);
- RESTART_CHANNEL_1();
- RESTART_CHANNEL_2();
+ if (!audio_initialized) {
+ audio_init();
+ }
+
+ if (audio_config.enable) {
+
+ // Cancel note if a note is playing
+ if (playing_note) {
+ stop_all_notes();
}
+ playing_notes = true;
+
+ notes_pointer = np;
+ notes_count = n_count;
+ notes_repeat = n_repeat;
+
+ place = 0;
+ current_note = 0;
+
+ note_frequency = (*notes_pointer)[current_note][0];
+ note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
+ note_position = 0;
+
+ gptStart(&GPTD8, &gpt8cfg1);
+ gptStartContinuous(&GPTD8, 2U);
+ RESTART_CHANNEL_1();
+ RESTART_CHANNEL_2();
+ }
}
bool is_playing_notes(void) {
- return playing_notes;
+ return playing_notes;
}
bool is_audio_on(void) {
- return (audio_config.enable != 0);
+ return (audio_config.enable != 0);
}
void audio_toggle(void) {
- audio_config.enable ^= 1;
- eeconfig_update_audio(audio_config.raw);
- if (audio_config.enable)
- audio_on_user();
+ audio_config.enable ^= 1;
+ eeconfig_update_audio(audio_config.raw);
+ if (audio_config.enable) {
+ audio_on_user();
+ }
}
void audio_on(void) {
- audio_config.enable = 1;
- eeconfig_update_audio(audio_config.raw);
- audio_on_user();
+ audio_config.enable = 1;
+ eeconfig_update_audio(audio_config.raw);
+ audio_on_user();
}
void audio_off(void) {
- audio_config.enable = 0;
- eeconfig_update_audio(audio_config.raw);
+ stop_all_notes();
+ audio_config.enable = 0;
+ eeconfig_update_audio(audio_config.raw);
}
#ifdef VIBRATO_ENABLE
@@ -690,29 +694,29 @@ void audio_off(void) {
// Vibrato rate functions
void set_vibrato_rate(float rate) {
- vibrato_rate = rate;
+ vibrato_rate = rate;
}
void increase_vibrato_rate(float change) {
- vibrato_rate *= change;
+ vibrato_rate *= change;
}
void decrease_vibrato_rate(float change) {
- vibrato_rate /= change;
+ vibrato_rate /= change;
}
#ifdef VIBRATO_STRENGTH_ENABLE
void set_vibrato_strength(float strength) {
- vibrato_strength = strength;
+ vibrato_strength = strength;
}
void increase_vibrato_strength(float change) {
- vibrato_strength *= change;
+ vibrato_strength *= change;
}
void decrease_vibrato_strength(float change) {
- vibrato_strength /= change;
+ vibrato_strength /= change;
}
#endif /* VIBRATO_STRENGTH_ENABLE */
@@ -722,45 +726,45 @@ void decrease_vibrato_strength(float change) {
// Polyphony functions
void set_polyphony_rate(float rate) {
- polyphony_rate = rate;
+ polyphony_rate = rate;
}
void enable_polyphony() {
- polyphony_rate = 5;
+ polyphony_rate = 5;
}
void disable_polyphony() {
- polyphony_rate = 0;
+ polyphony_rate = 0;
}
void increase_polyphony_rate(float change) {
- polyphony_rate *= change;
+ polyphony_rate *= change;
}
void decrease_polyphony_rate(float change) {
- polyphony_rate /= change;
+ polyphony_rate /= change;
}
// Timbre function
void set_timbre(float timbre) {
- note_timbre = timbre;
+ note_timbre = timbre;
}
// Tempo functions
void set_tempo(uint8_t tempo) {
- note_tempo = tempo;
+ note_tempo = tempo;
}
void decrease_tempo(uint8_t tempo_change) {
- note_tempo += tempo_change;
+ note_tempo += tempo_change;
}
void increase_tempo(uint8_t tempo_change) {
- if (note_tempo - tempo_change < 10) {
- note_tempo = 10;
- } else {
- note_tempo -= tempo_change;
- }
+ if (note_tempo - tempo_change < 10) {
+ note_tempo = 10;
+ } else {
+ note_tempo -= tempo_change;
+ }
}
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 1a6af9e08..9d2d331ce 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -127,7 +127,7 @@ action_t action_for_key(uint8_t layer, keypos_t key)
action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF);
break;
case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
- mod = keycode & 0xF;
+ mod = mod_config(keycode & 0xF);
action_layer = (keycode >> 4) & 0xF;
action.code = ACTION_LAYER_MODS(action_layer, mod);
break;
diff --git a/quantum/keymap_extras/sendstring_german.h b/quantum/keymap_extras/sendstring_german.h
index 1eaafee31..f20fab77d 100644
--- a/quantum/keymap_extras/sendstring_german.h
+++ b/quantum/keymap_extras/sendstring_german.h
@@ -67,7 +67,7 @@ const uint8_t ascii_to_keycode_lut[0x80] PROGMEM = {
/* P Q R S T U V W */
KC_P, KC_Q, KC_R, KC_S, KC_T, KC_U, KC_V, KC_W,
/* X Y Z [ \ ] ^ _ */
- KC_X, KC_Y, KC_Z, KC_LBRC, KC_BSLS, KC_RBRC, DE_CIRC, DE_MINS,
+ KC_X, DE_Y, DE_Z, KC_LBRC, KC_BSLS, KC_RBRC, DE_CIRC, DE_MINS,
/* ` a b c d e f g */
DE_ACUT, KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G,
/* h i j k l m n o */
@@ -75,7 +75,7 @@ const uint8_t ascii_to_keycode_lut[0x80] PROGMEM = {
/* p q r s t u v w */
KC_P, KC_Q, KC_R, KC_S, KC_T, KC_U, KC_V, KC_W,
/* x y z { | } ~ DELETE */
- KC_X, KC_Y, KC_Z, KC_LBRC, KC_BSLS, KC_RBRC, KC_GRV, KC_DEL
+ KC_X, DE_Y, DE_Z, KC_LBRC, KC_BSLS, KC_RBRC, KC_GRV, KC_DEL
};
#endif
diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c
new file mode 100644
index 000000000..8ef8abe71
--- /dev/null
+++ b/quantum/led_matrix.c
@@ -0,0 +1,391 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2017 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2019 Clueboard
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "quantum.h"
+#include "ledmatrix.h"
+#include "progmem.h"
+#include "config.h"
+#include "eeprom.h"
+#include <string.h>
+#include <math.h>
+
+led_config_t led_matrix_config;
+
+#ifndef MAX
+ #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+#endif
+
+#ifndef MIN
+ #define MIN(a,b) ((a) < (b)? (a): (b))
+#endif
+
+#ifndef LED_DISABLE_AFTER_TIMEOUT
+ #define LED_DISABLE_AFTER_TIMEOUT 0
+#endif
+
+#ifndef LED_DISABLE_WHEN_USB_SUSPENDED
+ #define LED_DISABLE_WHEN_USB_SUSPENDED false
+#endif
+
+#ifndef EECONFIG_LED_MATRIX
+ #define EECONFIG_LED_MATRIX EECONFIG_RGBLIGHT
+#endif
+
+#if !defined(LED_MATRIX_MAXIMUM_BRIGHTNESS) || LED_MATRIX_MAXIMUM_BRIGHTNESS > 255
+ #define LED_MATRIX_MAXIMUM_BRIGHTNESS 255
+#endif
+
+bool g_suspend_state = false;
+
+// Global tick at 20 Hz
+uint32_t g_tick = 0;
+
+// Ticks since this key was last hit.
+uint8_t g_key_hit[LED_DRIVER_LED_COUNT];
+
+// Ticks since any key was last hit.
+uint32_t g_any_key_hit = 0;
+
+uint32_t eeconfig_read_led_matrix(void) {
+ return eeprom_read_dword(EECONFIG_LED_MATRIX);
+}
+
+void eeconfig_update_led_matrix(uint32_t config_value) {
+ eeprom_update_dword(EECONFIG_LED_MATRIX, config_value);
+}
+
+void eeconfig_update_led_matrix_default(void) {
+ dprintf("eeconfig_update_led_matrix_default\n");
+ led_matrix_config.enable = 1;
+ led_matrix_config.mode = LED_MATRIX_UNIFORM_BRIGHTNESS;
+ led_matrix_config.val = 128;
+ led_matrix_config.speed = 0;
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+}
+
+void eeconfig_debug_led_matrix(void) {
+ dprintf("led_matrix_config eeprom\n");
+ dprintf("led_matrix_config.enable = %d\n", led_matrix_config.enable);
+ dprintf("led_matrix_config.mode = %d\n", led_matrix_config.mode);
+ dprintf("led_matrix_config.val = %d\n", led_matrix_config.val);
+ dprintf("led_matrix_config.speed = %d\n", led_matrix_config.speed);
+}
+
+// Last led hit
+#ifndef LED_HITS_TO_REMEMBER
+ #define LED_HITS_TO_REMEMBER 8
+#endif
+uint8_t g_last_led_hit[LED_HITS_TO_REMEMBER] = {255};
+uint8_t g_last_led_count = 0;
+
+void map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i, uint8_t *led_count) {
+ led_matrix led;
+ *led_count = 0;
+
+ for (uint8_t i = 0; i < LED_DRIVER_LED_COUNT; i++) {
+ // map_index_to_led(i, &led);
+ led = g_leds[i];
+ if (row == led.matrix_co.row && column == led.matrix_co.col) {
+ led_i[*led_count] = i;
+ (*led_count)++;
+ }
+ }
+}
+
+void led_matrix_update_pwm_buffers(void) {
+ led_matrix_driver.flush();
+}
+
+void led_matrix_set_index_value(int index, uint8_t value) {
+ led_matrix_driver.set_value(index, value);
+}
+
+void led_matrix_set_index_value_all(uint8_t value) {
+ led_matrix_driver.set_value_all(value);
+}
+
+bool process_led_matrix(uint16_t keycode, keyrecord_t *record) {
+ if (record->event.pressed) {
+ uint8_t led[8], led_count;
+ map_row_column_to_led(record->event.key.row, record->event.key.col, led, &led_count);
+ if (led_count > 0) {
+ for (uint8_t i = LED_HITS_TO_REMEMBER; i > 1; i--) {
+ g_last_led_hit[i - 1] = g_last_led_hit[i - 2];
+ }
+ g_last_led_hit[0] = led[0];
+ g_last_led_count = MIN(LED_HITS_TO_REMEMBER, g_last_led_count + 1);
+ }
+ for(uint8_t i = 0; i < led_count; i++)
+ g_key_hit[led[i]] = 0;
+ g_any_key_hit = 0;
+ } else {
+ #ifdef LED_MATRIX_KEYRELEASES
+ uint8_t led[8], led_count;
+ map_row_column_to_led(record->event.key.row, record->event.key.col, led, &led_count);
+ for(uint8_t i = 0; i < led_count; i++)
+ g_key_hit[led[i]] = 255;
+
+ g_any_key_hit = 255;
+ #endif
+ }
+ return true;
+}
+
+void led_matrix_set_suspend_state(bool state) {
+ g_suspend_state = state;
+}
+
+// All LEDs off
+void led_matrix_all_off(void) {
+ led_matrix_set_index_value_all(0);
+}
+
+// Uniform brightness
+void led_matrix_uniform_brightness(void) {
+ led_matrix_set_index_value_all(LED_MATRIX_MAXIMUM_BRIGHTNESS / BACKLIGHT_LEVELS * led_matrix_config.val);
+}
+
+void led_matrix_custom(void) {}
+
+void led_matrix_task(void) {
+ if (!led_matrix_config.enable) {
+ led_matrix_all_off();
+ led_matrix_indicators();
+ return;
+ }
+
+ g_tick++;
+
+ if (g_any_key_hit < 0xFFFFFFFF) {
+ g_any_key_hit++;
+ }
+
+ for (int led = 0; led < LED_DRIVER_LED_COUNT; led++) {
+ if (g_key_hit[led] < 255) {
+ if (g_key_hit[led] == 254)
+ g_last_led_count = MAX(g_last_led_count - 1, 0);
+ g_key_hit[led]++;
+ }
+ }
+
+ // Ideally we would also stop sending zeros to the LED driver PWM buffers
+ // while suspended and just do a software shutdown. This is a cheap hack for now.
+ bool suspend_backlight = ((g_suspend_state && LED_DISABLE_WHEN_USB_SUSPENDED) ||
+ (LED_DISABLE_AFTER_TIMEOUT > 0 && g_any_key_hit > LED_DISABLE_AFTER_TIMEOUT * 60 * 20));
+ uint8_t effect = suspend_backlight ? 0 : led_matrix_config.mode;
+
+ // this gets ticked at 20 Hz.
+ // each effect can opt to do calculations
+ // and/or request PWM buffer updates.
+ switch (effect) {
+ case LED_MATRIX_UNIFORM_BRIGHTNESS:
+ led_matrix_uniform_brightness();
+ break;
+ default:
+ led_matrix_custom();
+ break;
+ }
+
+ if (!suspend_backlight) {
+ led_matrix_indicators();
+ }
+
+ // Tell the LED driver to update its state
+ led_matrix_driver.flush();
+}
+
+void led_matrix_indicators(void) {
+ led_matrix_indicators_kb();
+ led_matrix_indicators_user();
+}
+
+__attribute__((weak))
+void led_matrix_indicators_kb(void) {}
+
+__attribute__((weak))
+void led_matrix_indicators_user(void) {}
+
+
+// void led_matrix_set_indicator_index(uint8_t *index, uint8_t row, uint8_t column)
+// {
+// if (row >= MATRIX_ROWS)
+// {
+// // Special value, 255=none, 254=all
+// *index = row;
+// }
+// else
+// {
+// // This needs updated to something like
+// // uint8_t led[8], led_count;
+// // map_row_column_to_led(row,column,led,&led_count);
+// // for(uint8_t i = 0; i < led_count; i++)
+// map_row_column_to_led(row, column, index);
+// }
+// }
+
+void led_matrix_init(void) {
+ led_matrix_driver.init();
+
+ // Wait half a second for the driver to finish initializing
+ wait_ms(500);
+
+ // clear the key hits
+ for (int led=0; led<LED_DRIVER_LED_COUNT; led++) {
+ g_key_hit[led] = 255;
+ }
+
+ if (!eeconfig_is_enabled()) {
+ dprintf("led_matrix_init_drivers eeconfig is not enabled.\n");
+ eeconfig_init();
+ eeconfig_update_led_matrix_default();
+ }
+
+ led_matrix_config.raw = eeconfig_read_led_matrix();
+
+ if (!led_matrix_config.mode) {
+ dprintf("led_matrix_init_drivers led_matrix_config.mode = 0. Write default values to EEPROM.\n");
+ eeconfig_update_led_matrix_default();
+ led_matrix_config.raw = eeconfig_read_led_matrix();
+ }
+
+ eeconfig_debug_led_matrix(); // display current eeprom values
+}
+
+// Deals with the messy details of incrementing an integer
+static uint8_t increment(uint8_t value, uint8_t step, uint8_t min, uint8_t max) {
+ int16_t new_value = value;
+ new_value += step;
+ return MIN(MAX(new_value, min), max);
+}
+
+static uint8_t decrement(uint8_t value, uint8_t step, uint8_t min, uint8_t max) {
+ int16_t new_value = value;
+ new_value -= step;
+ return MIN(MAX(new_value, min), max);
+}
+
+// void *backlight_get_custom_key_value_eeprom_address(uint8_t led) {
+// // 3 bytes per value
+// return EECONFIG_LED_MATRIX + (led * 3);
+// }
+
+// void backlight_get_key_value(uint8_t led, uint8_t *value) {
+// void *address = backlight_get_custom_key_value_eeprom_address(led);
+// value = eeprom_read_byte(address);
+// }
+
+// void backlight_set_key_value(uint8_t row, uint8_t column, uint8_t value) {
+// uint8_t led[8], led_count;
+// map_row_column_to_led(row,column,led,&led_count);
+// for(uint8_t i = 0; i < led_count; i++) {
+// if (led[i] < LED_DRIVER_LED_COUNT) {
+// void *address = backlight_get_custom_key_value_eeprom_address(led[i]);
+// eeprom_update_byte(address, value);
+// }
+// }
+// }
+
+uint32_t led_matrix_get_tick(void) {
+ return g_tick;
+}
+
+void led_matrix_toggle(void) {
+ led_matrix_config.enable ^= 1;
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+}
+
+void led_matrix_enable(void) {
+ led_matrix_config.enable = 1;
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+}
+
+void led_matrix_enable_noeeprom(void) {
+ led_matrix_config.enable = 1;
+}
+
+void led_matrix_disable(void) {
+ led_matrix_config.enable = 0;
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+}
+
+void led_matrix_disable_noeeprom(void) {
+ led_matrix_config.enable = 0;
+}
+
+void led_matrix_step(void) {
+ led_matrix_config.mode++;
+ if (led_matrix_config.mode >= LED_MATRIX_EFFECT_MAX) {
+ led_matrix_config.mode = 1;
+ }
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+}
+
+void led_matrix_step_reverse(void) {
+ led_matrix_config.mode--;
+ if (led_matrix_config.mode < 1) {
+ led_matrix_config.mode = LED_MATRIX_EFFECT_MAX - 1;
+ }
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+}
+
+void led_matrix_increase_val(void) {
+ led_matrix_config.val = increment(led_matrix_config.val, 8, 0, LED_MATRIX_MAXIMUM_BRIGHTNESS);
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+}
+
+void led_matrix_decrease_val(void) {
+ led_matrix_config.val = decrement(led_matrix_config.val, 8, 0, LED_MATRIX_MAXIMUM_BRIGHTNESS);
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+}
+
+void led_matrix_increase_speed(void) {
+ led_matrix_config.speed = increment(led_matrix_config.speed, 1, 0, 3);
+ eeconfig_update_led_matrix(led_matrix_config.raw);//EECONFIG needs to be increased to support this
+}
+
+void led_matrix_decrease_speed(void) {
+ led_matrix_config.speed = decrement(led_matrix_config.speed, 1, 0, 3);
+ eeconfig_update_led_matrix(led_matrix_config.raw);//EECONFIG needs to be increased to support this
+}
+
+void led_matrix_mode(uint8_t mode, bool eeprom_write) {
+ led_matrix_config.mode = mode;
+ if (eeprom_write) {
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+ }
+}
+
+uint8_t led_matrix_get_mode(void) {
+ return led_matrix_config.mode;
+}
+
+void led_matrix_set_value_noeeprom(uint8_t val) {
+ led_matrix_config.val = val;
+}
+
+void led_matrix_set_value(uint8_t val) {
+ led_matrix_set_value_noeeprom(val);
+ eeconfig_update_led_matrix(led_matrix_config.raw);
+}
+
+void backlight_set(uint8_t val) {
+ led_matrix_set_value(val);
+}
diff --git a/quantum/led_matrix_drivers.c b/quantum/led_matrix_drivers.c
new file mode 100644
index 000000000..4ee509ee5
--- /dev/null
+++ b/quantum/led_matrix_drivers.c
@@ -0,0 +1,149 @@
+/* Copyright 2018 James Laird-Wah
+ * Copyright 2019 Clueboard
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "quantum.h"
+#include "ledmatrix.h"
+
+/* Each driver needs to define a struct:
+ *
+ * const led_matrix_driver_t led_matrix_driver;
+ *
+ * All members must be provided. Keyboard custom drivers must define this
+ * in their own files.
+ */
+
+#if defined(IS31FL3731) || defined(IS31FL3733)
+
+#if defined(IS31FL3731)
+ #include "is31fl3731-simple.h"
+#endif
+
+#include "i2c_master.h"
+
+static void init(void) {
+ i2c_init();
+ #ifdef IS31FL3731
+ #ifdef LED_DRIVER_ADDR_1
+ IS31FL3731_init(LED_DRIVER_ADDR_1);
+ #endif
+ #ifdef LED_DRIVER_ADDR_2
+ IS31FL3731_init(LED_DRIVER_ADDR_2);
+ #endif
+ #ifdef LED_DRIVER_ADDR_3
+ IS31FL3731_init(LED_DRIVER_ADDR_3);
+ #endif
+ #ifdef LED_DRIVER_ADDR_4
+ IS31FL3731_init(LED_DRIVER_ADDR_4);
+ #endif
+ #else
+ #ifdef LED_DRIVER_ADDR_1
+ IS31FL3733_init(LED_DRIVER_ADDR_1);
+ #endif
+ #ifdef LED_DRIVER_ADDR_2
+ IS31FL3733_init(LED_DRIVER_ADDR_2);
+ #endif
+ #ifdef LED_DRIVER_ADDR_3
+ IS31FL3733_init(LED_DRIVER_ADDR_3);
+ #endif
+ #ifdef LED_DRIVER_ADDR_4
+ IS31FL3733_init(LED_DRIVER_ADDR_4);
+ #endif
+ #endif
+
+ for (int index = 0; index < LED_DRIVER_LED_COUNT; index++) {
+ #ifdef IS31FL3731
+ IS31FL3731_set_led_control_register(index, true);
+ #else
+ IS31FL3733_set_led_control_register(index, true);
+ #endif
+ }
+ // This actually updates the LED drivers
+ #ifdef IS31FL3731
+ #ifdef LED_DRIVER_ADDR_1
+ IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
+ #endif
+ #ifdef LED_DRIVER_ADDR_2
+ IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_2, 1);
+ #endif
+ #ifdef LED_DRIVER_ADDR_3
+ IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_3, 2);
+ #endif
+ #ifdef LED_DRIVER_ADDR_4
+ IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_4, 3);
+ #endif
+ #else
+ #ifdef LED_DRIVER_ADDR_1
+ IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
+ #endif
+ #ifdef LED_DRIVER_ADDR_2
+ IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_2, 1);
+ #endif
+ #ifdef LED_DRIVER_ADDR_3
+ IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_3, 2);
+ #endif
+ #ifdef LED_DRIVER_ADDR_4
+ IS31FL3733_update_led_control_registers(LED_DRIVER_ADDR_4, 3);
+ #endif
+ #endif
+}
+
+static void flush(void) {
+ #ifdef IS31FL3731
+ #ifdef LED_DRIVER_ADDR_1
+ IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);
+ #endif
+ #ifdef LED_DRIVER_ADDR_2
+ IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_2, 1);
+ #endif
+ #ifdef LED_DRIVER_ADDR_3
+ IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_3, 2);
+ #endif
+ #ifdef LED_DRIVER_ADDR_4
+ IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_4, 3);
+ #endif
+ #else
+ #ifdef LED_DRIVER_ADDR_1
+ IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);
+ #endif
+ #ifdef LED_DRIVER_ADDR_2
+ IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_2, 1);
+ #endif
+ #ifdef LED_DRIVER_ADDR_3
+ IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_3, 2);
+ #endif
+ #ifdef LED_DRIVER_ADDR_4
+ IS31FL3733_update_pwm_buffers(LED_DRIVER_ADDR_4, 3);
+ #endif
+ #endif
+}
+
+const led_matrix_driver_t led_matrix_driver = {
+ .init = init,
+ .flush = flush,
+#ifdef IS31FL3731
+ .set_value = IS31FL3731_set_value,
+ .set_value_all = IS31FL3731_set_value_all,
+#else
+ .set_value = IS31FL3733_set_value,
+ .set_value_all = IS31FL3733_set_value_all,
+#endif
+};
+
+
+#endif
diff --git a/quantum/ledmatrix.h b/quantum/ledmatrix.h
new file mode 100644
index 000000000..618c5d676
--- /dev/null
+++ b/quantum/ledmatrix.h
@@ -0,0 +1,129 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2017 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2019 Clueboard
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LED_MATRIX_H
+#define LED_MATRIX_H
+
+
+#ifndef BACKLIGHT_ENABLE
+ #error You must define BACKLIGHT_ENABLE with LED_MATRIX_ENABLE
+#endif
+
+
+typedef struct Point {
+ uint8_t x;
+ uint8_t y;
+} __attribute__((packed)) Point;
+
+typedef struct led_matrix {
+ union {
+ uint8_t raw;
+ struct {
+ uint8_t row:4; // 16 max
+ uint8_t col:4; // 16 max
+ };
+ } matrix_co;
+ Point point;
+ uint8_t modifier:1;
+} __attribute__((packed)) led_matrix;
+
+extern const led_matrix g_leds[LED_DRIVER_LED_COUNT];
+
+typedef struct {
+ uint8_t index;
+ uint8_t value;
+} led_indicator;
+
+typedef union {
+ uint32_t raw;
+ struct {
+ bool enable :1;
+ uint8_t mode :6;
+ uint8_t hue :8; // Unused by led_matrix
+ uint8_t sat :8; // Unused by led_matrix
+ uint8_t val :8;
+ uint8_t speed :8;//EECONFIG needs to be increased to support this
+ };
+} led_config_t;
+
+enum led_matrix_effects {
+ LED_MATRIX_UNIFORM_BRIGHTNESS = 1,
+ // All new effects go above this line
+ LED_MATRIX_EFFECT_MAX
+};
+
+void led_matrix_set_index_value(int index, uint8_t value);
+void led_matrix_set_index_value_all(uint8_t value);
+
+// This runs after another backlight effect and replaces
+// colors already set
+void led_matrix_indicators(void);
+void led_matrix_indicators_kb(void);
+void led_matrix_indicators_user(void);
+
+void led_matrix_init(void);
+void led_matrix_setup_drivers(void);
+
+void led_matrix_set_suspend_state(bool state);
+void led_matrix_set_indicator_state(uint8_t state);
+
+void led_matrix_task(void);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void led_matrix_update_pwm_buffers(void);
+
+bool process_led_matrix(uint16_t keycode, keyrecord_t *record);
+
+uint32_t led_matrix_get_tick(void);
+
+void led_matrix_toggle(void);
+void led_matrix_enable(void);
+void led_matrix_enable_noeeprom(void);
+void led_matrix_disable(void);
+void led_matrix_disable_noeeprom(void);
+void led_matrix_step(void);
+void led_matrix_step_reverse(void);
+void led_matrix_increase_val(void);
+void led_matrix_decrease_val(void);
+void led_matrix_increase_speed(void);
+void led_matrix_decrease_speed(void);
+void led_matrix_mode(uint8_t mode, bool eeprom_write);
+void led_matrix_mode_noeeprom(uint8_t mode);
+uint8_t led_matrix_get_mode(void);
+void led_matrix_set_value(uint8_t mode);
+void led_matrix_set_value_noeeprom(uint8_t mode);
+
+typedef struct {
+ /* Perform any initialisation required for the other driver functions to work. */
+ void (*init)(void);
+
+ /* Set the brightness of a single LED in the buffer. */
+ void (*set_value)(int index, uint8_t value);
+ /* Set the brightness of all LEDS on the keyboard in the buffer. */
+ void (*set_value_all)(uint8_t value);
+ /* Flush any buffered changes to the hardware. */
+ void (*flush)(void);
+} led_matrix_driver_t;
+
+extern const led_matrix_driver_t led_matrix_driver;
+
+#endif
diff --git a/quantum/matrix.c b/quantum/matrix.c
index 5b7a0e03b..f7cad1a0f 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -159,7 +159,7 @@ bool matrix_is_modified(void)
inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
- return (matrix[row] & ((matrix_row_t)1<col));
+ return (matrix[row] & ((matrix_row_t)1<<col));
}
inline
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c
index 8238c263f..34c3f620b 100644
--- a/quantum/process_keycode/process_clicky.c
+++ b/quantum/process_keycode/process_clicky.c
@@ -32,7 +32,7 @@ extern bool midi_activated;
void clicky_play(void) {
#ifndef NO_MUSIC_MODE
- if (music_activated || midi_activated) return;
+ if (music_activated || midi_activated || audio_config.enable) return;
#endif // !NO_MUSIC_MODE
clicky_song[0][0] = 2.0f * clicky_freq * (1.0f + clicky_rand * ( ((float)rand()) / ((float)(RAND_MAX)) ) );
clicky_song[1][0] = clicky_freq * (1.0f + clicky_rand * ( ((float)rand()) / ((float)(RAND_MAX)) ) );
@@ -73,27 +73,29 @@ void clicky_off(void) {
}
bool is_clicky_on(void) {
- return (audio_config.clicky_enable != 0);
+ return (audio_config.clicky_enable != 0);
}
bool process_clicky(uint16_t keycode, keyrecord_t *record) {
- if (keycode == CLICKY_TOGGLE && record->event.pressed) { clicky_toggle(); }
+ if (keycode == CLICKY_TOGGLE && record->event.pressed) { clicky_toggle(); }
- if (keycode == CLICKY_ENABLE && record->event.pressed) { clicky_on(); }
- if (keycode == CLICKY_DISABLE && record->event.pressed) { clicky_off(); }
+ if (keycode == CLICKY_ENABLE && record->event.pressed) { clicky_on(); }
+ if (keycode == CLICKY_DISABLE && record->event.pressed) { clicky_off(); }
- if (keycode == CLICKY_RESET && record->event.pressed) { clicky_freq_reset(); }
+ if (keycode == CLICKY_RESET && record->event.pressed) { clicky_freq_reset(); }
- if (keycode == CLICKY_UP && record->event.pressed) { clicky_freq_up(); }
- if (keycode == CLICKY_DOWN && record->event.pressed) { clicky_freq_down(); }
+ if (keycode == CLICKY_UP && record->event.pressed) { clicky_freq_up(); }
+ if (keycode == CLICKY_DOWN && record->event.pressed) { clicky_freq_down(); }
- if ( audio_config.clicky_enable ) {
- if (record->event.pressed) {
- clicky_play();;
+ if (audio_config.enable && audio_config.clicky_enable) {
+ if (record->event.pressed) { // Leave this separate so it's easier to add upstroke sound
+ if (keycode != AU_OFF && keycode != AU_TOG) { // DO NOT PLAY if audio will be disabled, and causes issuse on ARM
+ clicky_play();
}
}
- return true;
+ }
+ return true;
}
#endif //AUDIO_CLICKY
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 5d8ffe34e..376578ade 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -195,6 +195,13 @@ void reset_keyboard(void) {
#define RSPC_KEY KC_0
#endif
+#ifndef LSPO_MOD
+ #define LSPO_MOD KC_LSFT
+#endif
+#ifndef RSPC_MOD
+ #define RSPC_MOD KC_RSFT
+#endif
+
// Shift / Enter setup
#ifndef SFTENT_KEY
#define SFTENT_KEY KC_ENT
@@ -674,14 +681,27 @@ bool process_record_quantum(keyrecord_t *record) {
}
else {
#ifdef DISABLE_SPACE_CADET_ROLLOVER
- if (get_mods() & MOD_BIT(KC_RSFT)) {
+ if (get_mods() & MOD_BIT(RSPC_MOD)) {
shift_interrupted[0] = true;
shift_interrupted[1] = true;
}
#endif
if (!shift_interrupted[0] && timer_elapsed(scs_timer[0]) < TAPPING_TERM) {
+ #ifdef DISABLE_SPACE_CADET_MODIFIER
+ unregister_mods(MOD_BIT(KC_LSFT));
+ #else
+ if( LSPO_MOD != KC_LSFT ){
+ unregister_mods(MOD_BIT(KC_LSFT));
+ register_mods(MOD_BIT(LSPO_MOD));
+ }
+ #endif
register_code(LSPO_KEY);
unregister_code(LSPO_KEY);
+ #ifndef DISABLE_SPACE_CADET_MODIFIER
+ if( LSPO_MOD != KC_LSFT ){
+ unregister_mods(MOD_BIT(LSPO_MOD));
+ }
+ #endif
}
unregister_mods(MOD_BIT(KC_LSFT));
}
@@ -696,14 +716,27 @@ bool process_record_quantum(keyrecord_t *record) {
}
else {
#ifdef DISABLE_SPACE_CADET_ROLLOVER
- if (get_mods() & MOD_BIT(KC_LSFT)) {
+ if (get_mods() & MOD_BIT(LSPO_MOD)) {
shift_interrupted[0] = true;
shift_interrupted[1] = true;
}
#endif
if (!shift_interrupted[1] && timer_elapsed(scs_timer[1]) < TAPPING_TERM) {
+ #ifdef DISABLE_SPACE_CADET_MODIFIER
+ unregister_mods(MOD_BIT(KC_RSFT));
+ #else
+ if( RSPC_MOD != KC_RSFT ){
+ unregister_mods(MOD_BIT(KC_RSFT));
+ register_mods(MOD_BIT(RSPC_MOD));
+ }
+ #endif
register_code(RSPC_KEY);
unregister_code(RSPC_KEY);
+ #ifndef DISABLE_SPACE_CADET_MODIFIER
+ if ( RSPC_MOD != KC_RSFT ){
+ unregister_mods(MOD_BIT(RSPC_MOD));
+ }
+ #endif
}
unregister_mods(MOD_BIT(KC_RSFT));
}
@@ -998,7 +1031,11 @@ void matrix_init_quantum() {
eeconfig_init();
}
#ifdef BACKLIGHT_ENABLE
- backlight_init_ports();
+ #ifdef LED_MATRIX_ENABLE
+ led_matrix_init();
+ #else
+ backlight_init_ports();
+ #endif
#endif
#ifdef AUDIO_ENABLE
audio_init();
@@ -1034,8 +1071,12 @@ void matrix_scan_quantum() {
matrix_scan_combo();
#endif
- #if defined(BACKLIGHT_ENABLE) && defined(BACKLIGHT_PIN)
- backlight_task();
+ #if defined(BACKLIGHT_ENABLE)
+ #if defined(LED_MATRIX_ENABLE)
+ led_matrix_task();
+ #elif defined(BACKLIGHT_PIN)
+ backlight_task();
+ #endif
#endif
#ifdef RGB_MATRIX_ENABLE
@@ -1448,6 +1489,24 @@ void led_set(uint8_t usb_led)
// PORTE &= ~(1<<6);
// }
+#if defined(BACKLIGHT_CAPS_LOCK) && defined(BACKLIGHT_ENABLE)
+ // Use backlight as Caps Lock indicator
+ uint8_t bl_toggle_lvl = 0;
+
+ if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK) && !backlight_config.enable) {
+ // Turning Caps Lock ON and backlight is disabled in config
+ // Toggling backlight to the brightest level
+ bl_toggle_lvl = BACKLIGHT_LEVELS;
+ } else if (IS_LED_OFF(usb_led, USB_LED_CAPS_LOCK) && backlight_config.enable) {
+ // Turning Caps Lock OFF and backlight is enabled in config
+ // Toggling backlight and restoring config level
+ bl_toggle_lvl = backlight_config.level;
+ }
+
+ // Set level without modify backlight_config to keep ability to restore state
+ backlight_set(bl_toggle_lvl);
+#endif
+
led_set_kb(usb_led);
}
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 56a6a1a99..c6acf83e5 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -28,7 +28,11 @@
#include "matrix.h"
#include "keymap.h"
#ifdef BACKLIGHT_ENABLE
- #include "backlight.h"
+ #ifdef LED_MATRIX_ENABLE
+ #include "ledmatrix.h"
+ #else
+ #include "backlight.h"
+ #endif
#endif
#ifdef RGBLIGHT_ENABLE
#include "rgblight.h"
diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index 23420ddd8..22dce963c 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -19,6 +19,11 @@
#include <avr/eeprom.h>
#include <avr/interrupt.h>
#endif
+#ifdef STM32_EEPROM_ENABLE
+ #include "hal.h"
+ #include "eeprom.h"
+ #include "eeprom_stm32.h"
+#endif
#include "wait.h"
#include "progmem.h"
#include "timer.h"
@@ -120,15 +125,17 @@ void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1) {
uint32_t eeconfig_read_rgblight(void) {
- #ifdef __AVR__
+ #if defined(__AVR__) || defined(STM32_EEPROM_ENABLE) || defined(PROTOCOL_ARM_ATSAM) || defined(EEPROM_SIZE)
return eeprom_read_dword(EECONFIG_RGBLIGHT);
#else
return 0;
#endif
}
void eeconfig_update_rgblight(uint32_t val) {
- #ifdef __AVR__
+ #if defined(__AVR__) || defined(STM32_EEPROM_ENABLE) || defined(PROTOCOL_ARM_ATSAM) || defined(EEPROM_SIZE)
+ if (eeconfig_read_rgblight() != val) {
eeprom_update_dword(EECONFIG_RGBLIGHT, val);
+ }
#endif
}
void eeconfig_update_rgblight_default(void) {
@@ -331,7 +338,7 @@ void rgblight_disable_noeeprom(void) {
#ifdef RGBLIGHT_USE_TIMER
rgblight_timer_disable();
#endif
- _delay_ms(50);
+ wait_ms(50);
rgblight_set();
}
diff --git a/quantum/template/avr/config.h b/quantum/template/avr/config.h
index d05b2cb98..a31fcf236 100644
--- a/quantum/template/avr/config.h
+++ b/quantum/template/avr/config.h
@@ -131,9 +131,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* key combination for magic key command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
/* control how magic key switches layers */
//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
diff --git a/quantum/template/ps2avrgb/config.h b/quantum/template/ps2avrgb/config.h
index 4ff3513bc..01cdf932e 100644
--- a/quantum/template/ps2avrgb/config.h
+++ b/quantum/template/ps2avrgb/config.h
@@ -42,8 +42,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define NO_UART 1
-/* key combination for command */
-#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
/* Bootmagic Lite key configuration */
// #define BOOTMAGIC_LITE_ROW 0
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-06-03 22:34:05 +0200