summaryrefslogtreecommitdiffstats
path: root/common/keyboard.c
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2014-11-24 15:36:53 +0900
committertmk <nobody@nowhere>2014-11-24 15:36:53 +0900
commited52ebb9870a26496b13a0565c1aaca8ded3465b (patch)
treecddad806a3408e05bc29310254c564ee94e3e710 /common/keyboard.c
parenteb90ed6238426db9367e294abfaefb5de07564f5 (diff)
parente2077cad45f1736e878e317c43bd94117c61b5e0 (diff)
Merge branch 'merge_rn42'
Diffstat (limited to 'common/keyboard.c')
-rw-r--r--common/keyboard.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/common/keyboard.c b/common/keyboard.c
index 020be8eadf..1e3fb510a4 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
-#include <util/delay.h>
#include "keyboard.h"
#include "matrix.h"
#include "keymap.h"
@@ -107,7 +106,7 @@ void keyboard_task(void)
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
if (matrix_change & ((matrix_row_t)1<<c)) {
action_exec((keyevent_t){
- .key = (key_t){ .row = r, .col = c },
+ .key = (keypos_t){ .row = r, .col = c },
.pressed = (matrix_row & ((matrix_row_t)1<<c)),
.time = (timer_read() | 1) /* time should not be 0 */
});