From 1e83a1e789b55e829f9cfe0f90ee8b50c07c3e31 Mon Sep 17 00:00:00 2001 From: knolax <1339802534.kk@gmail.com> Date: Thu, 28 Dec 2017 22:57:17 -0500 Subject: fixed systemd unit file and added a daemon reload to the install target. --- Makefile | 1 + skey.service | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5daf5b4..d450668 100644 --- a/Makefile +++ b/Makefile @@ -9,5 +9,6 @@ install: depmod cp skey.dtbo /boot/overlays/skey.dtbo cp skey.service /etc/systemd/system/skey.service + systemctl daemon-reload clean: make -C /lib/modules/$(shell uname -r)/build M=$(PWD) clean diff --git a/skey.service b/skey.service index 16ded57..3d10b68 100644 --- a/skey.service +++ b/skey.service @@ -2,6 +2,6 @@ Description="Sets up and loads the drivers for the Omnicom Switch Keyboard" Type=oneshot [Service] -ExecStart=gpio -g mode 3 out;gpio -g mode 6 out;gpio -g mode 5 out;gpio -g mode 10 low;gpio -g mode 24 low;gpio -g mode 23 low;gpio -g mode 22 low;gpio -g mode 27 low;gpio -g mode 18 low;gpio -g mode 17 low;gpio -g mode 15 low;gpio -g mode 14 low;gpio -g mode 4 low;modprobe skey +ExecStart=/bin/bash -c "gpio -g mode 3 out;gpio -g mode 6 out;gpio -g mode 5 out;gpio -g mode 10 down;gpio -g mode 24 down;gpio -g mode 23 down;gpio -g mode 22 down;gpio -g mode 27 down;gpio -g mode 18 down;gpio -g mode 17 down;gpio -g mode 15 down;gpio -g mode 14 down;gpio -g mode 4 down;modprobe skey" [Install] WantedBy=multi-user.target graphical.target emergency.target -- cgit v1.1 From bdd082989e88809a0a049a270fae70d0ea8b6711 Mon Sep 17 00:00:00 2001 From: knolax <1339802534.kk@gmail.com> Date: Fri, 29 Dec 2017 16:32:13 -0500 Subject: forgot to change update PHYS_STATE for every call of processkey, not jsut when there is a risng or falling edge. --- skey.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/skey.c b/skey.c index bc94680..c7cc4f8 100644 --- a/skey.c +++ b/skey.c @@ -170,14 +170,7 @@ int processkey(int row, int column, int state) { } //falling edge - if ((KEYSTATE_PHYS & keystate[row][column]) && !state) { - //after the previous keystate is checked, it is updated - if (state) { - keystate[row][column] = KEYSTATE_PHYS | keystate[row][column]; - } else { - keystate[row][column] = (~KEYSTATE_PHYS) & keystate[row][column]; - } - + if ((KEYSTATE_PHYS & keystate[row][column]) && !state) { if (!stickymode) { //reports key up input_report_key(skey_dev, skey_keymap[current_keymap][row][column], 0); @@ -186,12 +179,6 @@ int processkey(int row, int column, int state) { } //rising edge }else if (!(KEYSTATE_PHYS & keystate[row][column]) && state) { - //after the previous keystate is checked, it is updated - if (state) { - keystate[row][column] = KEYSTATE_PHYS | keystate[row][column]; - } else { - keystate[row][column] = (~KEYSTATE_PHYS) & keystate[row][column]; - } /* *handles keys that have special behavior, and to which stickykey do not apply * if sticky keys don't apply then only the falling edge applies @@ -276,6 +263,12 @@ int processkey(int row, int column, int state) { input_sync(skey_dev); } } + //after the previous keystate is checked, it is updated + if (state) { + keystate[row][column] = KEYSTATE_PHYS | keystate[row][column]; + } else { + keystate[row][column] = (~KEYSTATE_PHYS) & keystate[row][column]; + } return 0; } -- cgit v1.1