From 78c6514bf5467fd946fe98a16da1aed5e0e4f829 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 5 Apr 2021 10:13:30 +0200 Subject: [PATCH 01/18] latest gpio manager version with PCAL9539A compatibility --- FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk b/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk index 4e85222..c8880ab 100644 --- a/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk +++ b/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FUNKEY_GPIO_MAPPING_VERSION = FunKey-GPIO-Mapping-FunKey-1.1.0 +FUNKEY_GPIO_MAPPING_VERSION = FunKey-GPIO-Mapping-FunKey-1.1.1 FUNKEY_GPIO_MAPPING_SITE_METHOD = git FUNKEY_GPIO_MAPPING_SITE = https://github.com/FunKey-Project/FunKey-GPIO-Mapping.git FUNKEY_GPIO_MAPPING_SITE_LICENSE = GPL-2.1+ From e079747a5c5a578d65ed0f5d454bb2279facf56a Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 5 Apr 2021 10:26:25 +0200 Subject: [PATCH 02/18] First boot creates "Native games" and "Applications" and copy correctly emulators because they are also missing --- .../funkey/rootfs-overlay/usr/local/sbin/first_boot | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot index 03b022a..b121a54 100755 --- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot +++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot @@ -201,11 +201,16 @@ copy_files_to_usb_partition () { if [ $? -ne 0 ]; then mount /mnt/ || die_notif 16 "Cannot mount /mnt" fi + + # Copy freware games unzip -q -o /usr/local/share/mnt_freware_games.zip -d /mnt/ - mkdir -p /mnt/Emulators + + # Copy OPKs set +f - cp -f /usr/games/opk/*.opk /mnt/Emulators/ + cp -r /usr/local/share/OPKs/* /mnt set -f + + # Unmount USB partition umount /mnt/ || die_notif 17 "Cannot unmount /mnt" return 0 } From bae44ebf2776918d59c4a0a951a224aa7b0f54e3 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 5 Apr 2021 10:33:33 +0200 Subject: [PATCH 03/18] fixed typo for pce_mednaefn_funkey-s.opk --- FunKey/board/funkey/update_partition | 3 +++ FunKey/package/mednafen/mednafen.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/FunKey/board/funkey/update_partition b/FunKey/board/funkey/update_partition index 2e994f5..1a86c34 100755 --- a/FunKey/board/funkey/update_partition +++ b/FunKey/board/funkey/update_partition @@ -52,6 +52,9 @@ do_postinst() mkdir -p "$shared_partition" cp -r ${root_mount}/usr/local/share/OPKs/* "$shared_partition" + # Fix PCE opk name if necessary + mv "$shared_partition"/Emulators/pce_mednaefn_funkey-s.opk "$shared_partition"/Emulators/pce_mednafen_funkey-s.opk 1>/dev/null 2>&1 + # Unmount Rootfs umount ${root_mount} if [ $? -ne 0 ]; then diff --git a/FunKey/package/mednafen/mednafen.mk b/FunKey/package/mednafen/mednafen.mk index f9b51d2..3f11a43 100644 --- a/FunKey/package/mednafen/mednafen.mk +++ b/FunKey/package/mednafen/mednafen.mk @@ -34,7 +34,7 @@ define MEDNAFEN_CREATE_OPK $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/gamegear $(TARGET_DIR)/usr/local/share/OPKs/Emulators/gamegear_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/lynx $(TARGET_DIR)/usr/local/share/OPKs/Emulators/lynx_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/ngp $(TARGET_DIR)/usr/local/share/OPKs/Emulators/ngp_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs - $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/pce $(TARGET_DIR)/usr/local/share/OPKs/Emulators/pce_mednaefn_funkey-s.opk -all-root -noappend -no-exports -no-xattrs + $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/pce $(TARGET_DIR)/usr/local/share/OPKs/Emulators/pce_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs $(HOST_DIR)/usr/bin/mksquashfs $(MEDNAFEN_PKGDIR)/opk/wonderswan $(TARGET_DIR)/usr/local/share/OPKs/Emulators/wonderswan_mednafen_funkey-s.opk -all-root -noappend -no-exports -no-xattrs endef MEDNAFEN_POST_INSTALL_TARGET_HOOKS += MEDNAFEN_CREATE_OPK From ca46745bc9f1c5dde06706307195c7096433c994 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 5 Apr 2021 10:38:49 +0200 Subject: [PATCH 04/18] added libvorbis to rootfs --- FunKey/configs/funkey_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig index 6bf6d83..db97f3b 100644 --- a/FunKey/configs/funkey_defconfig +++ b/FunKey/configs/funkey_defconfig @@ -77,6 +77,7 @@ BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y BR2_PACKAGE_LUA=y BR2_PACKAGE_LIBSAMPLERATE=y BR2_PACKAGE_LIBSNDFILE=y +BR2_PACKAGE_LIBVORBIS=y BR2_PACKAGE_OPENAL=y BR2_PACKAGE_TINYALSA=y BR2_PACKAGE_TREMOR=y From 65a52717c81aa56dbc0a9f0909f9b99ef0ede4f7 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 5 Apr 2021 10:44:59 +0200 Subject: [PATCH 05/18] added libvorbis to SDK --- SDK/configs/funkey_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/SDK/configs/funkey_defconfig b/SDK/configs/funkey_defconfig index 0cc96e1..f0a5973 100644 --- a/SDK/configs/funkey_defconfig +++ b/SDK/configs/funkey_defconfig @@ -81,3 +81,4 @@ BR2_PACKAGE_LIBXDGMIME=y BR2_PACKAGE_AGG=y BR2_PACKAGE_FLUIDLITE=y BR2_PACKAGE_LIBMIKMOD=y +BR2_PACKAGE_LIBVORBIS=y From f56ac1ccb6258cb69a21b9913215fefd823a5f91 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 5 Apr 2021 11:09:56 +0200 Subject: [PATCH 06/18] Add zip, cue, cso,... extensions support (from DrUm78 script) --- .../usr/games/collections/Game Boy Advance/settings.conf | 2 +- .../rootfs-overlay/usr/games/collections/NES/settings.conf | 2 +- .../usr/games/collections/PCE-TurboGrafx/settings.conf | 2 +- .../rootfs-overlay/usr/games/collections/SNES/settings.conf | 2 +- .../usr/games/collections/Sega Genesis/settings.conf | 2 +- FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop | 2 +- FunKey/package/PocketSNES/opk/snes/snes.funkey-s.desktop | 2 +- FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop | 2 +- FunKey/package/mednafen/opk/pce/pce.funkey-s.desktop | 2 +- .../package/picodrive/opk/megadrive/megadrive.funkey-s.desktop | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Advance/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Advance/settings.conf index 28a20da..aa43c50 100644 --- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Advance/settings.conf +++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Game Boy Advance/settings.conf @@ -1,7 +1,7 @@ # Uncomment and edit the following line to use a different ROM path. list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME% list.includeMissingItems = false -list.extensions = gba,GBA +list.extensions = gba,GBA,zip,ZIP list.menuSort = yes launcher = gba diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf index c579864..56e2d35 100644 --- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf +++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/NES/settings.conf @@ -1,7 +1,7 @@ # Uncomment and edit the following line to use a different ROM path. list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME% list.includeMissingItems = false -list.extensions = nes,NES,fds,FDS +list.extensions = nes,NES,fds,FDS,zip,ZIP list.menuSort = yes launcher = NES diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/PCE-TurboGrafx/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/PCE-TurboGrafx/settings.conf index ff8a64f..ed5d464 100644 --- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/PCE-TurboGrafx/settings.conf +++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/PCE-TurboGrafx/settings.conf @@ -1,7 +1,7 @@ # Uncomment and edit the following line to use a different ROM path. list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME% list.includeMissingItems = false -list.extensions = zip,ZIP,pce,PCE,sgx,SGX +list.extensions = zip,ZIP,pce,PCE,sgx,SGX,cue,CUE list.menuSort = yes launcher = pce diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/SNES/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/SNES/settings.conf index 14e5583..ce26fda 100644 --- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/SNES/settings.conf +++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/SNES/settings.conf @@ -1,7 +1,7 @@ # Uncomment and edit the following line to use a different ROM path. list.path = %BASE_ITEM_PATH%/%ITEM_COLLECTION_NAME% list.includeMissingItems = false -list.extensions = sfc,SFC,smc,SMC +list.extensions = sfc,SFC,smc,SMC,zip,ZIP list.menuSort = yes launcher = snes diff --git a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/settings.conf b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/settings.conf index 9c738b5..ac7781a 100644 --- a/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/settings.conf +++ b/FunKey/board/funkey/rootfs-overlay/usr/games/collections/Sega Genesis/settings.conf @@ -19,7 +19,7 @@ list.includeMissingItems = true ############################################################################### # Extensions are comma separated without spaces ############################################################################### -list.extensions = zip,ZIP,md,MD,bin,BIN,smd,SMD +list.extensions = zip,ZIP,md,MD,bin,BIN,32x,32X,cue,CUE,cso,CSO,chd,CHD,smd,SMD ############################################################################### # If a menu.xml file exists, it will display the menu alphabetically. To diff --git a/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop b/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop index a1ade47..6a4db09 100644 --- a/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop +++ b/FunKey/package/FCEUX/opk/nes/nes.funkey-s.desktop @@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true Categories=emulators; selectorbrowser=true SelectorDir=/mnt/NES -SelectorFilter=nes,NES,fds,FDS +SelectorFilter=nes,NES,fds,FDS,zip,ZIP diff --git a/FunKey/package/PocketSNES/opk/snes/snes.funkey-s.desktop b/FunKey/package/PocketSNES/opk/snes/snes.funkey-s.desktop index f7668dd..58a54dc 100644 --- a/FunKey/package/PocketSNES/opk/snes/snes.funkey-s.desktop +++ b/FunKey/package/PocketSNES/opk/snes/snes.funkey-s.desktop @@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true Categories=emulators; selectorbrowser=true SelectorDir=/mnt/SNES -SelectorFilter=sfc,SFC,smc,SMC +SelectorFilter=sfc,SFC,smc,SMC,zip,ZIP diff --git a/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop b/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop index 7947d11..cce7b4e 100644 --- a/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop +++ b/FunKey/package/gpsp/opk/gba/gba.funkey-s.desktop @@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true Categories=emulators; selectorbrowser=true SelectorDir=/mnt/Game Boy Advance -SelectorFilter=gba,GBA +SelectorFilter=gba,GBA,zip,ZIP diff --git a/FunKey/package/mednafen/opk/pce/pce.funkey-s.desktop b/FunKey/package/mednafen/opk/pce/pce.funkey-s.desktop index 355dcd9..82b8240 100644 --- a/FunKey/package/mednafen/opk/pce/pce.funkey-s.desktop +++ b/FunKey/package/mednafen/opk/pce/pce.funkey-s.desktop @@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true Categories=emulators; selectorbrowser=true SelectorDir=/mnt/PCE-TurboGrafx -SelectorFilter=zip,ZIP,pce,PCE,sgx,SGX +SelectorFilter=zip,ZIP,pce,PCE,sgx,SGX,cue,CUE diff --git a/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop b/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop index c820074..82232b9 100644 --- a/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop +++ b/FunKey/package/picodrive/opk/megadrive/megadrive.funkey-s.desktop @@ -9,4 +9,4 @@ X-OD-NeedsDownscaling=true Categories=emulators; selectorbrowser=true SelectorDir=/mnt/Sega Genesis -SelectorFilter=zip,ZIP,md,MD,bin,BIN,smd,SMD +SelectorFilter=zip,ZIP,md,MD,bin,BIN,32x,32X,cue,CUE,cso,CSO,chd,CHD,smd,SMD From 462e886c71e9cbb52809c66300a123a0612ad2d3 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 5 Apr 2021 16:54:10 +0200 Subject: [PATCH 07/18] new fkgpiod package instead of previous gpiomanager --- FunKey/Config.in | 2 +- .../funkey/rootfs-overlay/etc/fkgpiod.conf | 25 ++++++++ .../etc/funkey_gpio_mapping.conf | 62 ------------------- FunKey/package/FunKey-GPIO-Mapping/Config.in | 5 -- .../FunKey-GPIO-Mapping.mk | 29 --------- .../etc/init.d/S11funkey-gpio-management | 36 ----------- FunKey/package/fkgpiod/Config.in | 5 ++ FunKey/package/fkgpiod/etc/init.d/S11gpio | 35 +++++++++++ FunKey/package/fkgpiod/fkgpiod.mk | 29 +++++++++ FunKey/package/libopk/libopk.mk | 3 +- 10 files changed, 97 insertions(+), 134 deletions(-) create mode 100644 FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf delete mode 100644 FunKey/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf delete mode 100644 FunKey/package/FunKey-GPIO-Mapping/Config.in delete mode 100644 FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk delete mode 100755 FunKey/package/FunKey-GPIO-Mapping/etc/init.d/S11funkey-gpio-management create mode 100644 FunKey/package/fkgpiod/Config.in create mode 100644 FunKey/package/fkgpiod/etc/init.d/S11gpio create mode 100644 FunKey/package/fkgpiod/fkgpiod.mk diff --git a/FunKey/Config.in b/FunKey/Config.in index 7ff1400..49f20d4 100644 --- a/FunKey/Config.in +++ b/FunKey/Config.in @@ -1,5 +1,5 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/mednafen/Config.in" -source "$BR2_EXTERNAL_FUNKEY_PATH/package/FunKey-GPIO-Mapping/Config.in" +source "$BR2_EXTERNAL_FUNKEY_PATH/package/fkgpiod/Config.in" source "$BR2_EXTERNAL_FUNKEY_PATH/package/retrofe/Config.in" source "$BR2_EXTERNAL_FUNKEY_PATH/package/PCSX-ReARMed/Config.in" source "$BR2_EXTERNAL_FUNKEY_PATH/package/FCEUX/Config.in" diff --git a/FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf b/FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf new file mode 100644 index 0000000..cfcb70a --- /dev/null +++ b/FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf @@ -0,0 +1,25 @@ +RESET +MAP FN TO KEY KEY_K +MAP START TO KEY KEY_S +MAP UP TO KEY KEY_U +MAP LEFT TO KEY KEY_L +MAP FN+LEFT TO KEY KEY_J +MAP DOWN TO KEY KEY_D +MAP FN+DOWN TO KEY KEY_H +MAP RIGHT TO KEY KEY_R +MAP FN+RIGHT TO KEY KEY_I +MAP R TO KEY KEY_N +MAP L TO KEY KEY_M +MAP A TO KEY KEY_A +MAP B TO KEY KEY_B +MAP X TO KEY KEY_X +MAP Y TO KEY KEY_Y +MAP MENU TO KEY KEY_Q +MAP FN+UP TO COMMAND snap +MAP FN+A TO COMMAND quick_action_volume_up +MAP FN+Y TO COMMAND quick_action_volume_down +MAP FN+X TO COMMAND quick_action_bright_up +MAP FN+B TO COMMAND quick_action_bright_down +MAP FN+L TO KEY KEY_V +MAP FN+R TO KEY KEY_O +MAP FN+L+R TO COMMAND display_notif_system_stats diff --git a/FunKey/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf b/FunKey/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf deleted file mode 100644 index b3500da..0000000 --- a/FunKey/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf +++ /dev/null @@ -1,62 +0,0 @@ -#################################### -# Funkey GPIO keymap config file # -#################################### -# Format: -# -# - First all GPIO Pin numbers must be declared (integers separated by commas) -# By default, pins are declared active high, to declare them active low, add char '*' -# Example: 0,1,2,3,4,6,7,10*,11,12,13,14,15 -# -# - Then the mapping can be done as follows (one line per mapping): -# Pin_number[+Pin_number...], type_mapping, value, str_help_name_pin, str_help_fct_pin -# -# args: * Pin_number is the pin number concerned by the maping, -# add +Pin_number for multiple touch mapping (not limited in nb of pins) -# * type_mapping can be KEYBOARD or SHELL_COMMAND -# * value is : -# if type_mapping==KEYBOARD: the keycode from /usr/include/linux/input.h] -# if type_mapping==SHELL_COMMAND: the shell command to exec -# * str_help_name_pin is a sweet name for the pin (ex: PB5) -# * str_help_fct_pin is an help str to indicate the function of this mapping - - - -######################## -# Pins declaration # -######################## -0,1,2,3,4,6,7,10*,11,12,13,14,15 - - -############### -# Mapping # -############### -#7, KEYBOARD, KEY_F, KEY_F, Fn -#7+6, KEYBOARD, KEY_K, KEY_K, Select -7, KEYBOARD, KEY_K, KEY_K, Select -6, KEYBOARD, KEY_S, KEY_S, Start -3, KEYBOARD, KEY_U, KEY_U, Up -4, KEYBOARD, KEY_L, KEY_L, Left -7+4, KEYBOARD, KEY_J, KEY_J, Aspect ratio factor -- -1, KEYBOARD, KEY_D, KEY_D, Down -7+1, KEYBOARD, KEY_H, KEY_H, Aspect ratio mode change -0, KEYBOARD, KEY_R, KEY_R, Right -7+0, KEYBOARD, KEY_I, KEY_I, Aspect ratio factor ++ -15, KEYBOARD, KEY_N, KEY_N, R1 -7+15, KEYBOARD, KEY_O, KEY_O, R2 -2, KEYBOARD, KEY_M, KEY_M, L1 -7+2, KEYBOARD, KEY_V, KEY_V, L2 -12, KEYBOARD, KEY_A, KEY_A, A -14, KEYBOARD, KEY_B, KEY_B, B -13, KEYBOARD, KEY_Y, KEY_Y, Y -11, KEYBOARD, KEY_X, KEY_X, X - -7+3, SHELL_COMMAND, snap, Fn+Start, Snapshot -7+12, SHELL_COMMAND, quick_action_volume_up, Fn+Y, Volume++ -7+13, SHELL_COMMAND, quick_action_volume_down, Fn+A, Volume-- -7+11, SHELL_COMMAND, quick_action_bright_up, Fn+B, Brightness++ -7+14, SHELL_COMMAND, quick_action_bright_down, Fn+X, Brightness-- -10, SHELL_COMMAND, sched_shutdown 0.1, N_OE, Instant Play save and Poweroff because of N_OE -7+15+2, SHELL_COMMAND, display_notif_system_stats, Fn+L1+L2, display system cpu and ram usage - - - diff --git a/FunKey/package/FunKey-GPIO-Mapping/Config.in b/FunKey/package/FunKey-GPIO-Mapping/Config.in deleted file mode 100644 index 455a4b8..0000000 --- a/FunKey/package/FunKey-GPIO-Mapping/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_FUNKEY_GPIO_MAPPING - bool "FunKey GPIO Mapping" - default y - help - The FunKey GPIO mapping utility. diff --git a/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk b/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk deleted file mode 100644 index c8880ab..0000000 --- a/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# FunKey-GPIO-mapping -# -################################################################################ - -FUNKEY_GPIO_MAPPING_VERSION = FunKey-GPIO-Mapping-FunKey-1.1.1 -FUNKEY_GPIO_MAPPING_SITE_METHOD = git -FUNKEY_GPIO_MAPPING_SITE = https://github.com/FunKey-Project/FunKey-GPIO-Mapping.git -FUNKEY_GPIO_MAPPING_SITE_LICENSE = GPL-2.1+ -FUNKEY_GPIO_MAPPING_SITE_LICENSE_FILES = COPYING - -define FUNKEY_GPIO_MAPPING_BUILD_CMDS - $(TARGET_MAKE_ENV) CROSS_COMPILE=$(TARGET_CROSS) \ - CC="$(TARGET_CC)" \ - $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS)" $(FUNKEY_GPIO_MAPPING_BUILD_TARGET) -endef - -define FUNKEY_GPIO_MAPPING_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/sbin - $(INSTALL) -m 0755 $(@D)/funkey_gpio_management $(TARGET_DIR)/usr/local/sbin/funkey_gpio_management - $(INSTALL) -m 0755 $(@D)/termfix $(TARGET_DIR)/usr/local/sbin/termfix - $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc - $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 0755 $(FUNKEY_GPIO_MAPPING_PKGDIR)etc/init.d/S11funkey-gpio-management $(TARGET_DIR)/etc/init.d/S11funkey-gpio-management -endef - -$(eval $(generic-package)) diff --git a/FunKey/package/FunKey-GPIO-Mapping/etc/init.d/S11funkey-gpio-management b/FunKey/package/FunKey-GPIO-Mapping/etc/init.d/S11funkey-gpio-management deleted file mode 100755 index 1e2ee08..0000000 --- a/FunKey/package/FunKey-GPIO-Mapping/etc/init.d/S11funkey-gpio-management +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Start/stop funkey_gpio_management -# - -DAEMON=/usr/local/sbin/funkey_gpio_management -PIDFILE=/var/run/funkey_gpio_management.pid - -case "$1" in - start) - echo -n "Starting funkey_gpio_management: " - start-stop-daemon -S -x ${DAEMON} -p ${PIDFILE} -m -b -- > /dev/null 2>&1 - if [ ${?} -eq 0 ]; then - echo "OK" - else - echo "ERROR" - fi - ;; - stop) - echo -n "Stopping funkey_gpio_management: " - start-stop-daemon -K -x ${DAEMON} -p ${PIDFILE} -o > /dev/null 2>&1 - if [ ${?} -eq 0 ]; then - echo "OK" - else - echo "ERROR" - fi - ;; - restart) - ${0} stop - sleep 1 # Prevent race condition: ensure funkey_gpio_management stops before start. - ${0} start - ;; - *) - echo "Usage: ${0} {start|stop|restart}" - exit 1 -esac diff --git a/FunKey/package/fkgpiod/Config.in b/FunKey/package/fkgpiod/Config.in new file mode 100644 index 0000000..4cdfe39 --- /dev/null +++ b/FunKey/package/fkgpiod/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_FKGPIOD + bool "FunKey S GPIO daemon" + default y + help + The FunKey GPIO mapping utility. diff --git a/FunKey/package/fkgpiod/etc/init.d/S11gpio b/FunKey/package/fkgpiod/etc/init.d/S11gpio new file mode 100644 index 0000000..59bbcda --- /dev/null +++ b/FunKey/package/fkgpiod/etc/init.d/S11gpio @@ -0,0 +1,35 @@ +#!/bin/sh +# +# Start/stop FunKey GPIO daemon +# + +DAEMON=/usr/local/sbin/fkgpiod + +case "$1" in + start) + echo -n "Starting FunKey GPIO daemon: " + ${DAEMON} -d /etc/fkgpiod.conf > /dev/null 2>&1 + if [ ${?} -eq 0 ]; then + echo "OK" + else + echo "ERROR" + fi + ;; + stop) + echo -n "Stopping FunKey GPIO daemon: " + ${DAEMON} -k > /dev/null 2>&1 + if [ ${?} -eq 0 ]; then + echo "OK" + else + echo "ERROR" + fi + ;; + restart) + ${0} stop + sleep 1 # Prevent race condition: ensure FunKey GPIO daemon stops before start. + ${0} start + ;; + *) + echo "Usage: ${0} {start|stop|restart}" + exit 1 +esac diff --git a/FunKey/package/fkgpiod/fkgpiod.mk b/FunKey/package/fkgpiod/fkgpiod.mk new file mode 100644 index 0000000..a36bd04 --- /dev/null +++ b/FunKey/package/fkgpiod/fkgpiod.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# fkgpiod +# +################################################################################ + +FKGPIOD_VERSION = de28915 +FKGPIOD_SITE_METHOD = git +FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git +FKGPIOD_SITE_LICENSE = GPL-2.1+ +FKGPIOD_SITE_LICENSE_FILES = COPYING + +define FKGPIOD_BUILD_CMDS + $(TARGET_MAKE_ENV) CROSS_COMPILE=$(TARGET_CROSS) \ + CC="$(TARGET_CC)" \ + $(MAKE) -C $(@D) \ + CFLAGS="$(TARGET_CFLAGS)" $(FKGPIOD_BUILD_TARGET) +endef + +define FKGPIOD_INSTALL_TARGET_CMDS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/sbin + $(INSTALL) -m 0755 $(@D)/fkgpiod $(TARGET_DIR)/usr/local/sbin/fkgpiod + $(INSTALL) -m 0755 $(@D)/termfix $(TARGET_DIR)/usr/local/sbin/termfix + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/init.d + $(INSTALL) -m 0755 $(FKGPIOD_PKGDIR)etc/init.d/S11gpio $(TARGET_DIR)/etc/init.d/S11gpio +endef + +$(eval $(generic-package)) diff --git a/FunKey/package/libopk/libopk.mk b/FunKey/package/libopk/libopk.mk index e96cafe..7d93881 100644 --- a/FunKey/package/libopk/libopk.mk +++ b/FunKey/package/libopk/libopk.mk @@ -3,7 +3,8 @@ # libopk # ############################################################# -LIBOPK_VERSION = libopk-FunKey-1.0.1 +#LIBOPK_VERSION = libopk-FunKey-1.0.1 +LIBOPK_VERSION = 43e8380 LIBOPK_SITE_METHOD = git LIBOPK_SITE = https://github.com/FunKey-Project/libopk.git From 613b32137c21853cf6c76d128f4389e0dfe92f8b Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Mon, 5 Apr 2021 17:35:53 +0200 Subject: [PATCH 08/18] segfault correction in fkgpiod --- FunKey/package/fkgpiod/fkgpiod.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/fkgpiod/fkgpiod.mk b/FunKey/package/fkgpiod/fkgpiod.mk index a36bd04..a79885a 100644 --- a/FunKey/package/fkgpiod/fkgpiod.mk +++ b/FunKey/package/fkgpiod/fkgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -FKGPIOD_VERSION = de28915 +FKGPIOD_VERSION = b482c72 FKGPIOD_SITE_METHOD = git FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git FKGPIOD_SITE_LICENSE = GPL-2.1+ From 32d005f84ec360b27373a39cee31251a295af7a3 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Tue, 6 Apr 2021 08:40:06 +0200 Subject: [PATCH 09/18] Alsa sound downmixed to mono --- .../board/funkey/rootfs-overlay/etc/asound.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 FunKey/board/funkey/rootfs-overlay/etc/asound.conf diff --git a/FunKey/board/funkey/rootfs-overlay/etc/asound.conf b/FunKey/board/funkey/rootfs-overlay/etc/asound.conf new file mode 100644 index 0000000..1ddbac2 --- /dev/null +++ b/FunKey/board/funkey/rootfs-overlay/etc/asound.conf @@ -0,0 +1,15 @@ +pcm.monocard{ + slave.pcm "hw:0" + slave.channels 2 + type route + ttable { + # Copy both input channels to output channel 1 (Right). + 0.1 1 + 1.1 1 + # Send nothing to output channel 0 (Left). + 0.0 0 + 1.0 0 + } +} + +pcm.!default monocard From d7563346b036585dbcf7078687c19cf5c69c2234 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sat, 10 Apr 2021 10:46:29 +0200 Subject: [PATCH 10/18] bump commander bersion Signed-off-by: Michel-FK --- FunKey/package/commander/commander.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk index 2f9a634..fcd005f 100644 --- a/FunKey/package/commander/commander.mk +++ b/FunKey/package/commander/commander.mk @@ -3,7 +3,7 @@ # commander # ############################################################# -COMMANDER_VERSION = commander-FunKey-1.0.1 +COMMANDER_VERSION = 936c912 COMMANDER_SITE_METHOD = git COMMANDER_SITE = https://github.com/FunKey-Project/commander.git COMMANDER_LICENSE = GPL-2.0 From 2ee0987dd35346086bb784663a1265777e0e16b4 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sat, 10 Apr 2021 10:47:08 +0200 Subject: [PATCH 11/18] change RESET to CLEAR in fkgpiod.conf Signed-off-by: Michel-FK --- FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf b/FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf index cfcb70a..49ef00e 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf +++ b/FunKey/board/funkey/rootfs-overlay/etc/fkgpiod.conf @@ -1,4 +1,4 @@ -RESET +CLEAR MAP FN TO KEY KEY_K MAP START TO KEY KEY_S MAP UP TO KEY KEY_U From 4fff8cdb5b43fd9451881b5a0863c406e5322c4f Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sat, 10 Apr 2021 10:47:59 +0200 Subject: [PATCH 12/18] bump toolchain version Signed-off-by: Michel-FK --- FunKey/board/funkey/busybox.config | 2 +- FunKey/configs/funkey_defconfig | 2 +- Recovery/board/funkey/busybox.config | 2 +- Recovery/configs/recovery_defconfig | 2 +- SDK/configs/funkey_defconfig | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FunKey/board/funkey/busybox.config b/FunKey/board/funkey/busybox.config index 70b5598..cfdfde5 100644 --- a/FunKey/board/funkey/busybox.config +++ b/FunKey/board/funkey/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.32.0 -# Fri Jan 15 10:58:20 2021 +# Tue Apr 6 08:18:28 2021 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig index db97f3b..d4a5802 100644 --- a/FunKey/configs/funkey_defconfig +++ b/FunKey/configs/funkey_defconfig @@ -9,7 +9,7 @@ BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/FunKey-Project/FunKey-OS/releases/download/FunKey-OS-2.0.0/FunKey-sdk-2.0.0.tar.gz" +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/FunKey-Project/FunKey-OS/releases/download/FunKey-OS-2.1.0/FunKey-sdk-2.1.0.tar.gz" BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/Recovery/board/funkey/busybox.config b/Recovery/board/funkey/busybox.config index bc03308..01f0788 100644 --- a/Recovery/board/funkey/busybox.config +++ b/Recovery/board/funkey/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.32.0 -# Fri Jan 15 10:35:44 2021 +# Tue Apr 6 07:55:56 2021 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/Recovery/configs/recovery_defconfig b/Recovery/configs/recovery_defconfig index 711c0f0..ef2b278 100644 --- a/Recovery/configs/recovery_defconfig +++ b/Recovery/configs/recovery_defconfig @@ -9,7 +9,7 @@ BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_RECOVERY_PATH)/board/funkey/patches" BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/FunKey-Project/FunKey-OS/releases/download/FunKey-OS-2.0.0/FunKey-sdk-2.0.0.tar.gz" +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/FunKey-Project/FunKey-OS/releases/download/FunKey-OS-2.1.0/FunKey-sdk-2.1.0.tar.gz" BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/SDK/configs/funkey_defconfig b/SDK/configs/funkey_defconfig index f0a5973..b02dab8 100644 --- a/SDK/configs/funkey_defconfig +++ b/SDK/configs/funkey_defconfig @@ -45,6 +45,7 @@ BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y BR2_PACKAGE_LUA=y BR2_PACKAGE_LIBSAMPLERATE=y BR2_PACKAGE_LIBSNDFILE=y +BR2_PACKAGE_LIBVORBIS=y BR2_PACKAGE_OPENAL=y BR2_PACKAGE_TINYALSA=y BR2_PACKAGE_TREMOR=y @@ -81,4 +82,3 @@ BR2_PACKAGE_LIBXDGMIME=y BR2_PACKAGE_AGG=y BR2_PACKAGE_FLUIDLITE=y BR2_PACKAGE_LIBMIKMOD=y -BR2_PACKAGE_LIBVORBIS=y From 0e4fd2b01a905bfc1cb75179a9e84d72c535c168 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sat, 10 Apr 2021 11:10:29 +0200 Subject: [PATCH 13/18] bump fkgpiod version Signed-off-by: Michel-FK --- FunKey/package/fkgpiod/fkgpiod.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FunKey/package/fkgpiod/fkgpiod.mk b/FunKey/package/fkgpiod/fkgpiod.mk index a79885a..7a64daa 100644 --- a/FunKey/package/fkgpiod/fkgpiod.mk +++ b/FunKey/package/fkgpiod/fkgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -FKGPIOD_VERSION = b482c72 +FKGPIOD_VERSION = 16b7a7b FKGPIOD_SITE_METHOD = git FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git FKGPIOD_SITE_LICENSE = GPL-2.1+ From b3bde9a4dbdbb08ebf6ca637373a82a51eaee57b Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sat, 10 Apr 2021 11:11:45 +0200 Subject: [PATCH 14/18] use fkgpiod in Recovery too Signed-off-by: Michel-FK --- Recovery/Config.in | 2 +- .../funkey/rootfs-overlay/etc/fkgpiod.conf | 25 +++++++ .../etc/funkey_gpio_mapping.conf | 67 ------------------- .../package/FunKey-GPIO-Mapping/Config.in | 5 -- .../FunKey-GPIO-Mapping.mk | 29 -------- .../etc/init.d/S11funkey-gpio-management | 36 ---------- Recovery/package/fkgpiod/Config.in | 5 ++ Recovery/package/fkgpiod/etc/init.d/S11gpio | 35 ++++++++++ Recovery/package/fkgpiod/fkgpiod.mk | 29 ++++++++ 9 files changed, 95 insertions(+), 138 deletions(-) create mode 100644 Recovery/board/funkey/rootfs-overlay/etc/fkgpiod.conf delete mode 100644 Recovery/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf delete mode 100644 Recovery/package/FunKey-GPIO-Mapping/Config.in delete mode 100644 Recovery/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk delete mode 100755 Recovery/package/FunKey-GPIO-Mapping/etc/init.d/S11funkey-gpio-management create mode 100644 Recovery/package/fkgpiod/Config.in create mode 100644 Recovery/package/fkgpiod/etc/init.d/S11gpio create mode 100644 Recovery/package/fkgpiod/fkgpiod.mk diff --git a/Recovery/Config.in b/Recovery/Config.in index a30956c..8e351a7 100644 --- a/Recovery/Config.in +++ b/Recovery/Config.in @@ -1 +1 @@ -source "$BR2_EXTERNAL_RECOVERY_PATH/package/FunKey-GPIO-Mapping/Config.in" +source "$BR2_EXTERNAL_RECOVERY_PATH/package/fkgpiod/Config.in" diff --git a/Recovery/board/funkey/rootfs-overlay/etc/fkgpiod.conf b/Recovery/board/funkey/rootfs-overlay/etc/fkgpiod.conf new file mode 100644 index 0000000..49ef00e --- /dev/null +++ b/Recovery/board/funkey/rootfs-overlay/etc/fkgpiod.conf @@ -0,0 +1,25 @@ +CLEAR +MAP FN TO KEY KEY_K +MAP START TO KEY KEY_S +MAP UP TO KEY KEY_U +MAP LEFT TO KEY KEY_L +MAP FN+LEFT TO KEY KEY_J +MAP DOWN TO KEY KEY_D +MAP FN+DOWN TO KEY KEY_H +MAP RIGHT TO KEY KEY_R +MAP FN+RIGHT TO KEY KEY_I +MAP R TO KEY KEY_N +MAP L TO KEY KEY_M +MAP A TO KEY KEY_A +MAP B TO KEY KEY_B +MAP X TO KEY KEY_X +MAP Y TO KEY KEY_Y +MAP MENU TO KEY KEY_Q +MAP FN+UP TO COMMAND snap +MAP FN+A TO COMMAND quick_action_volume_up +MAP FN+Y TO COMMAND quick_action_volume_down +MAP FN+X TO COMMAND quick_action_bright_up +MAP FN+B TO COMMAND quick_action_bright_down +MAP FN+L TO KEY KEY_V +MAP FN+R TO KEY KEY_O +MAP FN+L+R TO COMMAND display_notif_system_stats diff --git a/Recovery/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf b/Recovery/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf deleted file mode 100644 index e5cbd8d..0000000 --- a/Recovery/board/funkey/rootfs-overlay/etc/funkey_gpio_mapping.conf +++ /dev/null @@ -1,67 +0,0 @@ -################################## -# Funkey GPIO keymap config file # -################################## -# Format: -# -# - First all GPIO Pin numbers must be declared (integers separated by commas) -# By default, pins are declared active high, to declare them active low, add char '*' -# Example: 0,1,2,3,4,6,7,10*,11,12,13,14,15 -# -# - Then the mapping can be done as follows (one line per mapping): -# Pin_number[+Pin_number...], type_mapping, value, str_help_name_pin, str_help_fct_pin -# -# args: * Pin_number is the pin number concerned by the maping, -# add +Pin_number for multiple touch mapping (not limited in nb of pins) -# * type_mapping can be KEYBOARD or SHELL_COMMAND -# * value is : -# if type_mapping==KEYBOARD: the keycode from /usr/include/linux/input.h] -# if type_mapping==SHELL_COMMAND: the shell command to exec -# * str_help_name_pin is a sweet name for the pin (ex: PB5) -# * str_help_fct_pin is an help str to indicate the function of this mapping - - - -################################### -# Pins declaration: -0,1,2,3,4,6,7,10*,11,12,13,14,15 - - -################################### -# Mapping: -#7, KEYBOARD, KEY_F, KEY_F, Fn -#7+6, KEYBOARD, KEY_K, KEY_K, Select -7, KEYBOARD, KEY_K, KEY_K, Select -6, KEYBOARD, KEY_S, KEY_S, Start -3, KEYBOARD, KEY_U, KEY_U, Up -7+3, KEYBOARD, KEY_P, KEY_P, Quick Save -4, KEYBOARD, KEY_L, KEY_L, Left -7+4, KEYBOARD, KEY_J, KEY_J, Aspect ratio factor -- -1, KEYBOARD, KEY_D, KEY_D, Down -7+1, KEYBOARD, KEY_H, KEY_H, Aspect ratio mode change -0, KEYBOARD, KEY_R, KEY_R, Right -7+0, KEYBOARD, KEY_I, KEY_I, Aspect ratio factor ++ -15, KEYBOARD, KEY_N, KEY_N, R1 -7+15, KEYBOARD, KEY_O, KEY_O, R2 -2, KEYBOARD, KEY_M, KEY_M, L1 -7+2, KEYBOARD, KEY_V, KEY_V, L2 -12, KEYBOARD, KEY_A, KEY_A, A -14, KEYBOARD, KEY_B, KEY_B, B -13, KEYBOARD, KEY_Y, KEY_Y, Y -11, KEYBOARD, KEY_X, KEY_X, X - -7+6, SHELL_COMMAND, snap, Fn+Start, Snapshot -7+12, SHELL_COMMAND, quick_action_volume_up, Fn+Y, Volume++ -7+13, SHELL_COMMAND, quick_action_volume_down, Fn+A, Volume-- -7+11, SHELL_COMMAND, quick_action_bright_up, Fn+B, Brightness++ -7+14, SHELL_COMMAND, quick_action_bright_down, Fn+X, Brightness-- -10, SHELL_COMMAND, shutdown_funkey, N_OE, Poweroff because of N_OE -7+15+2, SHELL_COMMAND, display_notif_system_stats, Fn+L1+L2, display system cpu and ram usage - -#7+12, KEYBOARD, KEY_G, KEY_G, Brightness++ -#7+14, KEYBOARD, KEY_E, KEY_E, Volume-- -#7+13, KEYBOARD, KEY_W, KEY_W, Brightness-- -#7+11, KEYBOARD, KEY_C, KEY_C, Volume++ -#10, KEYBOARD, KEY_T, KEY_T, Should Poweroff because N_OE_received -#7+15, KEYBOARD, KEY_Q, 7+11, Launch menu - - diff --git a/Recovery/package/FunKey-GPIO-Mapping/Config.in b/Recovery/package/FunKey-GPIO-Mapping/Config.in deleted file mode 100644 index 455a4b8..0000000 --- a/Recovery/package/FunKey-GPIO-Mapping/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_FUNKEY_GPIO_MAPPING - bool "FunKey GPIO Mapping" - default y - help - The FunKey GPIO mapping utility. diff --git a/Recovery/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk b/Recovery/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk deleted file mode 100644 index 36958ed..0000000 --- a/Recovery/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# FunKey-GPIO-mapping -# -################################################################################ - -FUNKEY_GPIO_MAPPING_VERSION = e2b637f -FUNKEY_GPIO_MAPPING_SITE_METHOD = git -FUNKEY_GPIO_MAPPING_SITE = https://github.com/FunKey-Project/FunKey-GPIO-Mapping.git -FUNKEY_GPIO_MAPPING_SITE_LICENSE = GPL-2.1+ -FUNKEY_GPIO_MAPPING_SITE_LICENSE_FILES = COPYING - -define FUNKEY_GPIO_MAPPING_BUILD_CMDS - $(TARGET_MAKE_ENV) CROSS_COMPILE=$(TARGET_CROSS) \ - CC="$(TARGET_CC)" \ - $(MAKE) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS)" $(FUNKEY_GPIO_MAPPING_BUILD_TARGET) -endef - -define FUNKEY_GPIO_MAPPING_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/sbin - $(INSTALL) -m 0755 $(@D)/funkey_gpio_management $(TARGET_DIR)/usr/local/sbin/funkey_gpio_management - $(INSTALL) -m 0755 $(@D)/termfix $(TARGET_DIR)/usr/local/sbin/termfix - $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc - $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 0755 $(FUNKEY_GPIO_MAPPING_PKGDIR)etc/init.d/S11funkey-gpio-management $(TARGET_DIR)/etc/init.d/S11funkey-gpio-management -endef - -$(eval $(generic-package)) diff --git a/Recovery/package/FunKey-GPIO-Mapping/etc/init.d/S11funkey-gpio-management b/Recovery/package/FunKey-GPIO-Mapping/etc/init.d/S11funkey-gpio-management deleted file mode 100755 index 1e2ee08..0000000 --- a/Recovery/package/FunKey-GPIO-Mapping/etc/init.d/S11funkey-gpio-management +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Start/stop funkey_gpio_management -# - -DAEMON=/usr/local/sbin/funkey_gpio_management -PIDFILE=/var/run/funkey_gpio_management.pid - -case "$1" in - start) - echo -n "Starting funkey_gpio_management: " - start-stop-daemon -S -x ${DAEMON} -p ${PIDFILE} -m -b -- > /dev/null 2>&1 - if [ ${?} -eq 0 ]; then - echo "OK" - else - echo "ERROR" - fi - ;; - stop) - echo -n "Stopping funkey_gpio_management: " - start-stop-daemon -K -x ${DAEMON} -p ${PIDFILE} -o > /dev/null 2>&1 - if [ ${?} -eq 0 ]; then - echo "OK" - else - echo "ERROR" - fi - ;; - restart) - ${0} stop - sleep 1 # Prevent race condition: ensure funkey_gpio_management stops before start. - ${0} start - ;; - *) - echo "Usage: ${0} {start|stop|restart}" - exit 1 -esac diff --git a/Recovery/package/fkgpiod/Config.in b/Recovery/package/fkgpiod/Config.in new file mode 100644 index 0000000..4cdfe39 --- /dev/null +++ b/Recovery/package/fkgpiod/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_FKGPIOD + bool "FunKey S GPIO daemon" + default y + help + The FunKey GPIO mapping utility. diff --git a/Recovery/package/fkgpiod/etc/init.d/S11gpio b/Recovery/package/fkgpiod/etc/init.d/S11gpio new file mode 100644 index 0000000..59bbcda --- /dev/null +++ b/Recovery/package/fkgpiod/etc/init.d/S11gpio @@ -0,0 +1,35 @@ +#!/bin/sh +# +# Start/stop FunKey GPIO daemon +# + +DAEMON=/usr/local/sbin/fkgpiod + +case "$1" in + start) + echo -n "Starting FunKey GPIO daemon: " + ${DAEMON} -d /etc/fkgpiod.conf > /dev/null 2>&1 + if [ ${?} -eq 0 ]; then + echo "OK" + else + echo "ERROR" + fi + ;; + stop) + echo -n "Stopping FunKey GPIO daemon: " + ${DAEMON} -k > /dev/null 2>&1 + if [ ${?} -eq 0 ]; then + echo "OK" + else + echo "ERROR" + fi + ;; + restart) + ${0} stop + sleep 1 # Prevent race condition: ensure FunKey GPIO daemon stops before start. + ${0} start + ;; + *) + echo "Usage: ${0} {start|stop|restart}" + exit 1 +esac diff --git a/Recovery/package/fkgpiod/fkgpiod.mk b/Recovery/package/fkgpiod/fkgpiod.mk new file mode 100644 index 0000000..7a64daa --- /dev/null +++ b/Recovery/package/fkgpiod/fkgpiod.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# fkgpiod +# +################################################################################ + +FKGPIOD_VERSION = 16b7a7b +FKGPIOD_SITE_METHOD = git +FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git +FKGPIOD_SITE_LICENSE = GPL-2.1+ +FKGPIOD_SITE_LICENSE_FILES = COPYING + +define FKGPIOD_BUILD_CMDS + $(TARGET_MAKE_ENV) CROSS_COMPILE=$(TARGET_CROSS) \ + CC="$(TARGET_CC)" \ + $(MAKE) -C $(@D) \ + CFLAGS="$(TARGET_CFLAGS)" $(FKGPIOD_BUILD_TARGET) +endef + +define FKGPIOD_INSTALL_TARGET_CMDS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/sbin + $(INSTALL) -m 0755 $(@D)/fkgpiod $(TARGET_DIR)/usr/local/sbin/fkgpiod + $(INSTALL) -m 0755 $(@D)/termfix $(TARGET_DIR)/usr/local/sbin/termfix + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc + $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/init.d + $(INSTALL) -m 0755 $(FKGPIOD_PKGDIR)etc/init.d/S11gpio $(TARGET_DIR)/etc/init.d/S11gpio +endef + +$(eval $(generic-package)) From 04340953922109d648da6677a645eb1e8b29d61e Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sat, 10 Apr 2021 21:57:31 +0200 Subject: [PATCH 15/18] bump to fkgpiod with syslog Signed-off-by: Michel-FK --- FunKey/package/fkgpiod/fkgpiod.mk | 2 +- Recovery/package/fkgpiod/fkgpiod.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FunKey/package/fkgpiod/fkgpiod.mk b/FunKey/package/fkgpiod/fkgpiod.mk index 7a64daa..9ca88f9 100644 --- a/FunKey/package/fkgpiod/fkgpiod.mk +++ b/FunKey/package/fkgpiod/fkgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -FKGPIOD_VERSION = 16b7a7b +FKGPIOD_VERSION = c85fa5c FKGPIOD_SITE_METHOD = git FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git FKGPIOD_SITE_LICENSE = GPL-2.1+ diff --git a/Recovery/package/fkgpiod/fkgpiod.mk b/Recovery/package/fkgpiod/fkgpiod.mk index 7a64daa..9ca88f9 100644 --- a/Recovery/package/fkgpiod/fkgpiod.mk +++ b/Recovery/package/fkgpiod/fkgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -FKGPIOD_VERSION = 16b7a7b +FKGPIOD_VERSION = c85fa5c FKGPIOD_SITE_METHOD = git FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git FKGPIOD_SITE_LICENSE = GPL-2.1+ From d2e65cd6576c473a131e862d29aaf6483420730e Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Sat, 10 Apr 2021 21:59:32 +0200 Subject: [PATCH 16/18] remove funkey_gpio_management from update file Signed-off-by: Michel-FK --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d7536e0..dfcee80 100644 --- a/Makefile +++ b/Makefile @@ -121,13 +121,12 @@ update: fun @mkdir -p tmp @cp FunKey/board/funkey/sw-description tmp/ @cp FunKey/board/funkey/update_partition tmp/ - @cp -a Recovery/output/target/usr/local/sbin/funkey_gpio_management tmp/ @cd FunKey/output/images && \ rm -f rootfs.ext2.gz && \ gzip -k rootfs.ext2 &&\ mv rootfs.ext2.gz ../../../tmp/ @cd tmp && \ - echo sw-description rootfs.ext2.gz update_partition funkey_gpio_management | \ + echo sw-description rootfs.ext2.gz update_partition | \ tr " " "\n" | \ cpio -o -H crc --quiet > ../images/FunKey-rootfs-$(shell cat FunKey/board/funkey/rootfs-overlay/etc/sw-versions | cut -f 2).fwu @rm -rf tmp From 45343de2382e68077858c4fc38c4645a03c9d814 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Mon, 12 Apr 2021 08:17:07 +0200 Subject: [PATCH 17/18] bump fkgpiod version Signed-off-by: Michel-FK --- FunKey/package/fkgpiod/fkgpiod.mk | 2 +- Recovery/package/fkgpiod/fkgpiod.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FunKey/package/fkgpiod/fkgpiod.mk b/FunKey/package/fkgpiod/fkgpiod.mk index 9ca88f9..7fbabd9 100644 --- a/FunKey/package/fkgpiod/fkgpiod.mk +++ b/FunKey/package/fkgpiod/fkgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -FKGPIOD_VERSION = c85fa5c +FKGPIOD_VERSION = 54d1051 FKGPIOD_SITE_METHOD = git FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git FKGPIOD_SITE_LICENSE = GPL-2.1+ diff --git a/Recovery/package/fkgpiod/fkgpiod.mk b/Recovery/package/fkgpiod/fkgpiod.mk index 9ca88f9..7fbabd9 100644 --- a/Recovery/package/fkgpiod/fkgpiod.mk +++ b/Recovery/package/fkgpiod/fkgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -FKGPIOD_VERSION = c85fa5c +FKGPIOD_VERSION = 54d1051 FKGPIOD_SITE_METHOD = git FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git FKGPIOD_SITE_LICENSE = GPL-2.1+ From 097e961b2202a7586c13bf60b72d4fa9cf25a311 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Mon, 12 Apr 2021 08:17:26 +0200 Subject: [PATCH 18/18] add keymap script Signed-off-by: Michel-FK --- .../funkey/rootfs-overlay/usr/local/sbin/keymap | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 FunKey/board/funkey/rootfs-overlay/usr/local/sbin/keymap diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/keymap b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/keymap new file mode 100755 index 0000000..ddba97d --- /dev/null +++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/keymap @@ -0,0 +1,14 @@ +#!/bin/sh + +# Check number of args +if [ ${#} -ne 1 ]; then + echo "Usage: $(basename ${0}) keymap_file" + exit 1 +fi +if [ "${1}" = "reset" ]; then + keymap_file="/etc/fkgpiod.conf" +else + keymap_file="${1}" +fi +echo "LOAD ${keymap_file}" >/tmp/fkgpiod.fifo 2>/dev/null +exit 0