Skip to content

Commit b3bde9a

Browse files
committed
use fkgpiod in Recovery too
Signed-off-by: Michel-FK <[email protected]>
1 parent 0e4fd2b commit b3bde9a

File tree

9 files changed

+95
-138
lines changed

9 files changed

+95
-138
lines changed

Recovery/Config.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
source "$BR2_EXTERNAL_RECOVERY_PATH/package/FunKey-GPIO-Mapping/Config.in"
1+
source "$BR2_EXTERNAL_RECOVERY_PATH/package/fkgpiod/Config.in"
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
CLEAR
2+
MAP FN TO KEY KEY_K
3+
MAP START TO KEY KEY_S
4+
MAP UP TO KEY KEY_U
5+
MAP LEFT TO KEY KEY_L
6+
MAP FN+LEFT TO KEY KEY_J
7+
MAP DOWN TO KEY KEY_D
8+
MAP FN+DOWN TO KEY KEY_H
9+
MAP RIGHT TO KEY KEY_R
10+
MAP FN+RIGHT TO KEY KEY_I
11+
MAP R TO KEY KEY_N
12+
MAP L TO KEY KEY_M
13+
MAP A TO KEY KEY_A
14+
MAP B TO KEY KEY_B
15+
MAP X TO KEY KEY_X
16+
MAP Y TO KEY KEY_Y
17+
MAP MENU TO KEY KEY_Q
18+
MAP FN+UP TO COMMAND snap
19+
MAP FN+A TO COMMAND quick_action_volume_up
20+
MAP FN+Y TO COMMAND quick_action_volume_down
21+
MAP FN+X TO COMMAND quick_action_bright_up
22+
MAP FN+B TO COMMAND quick_action_bright_down
23+
MAP FN+L TO KEY KEY_V
24+
MAP FN+R TO KEY KEY_O
25+
MAP FN+L+R TO COMMAND display_notif_system_stats

Recovery/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf

Lines changed: 0 additions & 67 deletions
This file was deleted.

Recovery/package/FunKey-GPIO-Mapping/Config.in

Lines changed: 0 additions & 5 deletions
This file was deleted.

Recovery/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk

Lines changed: 0 additions & 29 deletions
This file was deleted.

Recovery/package/FunKey-GPIO-Mapping/etc/init.d/S11funkey-gpio-management

Lines changed: 0 additions & 36 deletions
This file was deleted.

Recovery/package/fkgpiod/Config.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
config BR2_PACKAGE_FKGPIOD
2+
bool "FunKey S GPIO daemon"
3+
default y
4+
help
5+
The FunKey GPIO mapping utility.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/bin/sh
2+
#
3+
# Start/stop FunKey GPIO daemon
4+
#
5+
6+
DAEMON=/usr/local/sbin/fkgpiod
7+
8+
case "$1" in
9+
start)
10+
echo -n "Starting FunKey GPIO daemon: "
11+
${DAEMON} -d /etc/fkgpiod.conf > /dev/null 2>&1
12+
if [ ${?} -eq 0 ]; then
13+
echo "OK"
14+
else
15+
echo "ERROR"
16+
fi
17+
;;
18+
stop)
19+
echo -n "Stopping FunKey GPIO daemon: "
20+
${DAEMON} -k > /dev/null 2>&1
21+
if [ ${?} -eq 0 ]; then
22+
echo "OK"
23+
else
24+
echo "ERROR"
25+
fi
26+
;;
27+
restart)
28+
${0} stop
29+
sleep 1 # Prevent race condition: ensure FunKey GPIO daemon stops before start.
30+
${0} start
31+
;;
32+
*)
33+
echo "Usage: ${0} {start|stop|restart}"
34+
exit 1
35+
esac
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
################################################################################
2+
#
3+
# fkgpiod
4+
#
5+
################################################################################
6+
7+
FKGPIOD_VERSION = 16b7a7b
8+
FKGPIOD_SITE_METHOD = git
9+
FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git
10+
FKGPIOD_SITE_LICENSE = GPL-2.1+
11+
FKGPIOD_SITE_LICENSE_FILES = COPYING
12+
13+
define FKGPIOD_BUILD_CMDS
14+
$(TARGET_MAKE_ENV) CROSS_COMPILE=$(TARGET_CROSS) \
15+
CC="$(TARGET_CC)" \
16+
$(MAKE) -C $(@D) \
17+
CFLAGS="$(TARGET_CFLAGS)" $(FKGPIOD_BUILD_TARGET)
18+
endef
19+
20+
define FKGPIOD_INSTALL_TARGET_CMDS
21+
$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/sbin
22+
$(INSTALL) -m 0755 $(@D)/fkgpiod $(TARGET_DIR)/usr/local/sbin/fkgpiod
23+
$(INSTALL) -m 0755 $(@D)/termfix $(TARGET_DIR)/usr/local/sbin/termfix
24+
$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc
25+
$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/init.d
26+
$(INSTALL) -m 0755 $(FKGPIOD_PKGDIR)etc/init.d/S11gpio $(TARGET_DIR)/etc/init.d/S11gpio
27+
endef
28+
29+
$(eval $(generic-package))

0 commit comments

Comments
 (0)