ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pulling and pushing troubles

Browse source
This commit is contained in:
nielsenz 2017-03-30 19:15:43 -07:00
parent b9225a28f2
commit 7e54332890
2 changed files with 15 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

75
quantum/process_keycode/process_unicode.c
View file

@ -16,81 +16,6 @@
#include "process_unicode.h" #include "process_unicode.h"
#include "action_util.h" #include "action_util.h"
static uint8_t input_mode;
static uint8_t first_flag = 0;
__attribute__((weak))
uint16_t hex_to_keycode(uint8_t hex)
{
if (hex == 0x0) {
return KC_0;
} else if (hex < 0xA) {
return KC_1 + (hex - 0x1);
} else {
return KC_A + (hex - 0xA);
}
}
void set_unicode_input_mode(uint8_t os_target)
{
input_mode = os_target;
eeprom_update_byte(EECONFIG_UNICODEMODE, os_target);
}
uint8_t get_unicode_input_mode(void) {
return input_mode;
}
__attribute__((weak))
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;
case UC_WINC:
register_code(KC_RALT);
unregister_code(KC_RALT);
register_code(KC_U);
unregister_code(KC_U);
}
wait_ms(UNICODE_TYPE_DELAY);
}
__attribute__((weak))
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) { bool process_unicode(uint16_t keycode, keyrecord_t *record) {
if (keycode > QK_UNICODE && record->event.pressed) { if (keycode > QK_UNICODE && record->event.pressed) {

15
quantum/process_keycode/process_unicode_common.c
View file

@ -16,11 +16,14 @@
#include "process_unicode_common.h" #include "process_unicode_common.h"
static uint8_t input_mode;
static uint8_t first_flag = 0;
uint8_t mods; uint8_t mods;
void set_unicode_input_mode(uint8_t os_target) void set_unicode_input_mode(uint8_t os_target)
{ {
input_mode = os_target; input_mode = os_target;
eeprom_update_byte(EECONFIG_UNICODEMODE, os_target);
} }
uint8_t get_unicode_input_mode(void) { uint8_t get_unicode_input_mode(void) {
@ -92,6 +95,18 @@ void unicode_input_finish (void) {
if (mods & MOD_BIT(KC_RGUI)) register_code(KC_RGUI); if (mods & MOD_BIT(KC_RGUI)) register_code(KC_RGUI);
} }
__attribute__((weak))
uint16_t hex_to_keycode(uint8_t hex)
{
if (hex == 0x0) {
return KC_0;
} else if (hex < 0xA) {
return KC_1 + (hex - 0x1);
} else {
return KC_A + (hex - 0xA);
}
}
void register_hex(uint16_t hex) { void register_hex(uint16_t hex) {
for(int i = 3; i >= 0; i--) { for(int i = 3; i >= 0; i--) {
uint8_t digit = ((hex >> (i*4)) & 0xF); uint8_t digit = ((hex >> (i*4)) & 0xF);