Merge pull request #2956 from HiassofT/le9-default-ir-remotes

Cleanup OOTB IR remote support and make it configurable
This commit is contained in:
Christian Hewitt 2018-09-07 15:05:12 +04:00 committed by GitHub
commit 10e5dba2ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 10 deletions

View File

@ -218,3 +218,10 @@
# Settings package name - blank if not required # Settings package name - blank if not required
DISTRO_PKG_SETTINGS="LibreELEC-settings" DISTRO_PKG_SETTINGS="LibreELEC-settings"
# IR remote protocols supported in default config
IR_REMOTE_PROTOCOLS="RC6 NEC"
# IR remote keymaps supported in default config
IR_REMOTE_KEYMAPS="rc6_mce xbox_360 xbox_one"

View File

@ -62,7 +62,7 @@ create_multi_keymap() {
} }
post_makeinstall_target() { post_makeinstall_target() {
local default_multi_maps f keymap local f keymap
rm -rf $INSTALL/etc/rc_keymaps rm -rf $INSTALL/etc/rc_keymaps
ln -sf /storage/.config/rc_keymaps $INSTALL/etc/rc_keymaps ln -sf /storage/.config/rc_keymaps $INSTALL/etc/rc_keymaps
@ -86,15 +86,12 @@ post_makeinstall_target() {
) )
# create multi keymap to support several remotes OOTB # create multi keymap to support several remotes OOTB
if [ -n "$IR_REMOTE_PROTOCOLS" -a -n "$IR_REMOTE_KEYMAPS" ]; then
default_multi_maps="rc6_mce xbox_360 zotac_ad10 hp_mce xbox_one cubox_i" create_multi_keymap libreelec_multi "$IR_REMOTE_PROTOCOLS" $IR_REMOTE_KEYMAPS
create_multi_keymap libreelec_multi "RC6 NEC" $default_multi_maps
create_multi_keymap libreelec_multi_amlogic "RC6 NEC" $default_multi_maps \
odroid wetek_hub wetek_play_2 minix_neo
# use multi-keymap instead of default one # use multi-keymap instead of default one
sed -i '/^\*\s*rc-rc6-mce\s*rc6_mce/d' $INSTALL/etc/rc_maps.cfg sed -i '/^\*\s*rc-rc6-mce\s*rc6_mce/d' $INSTALL/etc/rc_maps.cfg
cat << EOF >> $INSTALL/etc/rc_maps.cfg cat << EOF >> $INSTALL/etc/rc_maps.cfg
# #
# Custom LibreELEC configuration starts here # Custom LibreELEC configuration starts here
@ -103,6 +100,8 @@ post_makeinstall_target() {
# * rc-rc6-mce rc6_mce # * rc-rc6-mce rc6_mce
* rc-rc6-mce libreelec_multi * rc-rc6-mce libreelec_multi
# multi-table for amlogic devices # multi-table for amlogic devices
meson-ir * libreelec_multi_amlogic meson-ir * libreelec_multi
EOF EOF
fi
} }

View File

@ -24,3 +24,7 @@
# Amlogic IR remote support (yes / no) # Amlogic IR remote support (yes / no)
AMREMOTE_SUPPORT="no" AMREMOTE_SUPPORT="no"
# add OOTB support for Odroid IR remote
IR_REMOTE_KEYMAPS="$IR_REMOTE_KEYMAPS odroid"

View File

@ -11,3 +11,6 @@
# Space separated list is supported, # Space separated list is supported,
# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
FIRMWARE="$FIRMWARE brcmfmac_sdio-firmware-aml" FIRMWARE="$FIRMWARE brcmfmac_sdio-firmware-aml"
# add OOTB support for Wetek Hub IR remote
IR_REMOTE_KEYMAPS="$IR_REMOTE_KEYMAPS wetek_hub"

View File

@ -11,3 +11,7 @@
# Space separated list is supported, # Space separated list is supported,
# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
FIRMWARE="$FIRMWARE brcmfmac_sdio-firmware-aml" FIRMWARE="$FIRMWARE brcmfmac_sdio-firmware-aml"
# add OOTB support for Wetek Play 2 IR remote
IR_REMOTE_KEYMAPS="$IR_REMOTE_KEYMAPS wetek_play_2"