diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt index d1e9232460..a3dfaa3e7e 100755 --- a/packages/addons/driver/sundtek-mediatv/changelog.txt +++ b/packages/addons/driver/sundtek-mediatv/changelog.txt @@ -1,3 +1,7 @@ +103 +- once a serial number is in config file then ir_disabled parameter + needs to be localized below it (it is not global parameter anymore) + 102 - Automatically update driver to latest version on first install - Show driver version in addon settings diff --git a/packages/addons/driver/sundtek-mediatv/config/sundtek.conf b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf index 5f9d4acadb..e53ae59ede 100644 --- a/packages/addons/driver/sundtek-mediatv/config/sundtek.conf +++ b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf @@ -27,6 +27,7 @@ bulk_notification=on #[U123456789012] #initial_dvb_mode=DVBT +#ir_disabled=1 #[NETWORK] #device=192.168.1.1:0 diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index c252b2d88a..4000bed7c6 100644 --- a/packages/addons/driver/sundtek-mediatv/package.mk +++ b/packages/addons/driver/sundtek-mediatv/package.mk @@ -18,7 +18,7 @@ PKG_NAME="sundtek-mediatv" PKG_VERSION="7.0" -PKG_REV="102" +PKG_REV="103" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start index db51011b40..bdfd5ce437 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start +++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start @@ -136,7 +136,7 @@ if [ -z "$(pidof mediasrv)" ]; then if [ "$USE_NET_TUNERS" = "true" -a -n "$DEVICE1_IP" ]; then # delete all network tuner entries - awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net + awk '/^\[NETWORK\]/{flag=1; next} /^[^\[]|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP echo "" >>$SUNDTEK_CONF_TMP # remove empty lines at the end of file @@ -168,7 +168,7 @@ if [ -z "$(pidof mediasrv)" ]; then fi else # delete all network tuner entries - awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net + awk '/^\[NETWORK\]/{flag=1; next} /^[^\[]|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP echo "" >>$SUNDTEK_CONF_TMP # remove empty lines at the end of file @@ -197,26 +197,26 @@ if [ -z "$(pidof mediasrv)" ]; then [ ! -f $KEYMAP ] && KEYMAP="" # remove setttings for this tuner - awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^ir_protocol=|^rcmap=|^initial_dvb_mode=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types + awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^[^\[]|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP echo "" >>$SUNDTEK_CONF_TMP # remove empty lines at the end of file sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP - ADDNEW=true - if [ -n "$DVBMODE" ]; then - [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP - echo "initial_dvb_mode=$DVBMODE" >>$SUNDTEK_CONF_TMP - fi - if [ -n "$IRPROT" ]; then - [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP - echo "ir_protocol=$IRPROT" >>$SUNDTEK_CONF_TMP - fi - if [ -n "$KEYMAP" ]; then - [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP - echo "rcmap=$KEYMAP" >>$SUNDTEK_CONF_TMP + echo "" >>$SUNDTEK_CONF_TMP + echo "[$SERIAL]" >>$SUNDTEK_CONF_TMP + + [ -n "$DVBMODE" ] && echo "initial_dvb_mode=$DVBMODE" >>$SUNDTEK_CONF_TMP + + if [ "$ENABLE_IR_RECEIVER" = "true" ]; then + echo "ir_disabled=0" >>$SUNDTEK_CONF_TMP + else + echo "ir_disabled=1" >>$SUNDTEK_CONF_TMP fi + [ -n "$IRPROT" ] && echo "ir_protocol=$IRPROT" >>$SUNDTEK_CONF_TMP + [ -n "$KEYMAP" ] && echo "rcmap=$KEYMAP" >>$SUNDTEK_CONF_TMP + echo "" >>$SUNDTEK_CONF_TMP done fi