Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-04-16 16:11:37 +02:00
commit f5b62a6afd
8 changed files with 88 additions and 8 deletions

View File

@ -14,7 +14,7 @@ providing cutting edge hardware support to deliver a set-top box experience.
**Installation**
* Please read INSTALL for instructions on how to install.
* Installation instructions can be found on [OpenELEC Wiki](http://wiki.openelec.tv/index.php?title=Installation)
**Known issues**

View File

@ -48,4 +48,4 @@ fi
make vdr
make include-dir
make plugins
make install DESTDIR=$ROOT/$PKG_BUILD/.install/
make install DESTDIR=$ROOT/$PKG_BUILD/.install

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="service.openelec.settings"
PKG_VERSION="0.1.13"
PKG_VERSION="0.1.14"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="prop."

View File

@ -37,6 +37,12 @@ mkdir -p /run/connman
fi
(
# setup hostname
if [ -f /storage/.cache/hostname ] ; then
progress "Setup hostname"
cat /storage/.cache/hostname > /proc/sys/kernel/hostname
fi
# starting Connection manager
progress "starting Connection manager"
while true; do

View File

@ -140,7 +140,7 @@ begin remote
KEY_TV 0x00007bda
KEY_DVD 0x00007bdb
#NoGap
KEY_BACK 0x00007bdc
KEY_EXIT 0x00007bdc
KEY_OK 0x00007bdd
KEY_RIGHT 0x00007bde
KEY_LEFT 0x00007bdf
@ -186,6 +186,83 @@ begin remote
end remote
#
# contributed by stevvie and jenkins101
#
# brand: SIIG Vista MCE remote
# model no. of remote control: older Harmony and some vista mce remotes
# devices being controlled by this remote:
#
begin remote
name vista_mce
bits 16
flags RC6
eps 30
aeps 100
header 2654 889
one 427 427
zero 427 427
pre_data_bits 21
pre_data 0x37FF0
gap 69850
min_repeat 4
# increase to suppress unwanted repeats
suppress_repeat 4
toggle_bit_mask 0x8000
rc6_mask 0x100000000
begin codes
KEY_POWER 0xEBF3 # Power
KEY_CAMERA 0x6BB6 # Pictures
KEY_RADIO 0xEBAF # Radio
KEY_VIDEO 0x6BB5 # Videos
KEY_MUSIC 0xEBB8 # Music
KEY_RECORD 0x6BE8 # Rec
KEY_PAUSE 0xEBE7 # Pause
KEY_STOP 0x6BE6 # Stop
KEY_PREVIOUS 0xEBE4 # Skipback
KEY_PLAY 0x6BE9 # Play
KEY_NEXT 0xEBE5 # Skipfwd
KEY_REWIND 0x6BEA # Rwd
KEY_FORWARD 0xEBEB # Fwd
KEY_HOME 0x6BF2 # Start
KEY_EXIT 0xEBDC # Back
KEY_INFO 0x6BF0 # More
KEY_VOLUMEUP 0xEBEF # Volup
KEY_VOLUMEDOWN 0x6BEE # Voldown
KEY_CHANNELUP 0xEBED # Chup
KEY_CHANNELDOWN 0x6BEC # Chdown
KEY_UP 0xEBE1 # Up
KEY_DOWN 0x6BE0 # Down
KEY_LEFT 0xEBDF # Left
KEY_RIGHT 0x6BDE # Right
KEY_MUTE 0xEBF1 # Mute
KEY_PVR 0x6BB7 # Rectv
KEY_TITLE 0xEBD9 # Guide
KEY_TV 0x6BDA # Livetv
KEY_MENU 0xEBDB # Dvdmenu
KEY_1 0x6BFE # 1
KEY_2 0xEBFD # 2
KEY_3 0x6BFC # 3
KEY_4 0xEBFB # 4
KEY_5 0x6BFA # 5
KEY_6 0xEBF9 # 6
KEY_7 0x6BF8 # 7
KEY_8 0xEBF7 # 8
KEY_9 0x6BF6 # 9
KEY_NUMERIC_STAR 0xEBE2 # *
KEY_0 0x6BFF # 0
KEY_NUMERIC_POUND 0xEBE3 # #
KEY_CLEAR 0x6BF5 # Clear
KEY_ENTER 0xEBF4 # Enter
end codes
end remote
#
# this config file was automatically generated
# using lirc-0.8.2(macmini) on Tue Dec 11 11:35:26 2007
#
@ -340,7 +417,7 @@ begin remote
KEY_REWIND 0x0BEA
KEY_PLAYPAUSE 0x0BE9
KEY_FASTFORWARD 0x0BEB
KEY_BACK 0x0BDC
KEY_EXIT 0x0BDC
KEY_TITLE 0x0BAE
KEY_STOP 0x0BE6
KEY_INFO 0x0BF0

View File

@ -228,7 +228,6 @@ EOF
# cp Autorun.inf /tmp/usb_install
cp openelec.ico /tmp/usb_install
cp CHANGELOG /tmp/usb_install
cp INSTALL /tmp/usb_install
cp README.md /tmp/usb_install
cp RELEASE /tmp/usb_install

View File

@ -93,7 +93,6 @@ IF ERRORLEVEL 1 goto InvalidDrive
>NUL 3rdparty\syslinux\win32\syslinux.exe -f -m -a %DRIVE%
>NUL copy target\* %DRIVE%
>NUL copy CHANGELOG %DRIVE%
>NUL copy INSTALL %DRIVE%
>NUL copy README.md %DRIVE%
>NUL copy RELEASE %DRIVE%
>NUL copy openelec.ico %DRIVE%

View File

@ -104,7 +104,6 @@ Section "oeusbstart"
nsExec::Exec `"$0" /c copy Autorun.inf $DRIVE_LETTER`
nsExec::Exec `"$0" /c copy openelec.ico $DRIVE_LETTER`
nsExec::Exec `"$0" /c copy CHANGELOG $DRIVE_LETTER`
nsExec::Exec `"$0" /c copy INSTALL $DRIVE_LETTER`
nsExec::Exec `"$0" /c copy README.md $DRIVE_LETTER`
nsExec::Exec `"$0" /c copy RELEASE $DRIVE_LETTER`
nsExec::Exec `"$0" /c copy 3rdparty\syslinux\vesamenu.c32 $DRIVE_LETTER`