diff options
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/audio/song_list.h | 8 | ||||
| -rw-r--r-- | quantum/keymap.h | 22 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_russian.h | 77 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_unicode_cyrillic.h | 163 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 15 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 1 | ||||
| -rw-r--r-- | quantum/process_keycode/process_unicode.c | 205 | ||||
| -rw-r--r-- | quantum/process_keycode/process_unicode.h | 38 | ||||
| -rw-r--r-- | quantum/quantum.c | 3 | ||||
| -rw-r--r-- | quantum/quantum.h | 1 | ||||
| -rw-r--r-- | quantum/rgblight.c | 735 | 
11 files changed, 870 insertions, 398 deletions
| diff --git a/quantum/audio/song_list.h b/quantum/audio/song_list.h index fc6fcdeef1..8022ca6729 100644 --- a/quantum/audio/song_list.h +++ b/quantum/audio/song_list.h @@ -28,6 +28,14 @@  	Q__NOTE(_E4), Q__NOTE(_C4), \  	Q__NOTE(_E4), +/* Requires: PLAY_NOTE_ARRAY(..., ..., STACCATO); */ +#define IN_LIKE_FLINT \ +    E__NOTE(_AS4), E__NOTE(_AS4), QD_NOTE(_B4),  \ +    E__NOTE(_AS4), E__NOTE(_B4),  QD_NOTE(_CS4), \ +    E__NOTE(_B4),  E__NOTE(_CS4), QD_NOTE(_DS4), \ +    E__NOTE(_CS4), E__NOTE(_B4),  QD_NOTE(_AS4), \ +    E__NOTE(_AS4), E__NOTE(_AS4), QD_NOTE(_B4), +  #define GOODBYE_SOUND \      E__NOTE(_E7),     \      E__NOTE(_A6),     \ diff --git a/quantum/keymap.h b/quantum/keymap.h index a158651839..f2d94d75c3 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -156,16 +156,16 @@ enum quantum_keycodes {      BL_INC,      BL_TOGG,      BL_STEP, -	 -	// RGB functionality -	RGB_TOG, -	RGB_MOD, -	RGB_HUI, -	RGB_HUD, -	RGB_SAI, -	RGB_SAD, -	RGB_VAI, -	RGB_VAD, + +    // RGB functionality +    RGB_TOG, +    RGB_MOD, +    RGB_HUI, +    RGB_HUD, +    RGB_SAI, +    RGB_SAD, +    RGB_VAI, +    RGB_VAD,      // Left shift, open paren      KC_LSPO, @@ -309,7 +309,7 @@ enum quantum_keycodes {  #define OSL(layer) (layer | QK_ONE_SHOT_LAYER)  // One-shot mod -#define OSM(layer) (layer | QK_ONE_SHOT_MOD) +#define OSM(mod) (mod | QK_ONE_SHOT_MOD)  // M-od, T-ap - 256 keycode max  #define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0xF) << 8)) diff --git a/quantum/keymap_extras/keymap_russian.h b/quantum/keymap_extras/keymap_russian.h new file mode 100644 index 0000000000..237e9abde3 --- /dev/null +++ b/quantum/keymap_extras/keymap_russian.h @@ -0,0 +1,77 @@ +#ifndef KEYMAP_RUSSIAN_H +#define KEYMAP_RUSSIAN_H + +#include "keymap.h" + +// Normal Chracters      // reg   SHIFT +#define RU_A     KC_F    // а and А +#define RU_BE    KC_COMM // б and Б +#define RU_VE    KC_D    // в and В +#define RU_GHE   KC_U    // г and Г +#define RU_DE    KC_L    // д and Д +#define RU_IE    KC_T    // е and Е +#define RU_IO    KC_GRV  // ё and Ё +#define RU_ZHE   KC_SCLN // ж and Ж +#define RU_ZE    KC_P    // з and З +#define RU_I     KC_B    // и and И +#define RU_SRT_I KC_Q    // й and Й +#define RU_KA    KC_R    // к and К +#define RU_EL    KC_K    // л and Л +#define RU_EM    KC_V    // м and М +#define RU_EN    KC_Y    // н and Н +#define RU_O     KC_J    // о and О +#define RU_PE    KC_G    // п and П +#define RU_ER    KC_H    // р and Р +#define RU_ES    KC_C    // с and С +#define RU_TE    KC_N    // т and Т +#define RU_U     KC_E    // у and У +#define RU_EF    KC_A    // ф and Ф +#define RU_HA    KC_LBRC // х and Х +#define RU_TSE   KC_W    // ц and Ц +#define RU_CHE   KC_X    // ч and Ч +#define RU_SHA   KC_I    // ш and Ш +#define RU_SHCHA KC_O    // щ and Щ +#define RU_HSIGN KC_RBRC // ъ and Ъ +#define RU_YERU  KC_S    // ы and Ы +#define RU_SSIGN KC_M    // ь and Ь +#define RU_E     KC_QUOT // э and Э +#define RU_YU    KC_DOT  // ю and Ю +#define RU_YA    KC_Z    // я and Я + +#define RU_1     KC_1    // 1 and ! +#define RU_2     KC_2    // 2 and " +#define RU_3     KC_3    // 3 and № +#define RU_4     KC_4    // 4 and ; +#define RU_5     KC_5    // 5 and % +#define RU_6     KC_6    // 6 and : +#define RU_7     KC_7    // 7 and ? +#define RU_8     KC_8    // 8 and * +#define RU_9     KC_9    // 9 and ( +#define RU_0     KC_0    // 0 and ) + +#define RU_MINS  KC_MINS // - and _ +#define RU_EQL   KC_EQL  // = and + +#define RU_BSLS  KC_BSLS // \ and / +#define RU_DOT   KC_SLSH // . and , + +// Shifted Chracters +#define RU_EXLM LSFT(RU_1) // ! +#define RU_DQUT LSFT(RU_2) // " +#define RU_NMRO LSFT(RU_3) // № +#define RU_SCLN LSFT(RU_4) // ; +#define RU_PERC LSFT(RU_5) // % +#define RU_COLN LSFT(RU_6) // : +#define RU_QUES LSFT(RU_7) // ? +#define RU_ASTR LSFT(RU_8) // * +#define RU_LPRN LSFT(RU_9) // ( +#define RU_RPRN LSFT(RU_0) // ) + +#define RU_UNDR LSFT(RU_MINS) // _ +#define RU_PLUS LSFT(RU_EQL)  // + +#define RU_SLSH LSFT(RU_BSLS) // / +#define RU_COMM LSFT(RU_DOT)  // , + +// Alt Gr-ed characters +#define RU_RUBL RALT(RU_8) // ₽ + +#endif diff --git a/quantum/keymap_extras/keymap_unicode_cyrillic.h b/quantum/keymap_extras/keymap_unicode_cyrillic.h new file mode 100644 index 0000000000..a40626d911 --- /dev/null +++ b/quantum/keymap_extras/keymap_unicode_cyrillic.h @@ -0,0 +1,163 @@ +#ifndef KEYMAP_CYRILLIC_H +#define KEYMAP_CYRILLIC_H + +#include "keymap.h" + +/* + * This is based off of + * https://en.wikipedia.org/wiki/Cyrillic_script + * + * Unicode is iffy, a software implementation is preferred + */ + +// Capital                   Char russian/ukrainian/bulgarian +#define CY_A     UC(0x0410) // А  rus ukr bul +#define CY_BE    UC(0x0411) // Б  rus ukr bul +#define CY_VE    UC(0x0412) // В  rus ukr bul +#define CY_GHE   UC(0x0413) // Г  rus ukr bul +#define CY_GHEUP UC(0x0490) // Ґ      ukr +#define CY_DE    UC(0x0414) // Д  rus ukr bul +#define CY_DJE   UC(0x0402) // Ђ +#define CY_GJE   UC(0x0403) // Ѓ +#define CY_IE    UC(0x0415) // Е  rus ukr bul +#define CY_IO    UC(0x0401) // Ё  rus +#define CY_UIE   UC(0x0404) // Є      ukr +#define CY_ZHE   UC(0x0416) // Ж  rus ukr bul +#define CY_ZE    UC(0x0417) // З  rus ukr bul +#define CY_DZE   UC(0x0405) // Ѕ +#define CY_I     UC(0x0418) // И  rus ukr bul +#define CY_B_U_I UC(0x0406) // І      ukr +#define CY_YI    UC(0x0407) // Ї      ukr +#define CY_SRT_I UC(0x0419) // Й  rus ukr bul +#define CY_JE    UC(0x0408) // Ј +#define CY_KA    UC(0x041a) // К  rus ukr bul +#define CY_EL    UC(0x041b) // Л  rus ukr bul +#define CY_LJE   UC(0x0409) // Љ +#define CY_EM    UC(0x041c) // М  rus ukr bul +#define CY_EN    UC(0x041d) // Н  rus ukr bul +#define CY_NJE   UC(0x040a) // Њ +#define CY_O     UC(0x041e) // О  rus ukr bul +#define CY_PE    UC(0x041f) // П  rus ukr bul +#define CY_ER    UC(0x0420) // Р  rus ukr bul +#define CY_ES    UC(0x0421) // С  rus ukr bul +#define CY_TE    UC(0x0422) // Т  rus ukr bul +#define CY_TSHE  UC(0x040b) // Ћ +#define CY_KJE   UC(0x040c) // Ќ +#define CY_U     UC(0x0423) // У  rus ukr bul +#define CY_SRT_U UC(0x040e) // Ў +#define CY_EF    UC(0x0424) // Ф  rus ukr bul +#define CY_HA    UC(0x0425) // Х  rus     bul +#define CY_TSE   UC(0x0426) // Ц  rus ukr bul +#define CY_CHE   UC(0x0427) // Ч  rus ukr bul +#define CY_DZHE  UC(0x040f) // Џ +#define CY_SHA   UC(0x0428) // Ш  rus ukr bul +#define CY_SHCHA UC(0x0429) // Щ  rus ukr bul +#define CY_HSIGN UC(0x042a) // Ъ  rus     bul +#define CY_YERU  UC(0x042b) // Ы  rus +#define CY_SSIGN UC(0x042c) // Ь  rus ukr bul +#define CY_E     UC(0x042d) // Э  rus +#define CY_YU    UC(0x042e) // Ю  rus ukr bul +#define CY_YA    UC(0x042f) // Я  rus ukr bul +// Important Cyrillic non-Slavic letters +#define CY_PALOCHKA UC(0x04c0) // Ӏ +#define CY_SCHWA UC(0x04d8) // Ә +#define CY_GHE_S UC(0x0492) // Ғ +#define CY_ZE_D  UC(0x0498) // Ҙ +#define CY_ES_D  UC(0x04aa) // Ҫ +#define CY_BR_KA UC(0x04a0) // Ҡ +#define CY_ZHE_D UC(0x0496) // Җ +#define CY_KA_D  UC(0x049a) // Қ +#define CY_EN_D  UC(0x04a2) // Ң +#define CY_ENGHE UC(0x04a4) // Ҥ +#define CY_BRD_O UC(0x04e8) // Ө +#define CY_STR_U UC(0x04ae) // Ү +#define CY_S_U_S UC(0x04b0) // Ұ +#define CY_SHHA  UC(0x04ba) // Һ +#define CY_HA_D  UC(0x04b2) // Ҳ + + +// Small +#define CY_a     UC(0x0430) // a  rus ukr bul +#define CY_be    UC(0x0431) // б  rus ukr bul +#define CY_ve    UC(0x0432) // в  rus ukr bul +#define CY_ghe   UC(0x0433) // г  rus ukr bul +#define CY_gheup UC(0x0491) // ґ      ukr +#define CY_de    UC(0x0434) // д  rus ukr bul +#define CY_dje   UC(0x0452) // ђ +#define CY_gje   UC(0x0453) // ѓ +#define CY_ie    UC(0x0435) // е  rus ukr bul +#define CY_io    UC(0x0451) // ё  rus +#define CY_uie   UC(0x0454) // є      ukr +#define CY_zhe   UC(0x0436) // ж  rus ukr bul +#define CY_ze    UC(0x0437) // з  rus ukr bul +#define CY_dze   UC(0x0455) // ѕ +#define CY_i     UC(0x0438) // и  rus ukr bul +#define CY_b_u_i UC(0x0456) // і      ukr +#define CY_yi    UC(0x0457) // ї      ukr +#define CY_srt_i UC(0x0439) // й  rus ukr bul +#define CY_je    UC(0x0458) // ј +#define CY_ka    UC(0x043a) // к  rus ukr bul +#define CY_el    UC(0x043b) // л  rus ukr bul +#define CY_lje   UC(0x0459) // љ +#define CY_em    UC(0x043c) // м  rus ukr bul +#define CY_en    UC(0x043d) // н  rus ukr bul +#define CY_nje   UC(0x045a) // њ +#define CY_o     UC(0x043e) // о  rus ukr bul +#define CY_pe    UC(0x043f) // п  rus ukr bul +#define CY_er    UC(0x0440) // р  rus ukr bul +#define CY_es    UC(0x0441) // с  rus ukr bul +#define CY_te    UC(0x0442) // т  rus ukr bul +#define CY_tshe  UC(0x045b) // ћ +#define CY_kje   UC(0x045c) // ќ +#define CY_u     UC(0x0443) // у  rus ukr bul +#define CY_srt_u UC(0x045e) // ў +#define CY_ef    UC(0x0444) // ф  rus ukr bul +#define CY_ha    UC(0x0445) // х  rus ukr bul +#define CY_tse   UC(0x0446) // ц  rus ukr bul +#define CY_che   UC(0x0447) // ч  rus ukr bul +#define CY_dzhe  UC(0x045f) // џ +#define CY_sha   UC(0x0448) // ш  rus ukr bul +#define CY_shcha UC(0x0449) // щ  rus ukr bul +#define CY_hsign UC(0x044a) // ъ  rus     bul +#define CY_yeru  UC(0x044b) // ы  rus +#define CY_ssign UC(0x044c) // ь  rus ukr bul +#define CY_e     UC(0x044d) // э  rus +#define CY_yu    UC(0x044e) // ю  rus ukr bul +#define CY_ya    UC(0x044f) // я  rus ukr bul +// Important Cyrillic non-Slavic letters +#define CY_palochka UC(0x04cf) // ӏ +#define CY_schwa UC(0x04d9) // ә +#define CY_ghe_s UC(0x0493) // ғ +#define CY_ze_d  UC(0x0499) // ҙ +#define CY_es_d  UC(0x04ab) // ҫ +#define CY_br_ka UC(0x04a1) // ҡ +#define CY_zhe_d UC(0x0497) // җ +#define CY_ka_d  UC(0x049b) // қ +#define CY_en_d  UC(0x04a3) // ң +#define CY_enghe UC(0x04a5) // ҥ +#define CY_brd_o UC(0x04e9) // ө +#define CY_str_u UC(0x04af) // ү +#define CY_s_u_s UC(0x04b1) // ұ +#define CY_shha  UC(0x04bb) // һ +#define CY_ha_d  UC(0x04b3) // ҳ + + +// Extra +#define CY_slr_ve UC(0x1c80) // ᲀ CYRILLIC SMALL LETTER ROUNDED VE +#define CY_ll_de  UC(0x1c81) // ᲁ CYRILLIC SMALL LETTER LONG-LEGGED DE +#define CY_ZEMLYA UC(0xa640) // Ꙁ CYRILLIC CAPITAL LETTER ZEMLYA +#define CY_zemlya UC(0xa641) // ꙁ CYRILLIC SMALL LETTER ZEMLYA +#define CY_RV_DZE UC(0xa644) // Ꙅ CYRILLIC CAPITAL LETTER REVERSED DZE +#define CY_rv_DZE UC(0xa645) // ꙅ CYRILLIC SMALL LETTER REVERSED DZE +#define CY_slw_es UC(0x1c83) // ᲃ CYRILLIC SMALL LETTER WIDE ES +#define CY_st_te  UC(0x1c84) // ᲄ CYRILLIC SMALL LETTER TALL TE +#define CY_3l_te  UC(0x1c85) // ᲅ CYRILLIC SMALL LETTER THREE-LEGGED TE +#define CY_thsign UC(0x1c86) // ᲆ CYRILLIC SMALL LETTER TALL HARD SIGN +#define CY_YERUBY UC(0xa650) // Ꙑ CYRILLIC CAPITAL LETTER YERU WITH BACK YER +#define CY_yeruby UC(0xa651) // ꙑ CYRILLIC SMALL LETTER YERU WITH BACK YER +#define CY_RUBL   UC(0x20bd) // ₽ +#define CY_NMRO   UC(0x2116) // № + +// The letters Zje and Sje are made for other letters and accent marks + +#endif diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index d240dc2e66..5429e34383 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -1,6 +1,18 @@  #include "quantum.h"  static qk_tap_dance_state_t qk_tap_dance_state; +bool td_debug_enable = false; + +#if CONSOLE_ENABLE +#define td_debug(s) if (td_debug_enable) \ +    { \ +      xprintf ("D:tap_dance:%s:%s = { keycode = %d, count = %d, active = %d, pressed = %d }\n", __FUNCTION__, s, \ +               qk_tap_dance_state.keycode, qk_tap_dance_state.count, \ +               qk_tap_dance_state.active, qk_tap_dance_state.pressed);  \ +    } +#else +#define td_debug(s) +#endif  void qk_tap_dance_pair_finished (qk_tap_dance_state_t *state, void *user_data) {    qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; @@ -33,16 +45,19 @@ static inline void _process_tap_dance_action_fn (qk_tap_dance_state_t *state,  static inline void process_tap_dance_action_on_each_tap (qk_tap_dance_action_t action)  { +  td_debug("trigger");    _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_each_tap);  }  static inline void process_tap_dance_action_on_dance_finished (qk_tap_dance_action_t action)  { +  td_debug("trigger");    _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_dance_finished);  }  static inline void process_tap_dance_action_on_reset (qk_tap_dance_action_t action)  { +  td_debug("trigger")    _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_reset);  } diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index e2c74efe91..6a1258067e 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -49,6 +49,7 @@ typedef struct    }  extern const qk_tap_dance_action_t tap_dance_actions[]; +extern bool td_debug_enable;  /* To be used internally */ diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c index ad5d7f86b7..72c809c30e 100644 --- a/quantum/process_keycode/process_unicode.c +++ b/quantum/process_keycode/process_unicode.c @@ -13,45 +13,192 @@ uint16_t hex_to_keycode(uint8_t hex)    }  } -void set_unicode_mode(uint8_t os_target) +void set_unicode_input_mode(uint8_t os_target)  {    input_mode = os_target;  } +void unicode_input_start (void) { +  switch(input_mode) { +  case UC_OSX: +    register_code(KC_LALT); +    break; +  case UC_LNX: +    register_code(KC_LCTL); +    register_code(KC_LSFT); +    register_code(KC_U); +    unregister_code(KC_U); +    unregister_code(KC_LSFT); +    unregister_code(KC_LCTL); +    break; +  case UC_WIN: +    register_code(KC_LALT); +    register_code(KC_PPLS); +    unregister_code(KC_PPLS); +    break; +  } +  wait_ms(UNICODE_TYPE_DELAY); +} + +void unicode_input_finish (void) { +  switch(input_mode) { +  case UC_OSX: +  case UC_WIN: +    unregister_code(KC_LALT); +    break; +  case UC_LNX: +    register_code(KC_SPC); +    unregister_code(KC_SPC); +    break; +  } +} + +void register_hex(uint16_t hex) { +  for(int i = 3; i >= 0; i--) { +    uint8_t digit = ((hex >> (i*4)) & 0xF); +    register_code(hex_to_keycode(digit)); +    unregister_code(hex_to_keycode(digit)); +  } +} +  bool process_unicode(uint16_t keycode, keyrecord_t *record) {    if (keycode > QK_UNICODE && record->event.pressed) {      uint16_t unicode = keycode & 0x7FFF; -    switch(input_mode) { -      case UC_OSX: -        register_code(KC_LALT); -        break; -      case UC_LNX: -        register_code(KC_LCTL); -        register_code(KC_LSFT); -        register_code(KC_U); -        unregister_code(KC_U); -        break; -      case UC_WIN: -        register_code(KC_LALT); -        register_code(KC_PPLS); -        unregister_code(KC_PPLS); -        break; +    unicode_input_start(); +    register_hex(unicode); +    unicode_input_finish(); +  } +  return true; +} + +#ifdef UCIS_ENABLE +void qk_ucis_start(void) { +  qk_ucis_state.count = 0; +  qk_ucis_state.in_progress = true; + +  qk_ucis_start_user(); +} + +__attribute__((weak)) +void qk_ucis_start_user(void) { +  unicode_input_start(); +  register_hex(0x2328); +  unicode_input_finish(); +} + +static bool is_uni_seq(char *seq) { +  uint8_t i; + +  for (i = 0; seq[i]; i++) { +    uint16_t code; +    if (('1' <= seq[i]) && (seq[i] <= '0')) +      code = seq[i] - '1' + KC_1; +    else +      code = seq[i] - 'a' + KC_A; + +    if (i > qk_ucis_state.count || qk_ucis_state.codes[i] != code) +      return false; +  } + +  return (qk_ucis_state.codes[i] == KC_ENT || +          qk_ucis_state.codes[i] == KC_SPC); +} + +__attribute__((weak)) +void qk_ucis_symbol_fallback (void) { +  for (uint8_t i = 0; i < qk_ucis_state.count - 1; i++) { +    uint8_t code = qk_ucis_state.codes[i]; +    register_code(code); +    unregister_code(code); +    wait_ms(UNICODE_TYPE_DELAY); +  } +} + +void register_ucis(const char *hex) { +  for(int i = 0; hex[i]; i++) { +    uint8_t kc = 0; +    char c = hex[i]; + +    switch (c) { +    case '0': +      kc = KC_0; +      break; +    case '1' ... '9': +      kc = c - '1' + KC_1; +      break; +    case 'a' ... 'f': +      kc = c - 'a' + KC_A; +      break; +    case 'A' ... 'F': +      kc = c - 'A' + KC_A; +      break;      } -    for(int i = 3; i >= 0; i--) { -        uint8_t digit = ((unicode >> (i*4)) & 0xF); -        register_code(hex_to_keycode(digit)); -        unregister_code(hex_to_keycode(digit)); + +    if (kc) { +      register_code (kc); +      unregister_code (kc); +      wait_ms (UNICODE_TYPE_DELAY);      } -    switch(input_mode) { -      case UC_OSX: -      case UC_WIN: -        unregister_code(KC_LALT); -        break; -      case UC_LNX: -        unregister_code(KC_LCTL); -        unregister_code(KC_LSFT); +  } +} + +bool process_ucis (uint16_t keycode, keyrecord_t *record) { +  uint8_t i; + +  if (!qk_ucis_state.in_progress) +    return true; + +  if (qk_ucis_state.count >= UCIS_MAX_SYMBOL_LENGTH && +      !(keycode == KC_BSPC || keycode == KC_ESC || keycode == KC_SPC || keycode == KC_ENT)) { +    return false; +  } + +  if (!record->event.pressed) +    return true; + +  qk_ucis_state.codes[qk_ucis_state.count] = keycode; +  qk_ucis_state.count++; + +  if (keycode == KC_BSPC) { +    if (qk_ucis_state.count >= 2) { +      qk_ucis_state.count -= 2; +      return true; +    } else { +      qk_ucis_state.count--; +      return false; +    } +  } + +  if (keycode == KC_ENT || keycode == KC_SPC || keycode == KC_ESC) { +    bool symbol_found = false; + +    for (i = qk_ucis_state.count; i > 0; i--) { +      register_code (KC_BSPC); +      unregister_code (KC_BSPC); +      wait_ms(UNICODE_TYPE_DELAY); +    } + +    if (keycode == KC_ESC) { +      qk_ucis_state.in_progress = false; +      return false; +    } + +    unicode_input_start(); +    for (i = 0; ucis_symbol_table[i].symbol; i++) { +      if (is_uni_seq (ucis_symbol_table[i].symbol)) { +        symbol_found = true; +        register_ucis(ucis_symbol_table[i].code + 2);          break; +      }      } +    if (!symbol_found) { +      qk_ucis_symbol_fallback(); +    } +    unicode_input_finish(); + +    qk_ucis_state.in_progress = false; +    return false;    }    return true; -}
\ No newline at end of file +} +#endif diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h index ca17f8f669..85364e8eb3 100644 --- a/quantum/process_keycode/process_unicode.h +++ b/quantum/process_keycode/process_unicode.h @@ -8,10 +8,46 @@  #define UC_WIN 2  #define UC_BSD 3 +#ifndef UNICODE_TYPE_DELAY +#define UNICODE_TYPE_DELAY 10 +#endif +  void set_unicode_input_mode(uint8_t os_target); +void unicode_input_start(void); +void unicode_input_finish(void); +void register_hex(uint16_t hex);  bool process_unicode(uint16_t keycode, keyrecord_t *record); +#ifdef UCIS_ENABLE +#ifndef UCIS_MAX_SYMBOL_LENGTH +#define UCIS_MAX_SYMBOL_LENGTH 32 +#endif + +typedef struct { +  char *symbol; +  char *code; +} qk_ucis_symbol_t; + +struct { +  uint8_t count; +  uint16_t codes[UCIS_MAX_SYMBOL_LENGTH]; +  bool in_progress:1; +} qk_ucis_state; + +#define UCIS_TABLE(...) {__VA_ARGS__, {NULL, NULL}} +#define UCIS_SYM(name, code) {name, #code} + +extern const qk_ucis_symbol_t ucis_symbol_table[]; + +void qk_ucis_start(void); +void qk_ucis_start_user(void); +void qk_ucis_symbol_fallback (void); +void register_ucis(const char *hex); +bool process_ucis (uint16_t keycode, keyrecord_t *record); + +#endif +  #define UC_BSPC	UC(0x0008)  #define UC_SPC	UC(0x0020) @@ -119,4 +155,4 @@ bool process_unicode(uint16_t keycode, keyrecord_t *record);  #define UC_TILD	UC(0x007E)  #define UC_DEL	UC(0x007F) -#endif
\ No newline at end of file +#endif diff --git a/quantum/quantum.c b/quantum/quantum.c index bc2da510f2..a4c5c2ddbc 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -87,6 +87,9 @@ bool process_record_quantum(keyrecord_t *record) {    #ifdef UNICODE_ENABLE      process_unicode(keycode, record) &&    #endif +  #ifdef UCIS_ENABLE +    process_ucis(keycode, record) && +  #endif        true)) {      return false;    } diff --git a/quantum/quantum.h b/quantum/quantum.h index 7ebfb24e30..6e3fbcc792 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -25,6 +25,7 @@  #include "led.h"  #include "action_util.h"  #include <stdlib.h> +#include "print.h"  extern uint32_t default_layer_state; diff --git a/quantum/rgblight.c b/quantum/rgblight.c index b1b0f035d5..f82e3ec558 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c @@ -7,24 +7,41 @@  #include "debug.h"  const uint8_t DIM_CURVE[] PROGMEM = { -	0, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, -	3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, -	4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, -	6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, -	8, 8, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, -	11, 11, 12, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, -	15, 15, 16, 16, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 19, 20, -	20, 20, 21, 21, 22, 22, 22, 23, 23, 24, 24, 25, 25, 25, 26, 26, -	27, 27, 28, 28, 29, 29, 30, 30, 31, 32, 32, 33, 33, 34, 35, 35, -	36, 36, 37, 38, 38, 39, 40, 40, 41, 42, 43, 43, 44, 45, 46, 47, -	48, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, -	63, 64, 65, 66, 68, 69, 70, 71, 73, 74, 75, 76, 78, 79, 81, 82, -	83, 85, 86, 88, 90, 91, 93, 94, 96, 98, 99, 101, 103, 105, 107, 109, -	110, 112, 114, 116, 118, 121, 123, 125, 127, 129, 132, 134, 136, 139, 141, 144, -	146, 149, 151, 154, 157, 159, 162, 165, 168, 171, 174, 177, 180, 183, 186, 190, -	193, 196, 200, 203, 207, 211, 214, 218, 222, 226, 230, 234, 238, 242, 248, 255, +  0, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, +  3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, +  4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, +  6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, +  8, 8, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11, +  11, 11, 12, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, +  15, 15, 16, 16, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 19, 20, +  20, 20, 21, 21, 22, 22, 22, 23, 23, 24, 24, 25, 25, 25, 26, 26, +  27, 27, 28, 28, 29, 29, 30, 30, 31, 32, 32, 33, 33, 34, 35, 35, +  36, 36, 37, 38, 38, 39, 40, 40, 41, 42, 43, 43, 44, 45, 46, 47, +  48, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +  63, 64, 65, 66, 68, 69, 70, 71, 73, 74, 75, 76, 78, 79, 81, 82, +  83, 85, 86, 88, 90, 91, 93, 94, 96, 98, 99, 101, 103, 105, 107, 109, +  110, 112, 114, 116, 118, 121, 123, 125, 127, 129, 132, 134, 136, 139, 141, 144, +  146, 149, 151, 154, 157, 159, 162, 165, 168, 171, 174, 177, 180, 183, 186, 190, +  193, 196, 200, 203, 207, 211, 214, 218, 222, 226, 230, 234, 238, 242, 248, 255 +}; +const uint8_t RGBLED_BREATHING_TABLE[] PROGMEM = { +  0, 0, 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 9, +  10, 11, 12, 14, 15, 17, 18, 20, 21, 23, 25, 27, 29, 31, 33, 35, +  37, 40, 42, 44, 47, 49, 52, 54, 57, 59, 62, 65, 67, 70, 73, 76, +  79, 82, 85, 88, 90, 93, 97, 100, 103, 106, 109, 112, 115, 118, 121, 124, +  127, 131, 134, 137, 140, 143, 146, 149, 152, 155, 158, 162, 165, 167, 170, 173, +  176, 179, 182, 185, 188, 190, 193, 196, 198, 201, 203, 206, 208, 211, 213, 215, +  218, 220, 222, 224, 226, 228, 230, 232, 234, 235, 237, 238, 240, 241, 243, 244, +  245, 246, 248, 249, 250, 250, 251, 252, 253, 253, 254, 254, 254, 255, 255, 255, +  255, 255, 255, 255, 254, 254, 254, 253, 253, 252, 251, 250, 250, 249, 248, 246, +  245, 244, 243, 241, 240, 238, 237, 235, 234, 232, 230, 228, 226, 224, 222, 220, +  218, 215, 213, 211, 208, 206, 203, 201, 198, 196, 193, 190, 188, 185, 182, 179, +  176, 173, 170, 167, 165, 162, 158, 155, 152, 149, 146, 143, 140, 137, 134, 131, +  128, 124, 121, 118, 115, 112, 109, 106, 103, 100, 97, 93, 90, 88, 85, 82, +  79, 76, 73, 70, 67, 65, 62, 59, 57, 54, 52, 49, 47, 44, 42, 40, +  37, 35, 33, 31, 29, 27, 25, 23, 21, 20, 18, 17, 15, 14, 12, 11, +  10, 9, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0, 0  }; -const uint8_t RGBLED_BREATHING_TABLE[] PROGMEM = {0,0,0,0,1,1,1,2,2,3,4,5,5,6,7,9,10,11,12,14,15,17,18,20,21,23,25,27,29,31,33,35,37,40,42,44,47,49,52,54,57,59,62,65,67,70,73,76,79,82,85,88,90,93,97,100,103,106,109,112,115,118,121,124,127,131,134,137,140,143,146,149,152,155,158,162,165,167,170,173,176,179,182,185,188,190,193,196,198,201,203,206,208,211,213,215,218,220,222,224,226,228,230,232,234,235,237,238,240,241,243,244,245,246,248,249,250,250,251,252,253,253,254,254,254,255,255,255,255,255,255,255,254,254,254,253,253,252,251,250,250,249,248,246,245,244,243,241,240,238,237,235,234,232,230,228,226,224,222,220,218,215,213,211,208,206,203,201,198,196,193,190,188,185,182,179,176,173,170,167,165,162,158,155,152,149,146,143,140,137,134,131,128,124,121,118,115,112,109,106,103,100,97,93,90,88,85,82,79,76,73,70,67,65,62,59,57,54,52,49,47,44,42,40,37,35,33,31,29,27,25,23,21,20,18,17,15,14,12,11,10,9,7,6,5,5,4,3,2,2,1,1,1,0,0,0};  const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};  const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {120, 60, 30};  const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {100, 50, 20}; @@ -38,63 +55,56 @@ uint8_t rgblight_inited = 0;  void sethsv(uint16_t hue, uint8_t sat, uint8_t val, struct cRGB *led1) { -	/* convert hue, saturation and brightness ( HSB/HSV ) to RGB -	The DIM_CURVE is used only on brightness/value and on saturation (inverted). -	This looks the most natural. -	*/ -  uint8_t r = 0, g = 0, b = 0; +  // Convert hue, saturation, and value (HSV/HSB) to RGB. DIM_CURVE is used only +  // on value and saturation (inverted). This looks the most natural. +  uint8_t r = 0, g = 0, b = 0, base, color;    val = pgm_read_byte(&DIM_CURVE[val]); -	sat = 255 - pgm_read_byte(&DIM_CURVE[255 - sat]); - -	uint8_t base; - -	if (sat == 0) { // Acromatic color (gray). Hue doesn't mind. -		r = val; -		g = val; -		b = val; -	} else  { -		base = ((255 - sat) * val) >> 8; - -		switch (hue / 60) { -		case 0: -			r = val; -			g = (((val - base)*hue) / 60) + base; -			b = base; -			break; - -		case 1: -			r = (((val - base)*(60 - (hue % 60))) / 60) + base; -			g = val; -			b = base; -			break; - -		case 2: -			r = base; -			g = val; -			b = (((val - base)*(hue % 60)) / 60) + base; -			break; - -		case 3: -			r = base; -			g = (((val - base)*(60 - (hue % 60))) / 60) + base; -			b = val; -			break; - -		case 4: -			r = (((val - base)*(hue % 60)) / 60) + base; -			g = base; -			b = val; -			break; - -		case 5: -			r = val; -			g = base; -			b = (((val - base)*(60 - (hue % 60))) / 60) + base; -			break; -		} -	} -  setrgb(r,g,b, led1); +  sat = 255 - pgm_read_byte(&DIM_CURVE[255 - sat]); + +  if (sat == 0) { // Acromatic color (gray). Hue doesn't mind. +    r = val; +    g = val; +    b = val; +  } else { +    base = ((255 - sat) * val) >> 8; +    color = (val - base) * (hue % 60) / 60; + +    switch (hue / 60) { +      case 0: +        r = val; +        g = base + color; +        b = base; +        break; +      case 1: +        r = val - color; +        g = val; +        b = base; +        break; +      case 2: +        r = base; +        g = val; +        b = base + color; +        break; +      case 3: +        r = base; +        g = val - color; +        b = val; +        break; +      case 4: +        r = base + color; +        g = base; +        b = val; +        break; +      case 5: +        r = val; +        g = base; +        b = val - color; +        break; +    } +  } + +  setrgb(r, g, b, led1);  }  void setrgb(uint8_t r, uint8_t g, uint8_t b, struct cRGB *led1) { @@ -111,44 +121,44 @@ void eeconfig_update_rgblight(uint32_t val) {    eeprom_update_dword(EECONFIG_RGBLIGHT, val);  }  void eeconfig_update_rgblight_default(void) { -	dprintf("eeconfig_update_rgblight_default\n"); -	rgblight_config.enable = 1; -	rgblight_config.mode = 1; -	rgblight_config.hue = 200; -	rgblight_config.sat = 204; -	rgblight_config.val = 204; -	eeconfig_update_rgblight(rgblight_config.raw); +  dprintf("eeconfig_update_rgblight_default\n"); +  rgblight_config.enable = 1; +  rgblight_config.mode = 1; +  rgblight_config.hue = 200; +  rgblight_config.sat = 204; +  rgblight_config.val = 204; +  eeconfig_update_rgblight(rgblight_config.raw);  }  void eeconfig_debug_rgblight(void) { -	dprintf("rgblight_config eprom\n"); -	dprintf("rgblight_config.enable = %d\n", rgblight_config.enable); -	dprintf("rghlight_config.mode = %d\n", rgblight_config.mode); -	dprintf("rgblight_config.hue = %d\n", rgblight_config.hue); -	dprintf("rgblight_config.sat = %d\n", rgblight_config.sat); -	dprintf("rgblight_config.val = %d\n", rgblight_config.val); +  dprintf("rgblight_config eprom\n"); +  dprintf("rgblight_config.enable = %d\n", rgblight_config.enable); +  dprintf("rghlight_config.mode = %d\n", rgblight_config.mode); +  dprintf("rgblight_config.hue = %d\n", rgblight_config.hue); +  dprintf("rgblight_config.sat = %d\n", rgblight_config.sat); +  dprintf("rgblight_config.val = %d\n", rgblight_config.val);  }  void rgblight_init(void) {    debug_enable = 1; // Debug ON! -	dprintf("rgblight_init called.\n"); +  dprintf("rgblight_init called.\n");    rgblight_inited = 1; -	dprintf("rgblight_init start!\n"); +  dprintf("rgblight_init start!\n");    if (!eeconfig_is_enabled()) { -		dprintf("rgblight_init eeconfig is not enabled.\n"); +    dprintf("rgblight_init eeconfig is not enabled.\n");      eeconfig_init(); -		eeconfig_update_rgblight_default(); +    eeconfig_update_rgblight_default();    }    rgblight_config.raw = eeconfig_read_rgblight(); -	if (!rgblight_config.mode) { -		dprintf("rgblight_init rgblight_config.mode = 0. Write default values to EEPROM.\n"); -		eeconfig_update_rgblight_default(); -		rgblight_config.raw = eeconfig_read_rgblight(); -	} -	eeconfig_debug_rgblight(); // display current eeprom values +  if (!rgblight_config.mode) { +    dprintf("rgblight_init rgblight_config.mode = 0. Write default values to EEPROM.\n"); +    eeconfig_update_rgblight_default(); +    rgblight_config.raw = eeconfig_read_rgblight(); +  } +  eeconfig_debug_rgblight(); // display current eeprom values -	#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER) -		rgblight_timer_init(); // setup the timer -	#endif +  #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER) +    rgblight_timer_init(); // setup the timer +  #endif    if (rgblight_config.enable) {      rgblight_mode(rgblight_config.mode); @@ -156,58 +166,57 @@ void rgblight_init(void) {  }  void rgblight_increase(void) { -	uint8_t mode = 0; +  uint8_t mode = 0;    if (rgblight_config.mode < RGBLIGHT_MODES) {      mode = rgblight_config.mode + 1;    } -	rgblight_mode(mode); +  rgblight_mode(mode);  } -  void rgblight_decrease(void) { -	uint8_t mode = 0; -  if (rgblight_config.mode > 1) { //mode will never < 1, if mode is less than 1, eeprom need to be initialized. -    mode = rgblight_config.mode-1; +  uint8_t mode = 0; +  // Mode will never be < 1. If it ever is, eeprom needs to be initialized. +  if (rgblight_config.mode > 1) { +    mode = rgblight_config.mode - 1;    } -	rgblight_mode(mode); +  rgblight_mode(mode);  } -  void rgblight_step(void) { -	uint8_t mode = 0; +  uint8_t mode = 0;    mode = rgblight_config.mode + 1;    if (mode > RGBLIGHT_MODES) {      mode = 1;    } -	rgblight_mode(mode); +  rgblight_mode(mode);  }  void rgblight_mode(uint8_t mode) { -	if (!rgblight_config.enable) { -		return; -	} -  if (mode<1) { -		rgblight_config.mode = 1; -	} else if (mode > RGBLIGHT_MODES) { -		rgblight_config.mode = RGBLIGHT_MODES; -	} else { -		rgblight_config.mode = mode; -	} +  if (!rgblight_config.enable) { +    return; +  } +  if (mode < 1) { +    rgblight_config.mode = 1; +  } else if (mode > RGBLIGHT_MODES) { +    rgblight_config.mode = RGBLIGHT_MODES; +  } else { +    rgblight_config.mode = mode; +  }    eeconfig_update_rgblight(rgblight_config.raw);    xprintf("rgblight mode: %u\n", rgblight_config.mode); -	if (rgblight_config.mode == 1) { -		#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER) -			rgblight_timer_disable(); -		#endif -	} else if (rgblight_config.mode >=2 && rgblight_config.mode <=23) { -		// MODE 2-5, breathing -		// MODE 6-8, rainbow mood -		// MODE 9-14, rainbow swirl -		// MODE 15-20, snake -		// MODE 21-23, knight - -		#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER) -			rgblight_timer_enable(); -		#endif -	} +  if (rgblight_config.mode == 1) { +    #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER) +      rgblight_timer_disable(); +    #endif +  } else if (rgblight_config.mode >= 2 && rgblight_config.mode <= 23) { +    // MODE 2-5, breathing +    // MODE 6-8, rainbow mood +    // MODE 9-14, rainbow swirl +    // MODE 15-20, snake +    // MODE 21-23, knight + +    #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER) +      rgblight_timer_enable(); +    #endif +  }    rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val);  } @@ -215,306 +224,318 @@ void rgblight_toggle(void) {    rgblight_config.enable ^= 1;    eeconfig_update_rgblight(rgblight_config.raw);    xprintf("rgblight toggle: rgblight_config.enable = %u\n", rgblight_config.enable); -	if (rgblight_config.enable) { -		rgblight_mode(rgblight_config.mode); -	} else { - -		#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER) -			rgblight_timer_disable(); -		#endif -		_delay_ms(50); -		rgblight_set(); -	} +  if (rgblight_config.enable) { +    rgblight_mode(rgblight_config.mode); +  } else { +    #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER) +      rgblight_timer_disable(); +    #endif +    _delay_ms(50); +    rgblight_set(); +  }  } -void rgblight_increase_hue(void){ -	uint16_t hue; +void rgblight_increase_hue(void) { +  uint16_t hue;    hue = (rgblight_config.hue+RGBLIGHT_HUE_STEP) % 360;    rgblight_sethsv(hue, rgblight_config.sat, rgblight_config.val);  } -void rgblight_decrease_hue(void){ -	uint16_t hue; -	if (rgblight_config.hue-RGBLIGHT_HUE_STEP <0 ) { -		hue = (rgblight_config.hue+360-RGBLIGHT_HUE_STEP) % 360; -	} else { -		hue = (rgblight_config.hue-RGBLIGHT_HUE_STEP) % 360; -	} +void rgblight_decrease_hue(void) { +  uint16_t hue; +  if (rgblight_config.hue-RGBLIGHT_HUE_STEP < 0) { +    hue = (rgblight_config.hue + 360 - RGBLIGHT_HUE_STEP) % 360; +  } else { +    hue = (rgblight_config.hue - RGBLIGHT_HUE_STEP) % 360; +  }    rgblight_sethsv(hue, rgblight_config.sat, rgblight_config.val);  }  void rgblight_increase_sat(void) { -	uint8_t sat; +  uint8_t sat;    if (rgblight_config.sat + RGBLIGHT_SAT_STEP > 255) {      sat = 255;    } else { -    sat = rgblight_config.sat+RGBLIGHT_SAT_STEP; +    sat = rgblight_config.sat + RGBLIGHT_SAT_STEP;    }    rgblight_sethsv(rgblight_config.hue, sat, rgblight_config.val);  } -void rgblight_decrease_sat(void){ -	uint8_t sat; +void rgblight_decrease_sat(void) { +  uint8_t sat;    if (rgblight_config.sat - RGBLIGHT_SAT_STEP < 0) {      sat = 0;    } else { -    sat = rgblight_config.sat-RGBLIGHT_SAT_STEP; +    sat = rgblight_config.sat - RGBLIGHT_SAT_STEP;    }    rgblight_sethsv(rgblight_config.hue, sat, rgblight_config.val);  } -void rgblight_increase_val(void){ -	uint8_t val; +void rgblight_increase_val(void) { +  uint8_t val;    if (rgblight_config.val + RGBLIGHT_VAL_STEP > 255) {      val = 255;    } else { -    val = rgblight_config.val+RGBLIGHT_VAL_STEP; +    val = rgblight_config.val + RGBLIGHT_VAL_STEP;    }    rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, val);  }  void rgblight_decrease_val(void) { -	uint8_t val; +  uint8_t val;    if (rgblight_config.val - RGBLIGHT_VAL_STEP < 0) {      val = 0;    } else { -    val = rgblight_config.val-RGBLIGHT_VAL_STEP; +    val = rgblight_config.val - RGBLIGHT_VAL_STEP;    }    rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, val);  } -void rgblight_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val){ -	inmem_config.raw = rgblight_config.raw; +void rgblight_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val) { +  inmem_config.raw = rgblight_config.raw;    if (rgblight_config.enable) {      struct cRGB tmp_led;      sethsv(hue, sat, val, &tmp_led); -		inmem_config.hue = hue; -		inmem_config.sat = sat; -		inmem_config.val = val; +    inmem_config.hue = hue; +    inmem_config.sat = sat; +    inmem_config.val = val;      // dprintf("rgblight set hue [MEMORY]: %u,%u,%u\n", inmem_config.hue, inmem_config.sat, inmem_config.val);      rgblight_setrgb(tmp_led.r, tmp_led.g, tmp_led.b);    }  } -void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val){ +void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val) {    if (rgblight_config.enable) { -		if (rgblight_config.mode == 1) { -			// same static color -			rgblight_sethsv_noeeprom(hue, sat, val); -		} else { -			// all LEDs in same color -			if (rgblight_config.mode >= 2 && rgblight_config.mode <= 5) { -				// breathing mode, ignore the change of val, use in memory value instead -				val = rgblight_config.val; -			} else if (rgblight_config.mode >= 6 && rgblight_config.mode <= 14) { -				// rainbow mood and rainbow swirl, ignore the change of hue -				hue = rgblight_config.hue; -			} -		} -		rgblight_config.hue = hue; -		rgblight_config.sat = sat; -		rgblight_config.val = val; -		eeconfig_update_rgblight(rgblight_config.raw); -		xprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val); -  } -} - -void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b){ +    if (rgblight_config.mode == 1) { +      // same static color +      rgblight_sethsv_noeeprom(hue, sat, val); +    } else { +      // all LEDs in same color +      if (rgblight_config.mode >= 2 && rgblight_config.mode <= 5) { +        // breathing mode, ignore the change of val, use in memory value instead +        val = rgblight_config.val; +      } else if (rgblight_config.mode >= 6 && rgblight_config.mode <= 14) { +        // rainbow mood and rainbow swirl, ignore the change of hue +        hue = rgblight_config.hue; +      } +    } +    rgblight_config.hue = hue; +    rgblight_config.sat = sat; +    rgblight_config.val = val; +    eeconfig_update_rgblight(rgblight_config.raw); +    xprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val); +  } +} + +void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {    // dprintf("rgblight set rgb: %u,%u,%u\n", r,g,b); -  for (uint8_t i=0;i<RGBLED_NUM;i++) { +  for (uint8_t i = 0; i < RGBLED_NUM; i++) {      led[i].r = r;      led[i].g = g;      led[i].b = b;    }    rgblight_set(); -  }  void rgblight_set(void) { -	if (rgblight_config.enable) { -		ws2812_setleds(led, RGBLED_NUM); -	} else { -		for (uint8_t i=0;i<RGBLED_NUM;i++) { -	    led[i].r = 0; -	    led[i].g = 0; -	    led[i].b = 0; -	  } -		ws2812_setleds(led, RGBLED_NUM); -	} +  if (rgblight_config.enable) { +    ws2812_setleds(led, RGBLED_NUM); +  } else { +    for (uint8_t i = 0; i < RGBLED_NUM; i++) { +      led[i].r = 0; +      led[i].g = 0; +      led[i].b = 0; +    } +    ws2812_setleds(led, RGBLED_NUM); +  }  } -  #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)  // Animation timer -- AVR Timer3  void rgblight_timer_init(void) { -	static uint8_t rgblight_timer_is_init = 0; -	if (rgblight_timer_is_init) { -		return; -	} -	rgblight_timer_is_init = 1; -	/* Timer 3 setup */ -	TCCR3B = _BV(WGM32) //CTC mode OCR3A as TOP -	      | _BV(CS30); //Clock selelct: clk/1 -	/* Set TOP value */ -	uint8_t sreg = SREG; -	cli(); -	OCR3AH = (RGBLED_TIMER_TOP>>8)&0xff; -	OCR3AL = RGBLED_TIMER_TOP&0xff; -	SREG = sreg; +  static uint8_t rgblight_timer_is_init = 0; +  if (rgblight_timer_is_init) { +    return; +  } +  rgblight_timer_is_init = 1; +  /* Timer 3 setup */ +  TCCR3B = _BV(WGM32) //CTC mode OCR3A as TOP +        | _BV(CS30); //Clock selelct: clk/1 +  /* Set TOP value */ +  uint8_t sreg = SREG; +  cli(); +  OCR3AH = (RGBLED_TIMER_TOP >> 8) & 0xff; +  OCR3AL = RGBLED_TIMER_TOP & 0xff; +  SREG = sreg;  }  void rgblight_timer_enable(void) { -	TIMSK3 |= _BV(OCIE3A); -	dprintf("TIMER3 enabled.\n"); +  TIMSK3 |= _BV(OCIE3A); +  dprintf("TIMER3 enabled.\n");  }  void rgblight_timer_disable(void) { -	TIMSK3 &= ~_BV(OCIE3A); -	dprintf("TIMER3 disabled.\n"); +  TIMSK3 &= ~_BV(OCIE3A); +  dprintf("TIMER3 disabled.\n");  }  void rgblight_timer_toggle(void) { -	TIMSK3 ^= _BV(OCIE3A); -	dprintf("TIMER3 toggled.\n"); +  TIMSK3 ^= _BV(OCIE3A); +  dprintf("TIMER3 toggled.\n");  }  ISR(TIMER3_COMPA_vect) { -	// Mode = 1, static light, do nothing here -	if (rgblight_config.mode>=2 && rgblight_config.mode<=5) { -		// mode = 2 to 5, breathing mode -		rgblight_effect_breathing(rgblight_config.mode-2); - -	} else if (rgblight_config.mode>=6 && rgblight_config.mode<=8) { -		rgblight_effect_rainbow_mood(rgblight_config.mode-6); -	} else if (rgblight_config.mode>=9 && rgblight_config.mode<=14) { -		rgblight_effect_rainbow_swirl(rgblight_config.mode-9); -	} else if (rgblight_config.mode>=15 && rgblight_config.mode<=20) { -		rgblight_effect_snake(rgblight_config.mode-15); -	} else if (rgblight_config.mode>=21 && rgblight_config.mode<=23) { -		rgblight_effect_knight(rgblight_config.mode-21); -	} -} - -// effects +  // mode = 1, static light, do nothing here +  if (rgblight_config.mode >= 2 && rgblight_config.mode <= 5) { +    // mode = 2 to 5, breathing mode +    rgblight_effect_breathing(rgblight_config.mode - 2); +  } else if (rgblight_config.mode >= 6 && rgblight_config.mode <= 8) { +    // mode = 6 to 8, rainbow mood mod +    rgblight_effect_rainbow_mood(rgblight_config.mode - 6); +  } else if (rgblight_config.mode >= 9 && rgblight_config.mode <= 14) { +    // mode = 9 to 14, rainbow swirl mode +    rgblight_effect_rainbow_swirl(rgblight_config.mode - 9); +  } else if (rgblight_config.mode >= 15 && rgblight_config.mode <= 20) { +    // mode = 15 to 20, snake mode +    rgblight_effect_snake(rgblight_config.mode - 15); +  } else if (rgblight_config.mode >= 21 && rgblight_config.mode <= 23) { +    // mode = 21 to 23, knight mode +    rgblight_effect_knight(rgblight_config.mode - 21); +  } +} + +// Effects  void rgblight_effect_breathing(uint8_t interval) { -	static uint8_t pos = 0; -	static uint16_t last_timer = 0; +  static uint8_t pos = 0; +  static uint16_t last_timer = 0; -	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_BREATHING_INTERVALS[interval])) return; -	last_timer = timer_read(); +  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_BREATHING_INTERVALS[interval])) { +    return; +  } +  last_timer = timer_read(); -	rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, pgm_read_byte(&RGBLED_BREATHING_TABLE[pos])); -	pos = (pos+1) % 256; +  rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, pgm_read_byte(&RGBLED_BREATHING_TABLE[pos])); +  pos = (pos + 1) % 256;  } -  void rgblight_effect_rainbow_mood(uint8_t interval) { -	static uint16_t current_hue=0; -	static uint16_t last_timer = 0; +  static uint16_t current_hue = 0; +  static uint16_t last_timer = 0; -	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval])) return; -	last_timer = timer_read(); -	rgblight_sethsv_noeeprom(current_hue, rgblight_config.sat, rgblight_config.val); -	current_hue = (current_hue+1) % 360; +  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval])) { +    return; +  } +  last_timer = timer_read(); +  rgblight_sethsv_noeeprom(current_hue, rgblight_config.sat, rgblight_config.val); +  current_hue = (current_hue + 1) % 360;  } -  void rgblight_effect_rainbow_swirl(uint8_t interval) { -	static uint16_t current_hue=0; -	static uint16_t last_timer = 0; -	uint16_t hue; -	uint8_t i; -	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval/2])) return; -	last_timer = timer_read(); -	for (i=0; i<RGBLED_NUM; i++) { -		hue = (360/RGBLED_NUM*i+current_hue)%360; -		sethsv(hue, rgblight_config.sat, rgblight_config.val, &led[i]); -	} -	rgblight_set(); - -	if (interval % 2) { -		current_hue = (current_hue+1) % 360; -	} else { -		if (current_hue -1 < 0) { -			current_hue = 359; -		} else { -			current_hue = current_hue - 1; -		} - -	} +  static uint16_t current_hue = 0; +  static uint16_t last_timer = 0; +  uint16_t hue; +  uint8_t i; +  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval / 2])) { +    return; +  } +  last_timer = timer_read(); +  for (i = 0; i < RGBLED_NUM; i++) { +    hue = (360 / RGBLED_NUM * i + current_hue) % 360; +    sethsv(hue, rgblight_config.sat, rgblight_config.val, &led[i]); +  } +  rgblight_set(); + +  if (interval % 2) { +    current_hue = (current_hue + 1) % 360; +  } else { +    if (current_hue - 1 < 0) { +      current_hue = 359; +    } else { +      current_hue = current_hue - 1; +    } +  }  }  void rgblight_effect_snake(uint8_t interval) { -	static uint8_t pos=0; -	static uint16_t last_timer = 0; -	uint8_t i,j; -	int8_t k; -	int8_t increament = 1; -	if (interval%2) increament = -1; -	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_SNAKE_INTERVALS[interval/2])) return; -	last_timer = timer_read(); -	for (i=0;i<RGBLED_NUM;i++) { -		led[i].r=0; -		led[i].g=0; -		led[i].b=0; -		for (j=0;j<RGBLIGHT_EFFECT_SNAKE_LENGTH;j++) { -			k = pos+j*increament; -			if (k<0) k = k+RGBLED_NUM; -			if (i==k) { -				sethsv(rgblight_config.hue, rgblight_config.sat, (uint8_t)(rgblight_config.val*(RGBLIGHT_EFFECT_SNAKE_LENGTH-j)/RGBLIGHT_EFFECT_SNAKE_LENGTH), &led[i]); -			} -		} -	} -	rgblight_set(); -	if (increament == 1) { -		if (pos - 1 < 0) { -			pos = RGBLED_NUM-1; -		} else { -			pos -= 1; -		} -	} else { -		pos = (pos+1)%RGBLED_NUM; -	} - +  static uint8_t pos = 0; +  static uint16_t last_timer = 0; +  uint8_t i, j; +  int8_t k; +  int8_t increment = 1; +  if (interval % 2) { +    increment = -1; +  } +  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_SNAKE_INTERVALS[interval / 2])) { +    return; +  } +  last_timer = timer_read(); +  for (i = 0; i < RGBLED_NUM; i++) { +    led[i].r = 0; +    led[i].g = 0; +    led[i].b = 0; +    for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) { +      k = pos + j * increment; +      if (k < 0) { +        k = k + RGBLED_NUM; +      } +      if (i == k) { +        sethsv(rgblight_config.hue, rgblight_config.sat, (uint8_t)(rgblight_config.val*(RGBLIGHT_EFFECT_SNAKE_LENGTH-j)/RGBLIGHT_EFFECT_SNAKE_LENGTH), &led[i]); +      } +    } +  } +  rgblight_set(); +  if (increment == 1) { +    if (pos - 1 < 0) { +      pos = RGBLED_NUM - 1; +    } else { +      pos -= 1; +    } +  } else { +    pos = (pos + 1) % RGBLED_NUM; +  }  } -  void rgblight_effect_knight(uint8_t interval) { -	static int8_t pos=0; -	static uint16_t last_timer = 0; -	uint8_t i,j,cur; -	int8_t k; -	struct cRGB preled[RGBLED_NUM]; -	static int8_t increament = -1; -	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_KNIGHT_INTERVALS[interval])) return; -	last_timer = timer_read(); -	for (i=0;i<RGBLED_NUM;i++) { -		preled[i].r=0; -		preled[i].g=0; -		preled[i].b=0; -		for (j=0;j<RGBLIGHT_EFFECT_KNIGHT_LENGTH;j++) { -			k = pos+j*increament; -			if (k<0) k = 0; -			if (k>=RGBLED_NUM) k=RGBLED_NUM-1; -			if (i==k) { -				sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, &preled[i]); -			} -		} -	} -	if (RGBLIGHT_EFFECT_KNIGHT_OFFSET) { -		for (i=0;i<RGBLED_NUM;i++) { -			cur = (i+RGBLIGHT_EFFECT_KNIGHT_OFFSET) % RGBLED_NUM; -			led[i].r = preled[cur].r; -			led[i].g = preled[cur].g; -			led[i].b = preled[cur].b; -		} -	} -	rgblight_set(); -	if (increament == 1) { -		if (pos - 1 < 0 - RGBLIGHT_EFFECT_KNIGHT_LENGTH) { -			pos = 0- RGBLIGHT_EFFECT_KNIGHT_LENGTH; -			increament = -1; -		} else { -			pos -= 1; -		} -	} else { -		if (pos+1>RGBLED_NUM+RGBLIGHT_EFFECT_KNIGHT_LENGTH) { -			pos = RGBLED_NUM+RGBLIGHT_EFFECT_KNIGHT_LENGTH-1; -			increament = 1; -		} else { -			pos += 1; -		} -	} - -} - -#endif
\ No newline at end of file +  static int8_t pos = 0; +  static uint16_t last_timer = 0; +  uint8_t i, j, cur; +  int8_t k; +  struct cRGB preled[RGBLED_NUM]; +  static int8_t increment = -1; +  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_KNIGHT_INTERVALS[interval])) { +    return; +  } +  last_timer = timer_read(); +  for (i = 0; i < RGBLED_NUM; i++) { +    preled[i].r = 0; +    preled[i].g = 0; +    preled[i].b = 0; +    for (j = 0; j < RGBLIGHT_EFFECT_KNIGHT_LENGTH; j++) { +      k = pos + j * increment; +      if (k < 0) { +        k = 0; +      } +      if (k >= RGBLED_NUM) { +        k = RGBLED_NUM - 1; +      } +      if (i == k) { +        sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, &preled[i]); +      } +    } +  } +  if (RGBLIGHT_EFFECT_KNIGHT_OFFSET) { +    for (i = 0; i < RGBLED_NUM; i++) { +      cur = (i + RGBLIGHT_EFFECT_KNIGHT_OFFSET) % RGBLED_NUM; +      led[i].r = preled[cur].r; +      led[i].g = preled[cur].g; +      led[i].b = preled[cur].b; +    } +  } +  rgblight_set(); +  if (increment == 1) { +    if (pos - 1 < 0 - RGBLIGHT_EFFECT_KNIGHT_LENGTH) { +      pos = 0 - RGBLIGHT_EFFECT_KNIGHT_LENGTH; +      increment = -1; +    } else { +      pos -= 1; +    } +  } else { +    if (pos + 1 > RGBLED_NUM + RGBLIGHT_EFFECT_KNIGHT_LENGTH) { +      pos = RGBLED_NUM + RGBLIGHT_EFFECT_KNIGHT_LENGTH - 1; +      increment = 1; +    } else { +      pos += 1; +    } +  } +} + +#endif | 
