di0ib
/
tmk_keyboard_custom
关注 1
点赞 0
派生 0
代码 版本发布 0 动态
浏览代码

Merge branch '6kro'

yuk86
Kai Ryu 10 年前
父节点
14322aff76 5ccabc844c
当前提交
bcdfa31e83
共有 3 个文件被更改，包括 131 次插入 和 2 次删除
合并视图 显示文件统计
  1. 4
    0
      common.mk
  2. 125
    1
      common/action_util.c
  3. 2
    1
      keyboard/gh60/Makefile

+ 4
- 0
common.mk 查看文件

OPT_DEFS += -DNKRO_ENABLE OPT_DEFS += -DNKRO_ENABLE
endif endif


ifdef USB_6KRO_ENABLE
OPT_DEFS += -DUSB_6KRO_ENABLE
endif

ifdef SLEEP_LED_ENABLE ifdef SLEEP_LED_ENABLE
SRC += $(COMMON_DIR)/sleep_led.c SRC += $(COMMON_DIR)/sleep_led.c
OPT_DEFS += -DSLEEP_LED_ENABLE OPT_DEFS += -DSLEEP_LED_ENABLE

+ 125
- 1
common/action_util.c 查看文件

static uint8_t real_mods = 0; static uint8_t real_mods = 0;
static uint8_t weak_mods = 0; static uint8_t weak_mods = 0;


#ifdef USB_6KRO_ENABLE
#define RO_ADD(a, b) ((a + b) % REPORT_KEYS)
#define RO_SUB(a, b) ((a - b + REPORT_KEYS) % REPORT_KEYS)
#define RO_INC(a) RO_ADD(a, 1)
#define RO_DEC(a) RO_SUB(a, 1)
static int8_t cb_head = 0;
static int8_t cb_tail = 0;
static int8_t cb_count = 0;
#endif


// TODO: pointer variable is not needed // TODO: pointer variable is not needed
//report_keyboard_t keyboard_report = {}; //report_keyboard_t keyboard_report = {};
*/ */
uint8_t has_anykey(void) uint8_t has_anykey(void)
{ {
#ifdef USB_6KRO_ENABLE
#ifdef NKRO_ENABLE
if (!keyboard_nkro) {
#endif
return cb_count;
#ifdef NKRO_ENABLE
}
#endif
#else
uint8_t cnt = 0; uint8_t cnt = 0;
for (uint8_t i = 1; i < REPORT_SIZE; i++) { for (uint8_t i = 1; i < REPORT_SIZE; i++) {
if (keyboard_report->raw[i]) if (keyboard_report->raw[i])
cnt++; cnt++;
} }
return cnt; return cnt;
#endif
} }


uint8_t has_anymod(void) uint8_t has_anymod(void)
return i<<3 | biton(keyboard_report->nkro.bits[i]); return i<<3 | biton(keyboard_report->nkro.bits[i]);
} }
#endif #endif
#ifdef USB_6KRO_ENABLE
uint8_t i = cb_head;
do {
if (keyboard_report->keys[i] != 0) {
break;
}
i = RO_INC(i);
} while (i != cb_tail);
return keyboard_report->keys[i];
#else
return keyboard_report->keys[0]; return keyboard_report->keys[0];
#endif
} }



#ifdef USB_6KRO_ENABLE
#ifdef DEBUG
static void dump_report_keys(void) {
dprintf("\n");
for (uint8_t i = 0; i < REPORT_KEYS; i++) {
dprintf("%02X ", keyboard_report->keys[i]);
}
dprintf("\n");
for (uint8_t i = 0; i < REPORT_KEYS; i++) {
dprintf("%c%c ", i==cb_head?'H':' ', i==cb_tail?'T':' ');
}
dprintf("\n");
}
#endif
#endif


/* local functions */ /* local functions */
static inline void add_key_byte(uint8_t code) static inline void add_key_byte(uint8_t code)
{ {
#ifdef USB_6KRO_ENABLE
int8_t i = cb_head;
int8_t empty = -1;
if (cb_count) {
do {
if (keyboard_report->keys[i] == code) {
return;
}
if (empty == -1 && keyboard_report->keys[i] == 0) {
empty = i;
}
i = RO_INC(i);
} while (i != cb_tail);
if (i == cb_tail) {
if (cb_tail == cb_head) {
// buffer is full
if (empty == -1) {
// pop head when has no empty space
cb_head = RO_INC(cb_head);
cb_count--;
}
else {
// left shift when has empty space
uint8_t offset = 1;
i = RO_INC(empty);
do {
if (keyboard_report->keys[i] != 0) {
keyboard_report->keys[empty] = keyboard_report->keys[i];
keyboard_report->keys[i] = 0;
empty = RO_INC(empty);
}
else {
offset++;
}
i = RO_INC(i);
} while (i != cb_tail);
cb_tail = RO_SUB(cb_tail, offset);
}
}
}
}
// add to tail
keyboard_report->keys[cb_tail] = code;
cb_tail = RO_INC(cb_tail);
cb_count++;
#ifdef DEBUG
dump_report_keys();
#endif
#else
int8_t i = 0; int8_t i = 0;
int8_t empty = -1; int8_t empty = -1;
for (; i < REPORT_KEYS; i++) { for (; i < REPORT_KEYS; i++) {
keyboard_report->keys[empty] = code; keyboard_report->keys[empty] = code;
} }
} }
#endif
} }


static inline void del_key_byte(uint8_t code) static inline void del_key_byte(uint8_t code)
{ {
#ifdef USB_6KRO_ENABLE
uint8_t i = cb_head;
if (cb_count) {
do {
if (keyboard_report->keys[i] == code) {
keyboard_report->keys[i] = 0;
cb_count--;
if (cb_count == 0) {
// reset head and tail
cb_tail = cb_head = 0;
}
if (i == RO_DEC(cb_tail)) {
// left shift when next to tail
do {
cb_tail = RO_DEC(cb_tail);
if (keyboard_report->keys[RO_DEC(cb_tail)] != 0) {
break;
}
} while (cb_tail != cb_head);
}
break;
}
i = RO_INC(i);
} while (i != cb_tail);
}
#ifdef DEBUG
dump_report_keys();
#endif
#else
for (uint8_t i = 0; i < REPORT_KEYS; i++) { for (uint8_t i = 0; i < REPORT_KEYS; i++) {
if (keyboard_report->keys[i] == code) { if (keyboard_report->keys[i] == code) {
keyboard_report->keys[i] = 0; keyboard_report->keys[i] = 0;
} }
} }
#endif
} }


#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE

+ 2
- 1
keyboard/gh60/Makefile 查看文件

CONSOLE_ENABLE = yes # Console for debug(+400) CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
#NKRO_ENABLE = yes # USB Nkey Rollover
USB_6KRO_ENABLE = yes # USB 6key Rollover
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
#PS2_USE_BUSYWAIT = yes #PS2_USE_BUSYWAIT = yes
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality