diff --git a/acinclude.m4 b/acinclude.m4 index 58a97cf20..22b2d3f6e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -447,7 +447,7 @@ AC_ARG_WITH(boxtype, AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi]) AS_HELP_STRING([], [valid for coolstream: hd1, hd2]) -AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuultimo4k, vuzero4k]) +AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) AS_HELP_STRING([], [valid for mipsbox: vuduo]), [case "${withval}" in generic|raspi) @@ -476,7 +476,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuzero4k) + hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -522,6 +522,8 @@ AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k") AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k") +AM_CONDITIONAL(BOXMODEL_VUUNO4K, test "$BOXMODEL" = "vuuno4k") +AM_CONDITIONAL(BOXMODEL_VUUNO4KSE, test "$BOXMODEL" = "vuuno4kse") AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k") # mipsbox @@ -564,6 +566,10 @@ elif test "$BOXMODEL" = "vuduo4k"; then AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k]) elif test "$BOXMODEL" = "vuultimo4k"; then AC_DEFINE(BOXMODEL_VUULTIMO4K, 1, [vuultimo4k]) +elif test "$BOXMODEL" = "vuuno4k"; then + AC_DEFINE(BOXMODEL_VUUNO4K, 1, [vuuno4k]) +elif test "$BOXMODEL" = "vuuno4kse"; then + AC_DEFINE(BOXMODEL_VUUNO4KSE, 1, [vuuno4kse]) elif test "$BOXMODEL" = "vuzero4k"; then AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k]) elif test "$BOXMODEL" = "vuduo"; then @@ -571,7 +577,7 @@ elif test "$BOXMODEL" = "vuduo"; then fi # BOXMODELs that allows to change osd resolution -boxmodels=hd2 hd51 hd60 bre2ze4k vusolo4k vuduo4k vuultimo4k vuzero4k vuduo +boxmodels=hd2 hd51 hd60 bre2ze4k vusolo4k vuduo4k vuultimo4k vuuno4k vuuno4kse vuzero4k vuduo for boxmodel in $boxmodels; do if test "$BOXMODEL" = "$boxmodel"; then diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index 24c4bdbed..c389516ce 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -538,12 +538,14 @@ start-block~remote {=if-equal:{=var-get:boxtype=}~WWIO BRE2ZE 4K~ {=include-block:Y_Blocks.txt;rc_wwio_bre2ze4k=}~ {=if-equal:{=var-get:boxtype=}~VU+ SOLO4K~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ {=if-equal:{=var-get:boxtype=}~VU+ DUO4K~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ - {=if-equal:{=var-get:boxtype=}~VU+ DUO~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ - {=if-equal:{=var-get:boxtype=}~VU+ ZERO4K~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ {=if-equal:{=var-get:boxtype=}~VU+ ULTIMO4K~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ + {=if-equal:{=var-get:boxtype=}~VU+ UNO4K~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ + {=if-equal:{=var-get:boxtype=}~VU+ UNO4KSE~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ + {=if-equal:{=var-get:boxtype=}~VU+ ZERO4K~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ + {=if-equal:{=var-get:boxtype=}~VU+ DUO~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=} - =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} + =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} =}=} ~ {=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~ @@ -564,9 +566,11 @@ start-block~remote {=if-equal:{=var-get:yfbtype=}~14~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ {=if-equal:{=var-get:yfbtype=}~15~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ {=if-equal:{=var-get:yfbtype=}~16~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ + {=if-equal:{=var-get:yfbtype=}~17~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ + {=if-equal:{=var-get:yfbtype=}~18~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=} - =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} + =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} =} end-block~remote @@ -1137,7 +1141,7 @@ start-block~rc_wwio_bre2ze4k end-block~rc_wwio_bre2ze4k -# ------ Remote VU+ Solo 4K/Duo 4K/Ultimo 4K/Zero 4K/Duo +# ------ Remote VU+ Solo 4K/Duo 4K/Ultimo 4K/Zero 4K/Uno 4K SE start-block~rc_vuplus diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am index 6b604ee83..837321a3f 100644 --- a/data/y-web/images/Makefile.am +++ b/data/y-web/images/Makefile.am @@ -112,6 +112,14 @@ if BOXMODEL_VUULTIMO4K install_DATA += rc_vuplus.png endif +if BOXMODEL_VUUNO4K +install_DATA += rc_vuplus.png +endif + +if BOXMODEL_VUUNO4KSE +install_DATA += rc_vuplus.png +endif + if BOXMODEL_VUZERO4K install_DATA += rc_vuplus.png endif diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 155107dc2..c42c2b915 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -227,7 +227,7 @@ class CRCInput RC_tv = KEY_TV, RC_radio = KEY_RADIO, RC_text = KEY_TEXT, -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K RC_info = KEY_NONEXISTING, RC_epg = KEY_INFO, #else diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h index d07a68980..4921dbab0 100644 --- a/src/gui/scan_setup.h +++ b/src/gui/scan_setup.h @@ -69,7 +69,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver #if BOXMODEL_VUULTIMO4K std::string modestr[24]; #else -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE std::string modestr[16]; #else std::string modestr[4]; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 5930ba7b2..144d1e381 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -5255,7 +5255,7 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.key_list_end = tconfig->getInt32( "key_list_end", (unsigned int)CRCInput::RC_nokey ); #if BOXMODEL_HD51 || BOXMODEL_HD60 g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME -#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO +#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause ); #else g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_pause ); @@ -5291,7 +5291,7 @@ void CNeutrinoApp::loadKeys(const char * fname) #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause ); g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); -#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO +#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_play ); g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); #else diff --git a/src/zapit/include/zapit/femanager.h b/src/zapit/include/zapit/femanager.h index e79c7e252..ebdcaf2d9 100644 --- a/src/zapit/include/zapit/femanager.h +++ b/src/zapit/include/zapit/femanager.h @@ -35,7 +35,7 @@ #define MAX_FE 24 #define MAX_ADAPTERS 4 #else -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUUNO4KSE #define MAX_FE 16 #define MAX_ADAPTERS 4 #else diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 6ac17166f..bc0aed882 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -1233,7 +1233,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p case FEC_2_3: fec = FEC_2_3; if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8) -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K pilot = PILOT_AUTO; #else pilot = PILOT_ON; @@ -1242,7 +1242,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p case FEC_3_4: fec = FEC_3_4; if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8) -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K pilot = PILOT_AUTO; #else pilot = PILOT_ON; @@ -1254,7 +1254,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p case FEC_5_6: fec = FEC_5_6; if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8) -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K pilot = PILOT_AUTO; #else pilot = PILOT_ON; @@ -1272,7 +1272,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p case FEC_3_5: fec = FEC_3_5; if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8) -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K pilot = PILOT_AUTO; #else pilot = PILOT_ON;