Merge upstream QMK Firmware at '0.12.52~1'
This commit is contained in:
@@ -25,10 +25,6 @@
|
||||
# include "backlight.h"
|
||||
#endif
|
||||
|
||||
#ifdef FAUXCLICKY_ENABLE
|
||||
# include "fauxclicky.h"
|
||||
#endif
|
||||
|
||||
#ifdef API_ENABLE
|
||||
# include "api.h"
|
||||
#endif
|
||||
@@ -53,6 +49,9 @@ float goodbye_song[][2] = GOODBYE_SONG;
|
||||
# ifdef DEFAULT_LAYER_SONGS
|
||||
float default_layer_songs[][16][2] = DEFAULT_LAYER_SONGS;
|
||||
# endif
|
||||
# ifdef SENDSTRING_BELL
|
||||
float bell_song[][2] = SONG(TERMINAL_SOUND);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef AUTO_SHIFT_ENABLE
|
||||
@@ -146,7 +145,6 @@ void reset_keyboard(void) {
|
||||
|
||||
/* Convert record into usable keycode via the contained event. */
|
||||
uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache) { return get_event_keycode(record->event, update_layer_cache); }
|
||||
|
||||
/* Convert event into usable keycode. Checks the layer cache to ensure that it
|
||||
* retains the correct keycode after a layer change, if the key is still pressed.
|
||||
* "update_layer_cache" is to ensure that it only updates the layer cache when
|
||||
@@ -222,9 +220,6 @@ bool process_record_quantum(keyrecord_t *record) {
|
||||
#ifdef HAPTIC_ENABLE
|
||||
process_haptic(keycode, record) &&
|
||||
#endif // HAPTIC_ENABLE
|
||||
#if defined(RGB_MATRIX_ENABLE)
|
||||
process_rgb_matrix(keycode, record) &&
|
||||
#endif
|
||||
#ifdef ORYX_ENABLE
|
||||
process_record_oryx(keycode, record) &&
|
||||
#endif
|
||||
@@ -310,17 +305,6 @@ bool process_record_quantum(keyrecord_t *record) {
|
||||
case EEPROM_RESET:
|
||||
eeconfig_init();
|
||||
return false;
|
||||
#ifdef FAUXCLICKY_ENABLE
|
||||
case FC_TOG:
|
||||
FAUXCLICKY_TOGGLE;
|
||||
return false;
|
||||
case FC_ON:
|
||||
FAUXCLICKY_ON;
|
||||
return false;
|
||||
case FC_OFF:
|
||||
FAUXCLICKY_OFF;
|
||||
return false;
|
||||
#endif
|
||||
#ifdef VELOCIKEY_ENABLE
|
||||
case VLK_TOG:
|
||||
velocikey_toggle();
|
||||
@@ -336,227 +320,14 @@ bool process_record_quantum(keyrecord_t *record) {
|
||||
case OUT_BT:
|
||||
set_output(OUTPUT_BLUETOOTH);
|
||||
return false;
|
||||
#endif
|
||||
#if defined(BACKLIGHT_ENABLE) && defined(BACKLIGHT_BREATHING)
|
||||
case BL_BRTG:
|
||||
backlight_toggle_breathing();
|
||||
return false;
|
||||
#endif
|
||||
#ifdef WEBUSB_ENABLE
|
||||
case WEBUSB_PAIR:
|
||||
webusb_state.pairing ^= true;
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return process_action_kb(record);
|
||||
}
|
||||
|
||||
// clang-format off
|
||||
|
||||
/* Bit-Packed look-up table to convert an ASCII character to whether
|
||||
* [Shift] needs to be sent with the keycode.
|
||||
*/
|
||||
__attribute__((weak)) const uint8_t ascii_to_shift_lut[16] PROGMEM = {
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
|
||||
KCLUT_ENTRY(0, 1, 1, 1, 1, 1, 1, 0),
|
||||
KCLUT_ENTRY(1, 1, 1, 1, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 1, 0, 1, 0, 1, 1),
|
||||
KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
|
||||
KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
|
||||
KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
|
||||
KCLUT_ENTRY(1, 1, 1, 0, 0, 0, 1, 1),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 1, 1, 1, 1, 0),
|
||||
};
|
||||
|
||||
/* Bit-Packed look-up table to convert an ASCII character to whether
|
||||
* [AltGr] needs to be sent with the keycode.
|
||||
*/
|
||||
__attribute__((weak)) const uint8_t ascii_to_altgr_lut[16] PROGMEM = {
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
};
|
||||
|
||||
/* Look-up table to convert an ASCII character to a keycode.
|
||||
*/
|
||||
__attribute__((weak)) const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
|
||||
// NUL SOH STX ETX EOT ENQ ACK BEL
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
// BS TAB LF VT FF CR SO SI
|
||||
KC_BSPC, KC_TAB, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
// DLE DC1 DC2 DC3 DC4 NAK SYN ETB
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
// CAN EM SUB ESC FS GS RS US
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
|
||||
// ! " # $ % & '
|
||||
KC_SPC, KC_1, KC_QUOT, KC_3, KC_4, KC_5, KC_7, KC_QUOT,
|
||||
// ( ) * + , - . /
|
||||
KC_9, KC_0, KC_8, KC_EQL, KC_COMM, KC_MINS, KC_DOT, KC_SLSH,
|
||||
// 0 1 2 3 4 5 6 7
|
||||
KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,
|
||||
// 8 9 : ; < = > ?
|
||||
KC_8, KC_9, KC_SCLN, KC_SCLN, KC_COMM, KC_EQL, KC_DOT, KC_SLSH,
|
||||
// @ A B C D E F G
|
||||
KC_2, KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G,
|
||||
// H I J K L M N O
|
||||
KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O,
|
||||
// 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, KC_6, KC_MINS,
|
||||
// ` a b c d e f g
|
||||
KC_GRV, KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G,
|
||||
// h i j k l m n o
|
||||
KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O,
|
||||
// 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 { | } ~ DEL
|
||||
KC_X, KC_Y, KC_Z, KC_LBRC, KC_BSLS, KC_RBRC, KC_GRV, KC_DEL
|
||||
};
|
||||
|
||||
// clang-format on
|
||||
|
||||
// Note: we bit-pack in "reverse" order to optimize loading
|
||||
#define PGM_LOADBIT(mem, pos) ((pgm_read_byte(&((mem)[(pos) / 8])) >> ((pos) % 8)) & 0x01)
|
||||
|
||||
void send_string(const char *str) { send_string_with_delay(str, 0); }
|
||||
|
||||
void send_string_P(const char *str) { send_string_with_delay_P(str, 0); }
|
||||
|
||||
void send_string_with_delay(const char *str, uint8_t interval) {
|
||||
while (1) {
|
||||
char ascii_code = *str;
|
||||
if (!ascii_code) break;
|
||||
if (ascii_code == SS_QMK_PREFIX) {
|
||||
ascii_code = *(++str);
|
||||
if (ascii_code == SS_TAP_CODE) {
|
||||
// tap
|
||||
uint8_t keycode = *(++str);
|
||||
tap_code(keycode);
|
||||
} else if (ascii_code == SS_DOWN_CODE) {
|
||||
// down
|
||||
uint8_t keycode = *(++str);
|
||||
register_code(keycode);
|
||||
} else if (ascii_code == SS_UP_CODE) {
|
||||
// up
|
||||
uint8_t keycode = *(++str);
|
||||
unregister_code(keycode);
|
||||
} else if (ascii_code == SS_DELAY_CODE) {
|
||||
// delay
|
||||
int ms = 0;
|
||||
uint8_t keycode = *(++str);
|
||||
while (isdigit(keycode)) {
|
||||
ms *= 10;
|
||||
ms += keycode - '0';
|
||||
keycode = *(++str);
|
||||
}
|
||||
while (ms--) wait_ms(1);
|
||||
}
|
||||
} else {
|
||||
send_char(ascii_code);
|
||||
}
|
||||
++str;
|
||||
// interval
|
||||
{
|
||||
uint8_t ms = interval;
|
||||
while (ms--) wait_ms(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void send_string_with_delay_P(const char *str, uint8_t interval) {
|
||||
while (1) {
|
||||
char ascii_code = pgm_read_byte(str);
|
||||
if (!ascii_code) break;
|
||||
if (ascii_code == SS_QMK_PREFIX) {
|
||||
ascii_code = pgm_read_byte(++str);
|
||||
if (ascii_code == SS_TAP_CODE) {
|
||||
// tap
|
||||
uint8_t keycode = pgm_read_byte(++str);
|
||||
tap_code(keycode);
|
||||
} else if (ascii_code == SS_DOWN_CODE) {
|
||||
// down
|
||||
uint8_t keycode = pgm_read_byte(++str);
|
||||
register_code(keycode);
|
||||
} else if (ascii_code == SS_UP_CODE) {
|
||||
// up
|
||||
uint8_t keycode = pgm_read_byte(++str);
|
||||
unregister_code(keycode);
|
||||
} else if (ascii_code == SS_DELAY_CODE) {
|
||||
// delay
|
||||
int ms = 0;
|
||||
uint8_t keycode = pgm_read_byte(++str);
|
||||
while (isdigit(keycode)) {
|
||||
ms *= 10;
|
||||
ms += keycode - '0';
|
||||
keycode = pgm_read_byte(++str);
|
||||
}
|
||||
while (ms--) wait_ms(1);
|
||||
}
|
||||
} else {
|
||||
send_char(ascii_code);
|
||||
}
|
||||
++str;
|
||||
// interval
|
||||
{
|
||||
uint8_t ms = interval;
|
||||
while (ms--) wait_ms(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void send_char(char ascii_code) {
|
||||
#if defined(AUDIO_ENABLE) && defined(SENDSTRING_BELL)
|
||||
if (ascii_code == '\a') { // BEL
|
||||
PLAY_SONG(bell_song);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
uint8_t keycode = pgm_read_byte(&ascii_to_keycode_lut[(uint8_t)ascii_code]);
|
||||
bool is_shifted = PGM_LOADBIT(ascii_to_shift_lut, (uint8_t)ascii_code);
|
||||
bool is_altgred = PGM_LOADBIT(ascii_to_altgr_lut, (uint8_t)ascii_code);
|
||||
|
||||
if (is_shifted) {
|
||||
register_code(KC_LSFT);
|
||||
}
|
||||
if (is_altgred) {
|
||||
register_code(KC_RALT);
|
||||
}
|
||||
tap_code(keycode);
|
||||
if (is_altgred) {
|
||||
unregister_code(KC_RALT);
|
||||
}
|
||||
if (is_shifted) {
|
||||
unregister_code(KC_LSFT);
|
||||
}
|
||||
}
|
||||
|
||||
void set_single_persistent_default_layer(uint8_t default_layer) {
|
||||
#if defined(AUDIO_ENABLE) && defined(DEFAULT_LAYER_SONGS)
|
||||
PLAY_SONG(default_layer_songs[default_layer]);
|
||||
@@ -573,34 +344,6 @@ layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_
|
||||
|
||||
void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) { layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3)); }
|
||||
|
||||
void tap_random_base64(void) {
|
||||
#if defined(__AVR_ATmega32U4__)
|
||||
uint8_t key = (TCNT0 + TCNT1 + TCNT3 + TCNT4) % 64;
|
||||
#else
|
||||
uint8_t key = rand() % 64;
|
||||
#endif
|
||||
switch (key) {
|
||||
case 0 ... 25:
|
||||
send_char(key + 'A');
|
||||
break;
|
||||
case 26 ... 51:
|
||||
send_char(key - 26 + 'a');
|
||||
break;
|
||||
case 52:
|
||||
send_char('0');
|
||||
break;
|
||||
case 53 ... 61:
|
||||
send_char(key - 53 + '1');
|
||||
break;
|
||||
case 62:
|
||||
send_char('+');
|
||||
break;
|
||||
case 63:
|
||||
send_char('/');
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void matrix_init_quantum() {
|
||||
#ifdef BOOTMAGIC_LITE
|
||||
bootmagic_lite();
|
||||
@@ -682,10 +425,6 @@ void matrix_scan_quantum() {
|
||||
led_matrix_task();
|
||||
#endif
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_task();
|
||||
#endif
|
||||
|
||||
#ifdef WPM_ENABLE
|
||||
decay_wpm();
|
||||
#endif
|
||||
@@ -709,42 +448,6 @@ void matrix_scan_quantum() {
|
||||
# include "hd44780.h"
|
||||
#endif
|
||||
|
||||
// Functions for spitting out values
|
||||
//
|
||||
|
||||
void send_dword(uint32_t number) {
|
||||
uint16_t word = (number >> 16);
|
||||
send_word(word);
|
||||
send_word(number & 0xFFFFUL);
|
||||
}
|
||||
|
||||
void send_word(uint16_t number) {
|
||||
uint8_t byte = number >> 8;
|
||||
send_byte(byte);
|
||||
send_byte(number & 0xFF);
|
||||
}
|
||||
|
||||
void send_byte(uint8_t number) {
|
||||
uint8_t nibble = number >> 4;
|
||||
send_nibble(nibble);
|
||||
send_nibble(number & 0xF);
|
||||
}
|
||||
|
||||
void send_nibble(uint8_t number) {
|
||||
tap_code16(hex_to_keycode(number));
|
||||
}
|
||||
|
||||
__attribute__((weak)) uint16_t hex_to_keycode(uint8_t hex) {
|
||||
hex = hex & 0xF;
|
||||
if (hex == 0x0) {
|
||||
return KC_0;
|
||||
} else if (hex < 0xA) {
|
||||
return KC_1 + (hex - 0x1);
|
||||
} else {
|
||||
return KC_A + (hex - 0xA);
|
||||
}
|
||||
}
|
||||
|
||||
void api_send_unicode(uint32_t unicode) {
|
||||
#ifdef API_ENABLE
|
||||
uint8_t chunk[4];
|
||||
@@ -761,8 +464,6 @@ __attribute__((weak)) void startup_user() {}
|
||||
|
||||
__attribute__((weak)) void shutdown_user() {}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#ifdef WEBUSB_ENABLE
|
||||
__attribute__((weak)) bool webusb_receive_user(uint8_t *data, uint8_t length) { return false; }
|
||||
__attribute__((weak)) bool webusb_receive_kb(uint8_t *data, uint8_t length) { return webusb_receive_user(data, length); }
|
||||
|
||||
Reference in New Issue
Block a user