di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

core: Fix unimap UNIMAP_NO case

Browse Source
This commit is contained in:
tmk 2016-09-08 13:18:05 +09:00
parent 144a048393
commit 384562bc8a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tmk_core/common/unimap.c
View File

@ -25,8 +25,8 @@ keypos_t unimap_translate(keypos_t key)
unimap_trans[key.row][key.col]; unimap_trans[key.row][key.col];
#endif #endif
return (keypos_t) { return (keypos_t) {
.row = ((unimap_pos & 0x70) >> 4), .row = ((unimap_pos & 0xf0) >> 4),
.col = (unimap_pos & 0x0F) .col = (unimap_pos & 0x0f)
}; };
} }
@ -35,11 +35,13 @@ __attribute__ ((weak))
action_t action_for_key(uint8_t layer, keypos_t key) action_t action_for_key(uint8_t layer, keypos_t key)
{ {
keypos_t uni = unimap_translate(key); keypos_t uni = unimap_translate(key);
if ((uni.row << 4 | uni.col) == UNIMAP_NO) return (action_t)ACTION_NO; if ((uni.row << 4 | uni.col) == UNIMAP_NO) {
return (action_t)ACTION_NO;
}
#if defined(__AVR__) #if defined(__AVR__)
return (action_t)pgm_read_word(&actionmaps[(layer)][(uni.row)][(uni.col)]); return (action_t)pgm_read_word(&actionmaps[(layer)][(uni.row & 0x7)][(uni.col)]);
#else #else
return actionmaps[(layer)][(uni.row)][(uni.col)]; return actionmaps[(layer)][(uni.row & 0x7)][(uni.col)];
#endif #endif
} }