diff --git a/acinclude.m4 b/acinclude.m4 index ace69ac34..00a349cc4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -459,7 +459,7 @@ AC_ARG_WITH(boxtype, AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for coolstream: hd1, hd2]) -AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k, bre2ze4k, h7]) +AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuzero4k, h7]) AS_HELP_STRING([], [valid for mipsbox: vuduo]) AS_HELP_STRING([], [valid for generic: raspi]), [case "${withval}" in @@ -482,7 +482,7 @@ AS_HELP_STRING([], [valid for generic: raspi]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd51|hd60|vusolo4k|bre2ze4k|h7) + hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuzero4k|h7) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -524,8 +524,10 @@ AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2") AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") -AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") +AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") +AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k") +AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k") AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo") AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") @@ -559,11 +561,17 @@ elif test "$BOXMODEL" = "hd51"; then elif test "$BOXMODEL" = "hd60"; then AC_DEFINE(BOXMODEL_HD60, 1, [hd60]) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) +elif test "$BOXMODEL" = "bre2ze4k"; then + AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k]) + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) elif test "$BOXMODEL" = "vusolo4k"; then AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) -elif test "$BOXMODEL" = "bre2ze4k"; then - AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k]) +elif test "$BOXMODEL" = "vuduo4k"; then + AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k]) + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) +elif test "$BOXMODEL" = "vuzero4k"; then + AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k]) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) elif test "$BOXMODEL" = "vuduo"; then AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo]) diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index a6398b33e..a1f182ec5 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -526,10 +526,13 @@ start-block~remote {=if-equal:{=var-get:boxtype=}~Mutant HD51~ {=include-block:Y_Blocks.txt;rc_mutant_hd51=}~ {=if-equal:{=var-get:boxtype=}~WWIO BRE2ZE4K~ {=include-block:Y_Blocks.txt;rc_wwio_bre2ze4k=}~ {=if-equal:{=var-get:boxtype=}~VU+ SOLO4K~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~ + {=if-equal:{=var-get:boxtype=}~VU+ DUO4K~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~ + {=if-equal:{=var-get:boxtype=}~VU+ DUO~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~ + {=if-equal:{=var-get:boxtype=}~VU+ ZERO4K~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~ {=if-equal:{=var-get:boxtype=}~ZGEMMA H7~ {=include-block:Y_Blocks.txt;rc_zgemma_h7=}~ {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=} - =}=}=}=}=}=}=}=}=}=}=}=}=} + =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} =}=} ~ {=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~ @@ -546,10 +549,13 @@ start-block~remote {=if-equal:{=var-get:yfbtype=}~10~ {=include-block:Y_Blocks.txt;rc_mutant_hd51=}~ {=if-equal:{=var-get:yfbtype=}~11~ {=include-block:Y_Blocks.txt;rc_wwio_bre2ze4k=}~ {=if-equal:{=var-get:yfbtype=}~12~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~ - {=if-equal:{=var-get:yfbtype=}~13~ {=include-block:Y_Blocks.txt;rc_zgemma_h7=}~ + {=if-equal:{=var-get:yfbtype=}~13~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~ + {=if-equal:{=var-get:yfbtype=}~14~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~ + {=if-equal:{=var-get:yfbtype=}~15~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~ + {=if-equal:{=var-get:yfbtype=}~16~ {=include-block:Y_Blocks.txt;rc_zgemma_h7=}~ {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=} - =}=}=}=}=}=}=}=}=}=}=}=}=}=}=} + =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} =} end-block~remote @@ -1120,7 +1126,7 @@ start-block~rc_wwio_bre2ze4k end-block~rc_wwio_bre2ze4k -# ------ Remote VU+ Solo 4K +# ------ Remote VU+ Solo/Duo/Zero 4K start-block~rc_vu_solo4k @@ -1139,7 +1145,7 @@ start-block~rc_vu_solo4k 6 7 8 -9 +9 previous 0 next diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am index 9edb928fb..6acb1cfac 100644 --- a/data/y-web/images/Makefile.am +++ b/data/y-web/images/Makefile.am @@ -108,6 +108,18 @@ if BOXMODEL_H7 install_DATA += rc_zgemma_h7.png endif +if BOXMODEL_VUDUO4K +install_DATA += rc_vu_solo4k.png +endif + +if BOXMODEL_VUZERO4K +install_DATA += rc_vu_solo4k.png +endif + +if BOXMODEL_VUDUO +install_DATA += rc_vu_solo4k.png +endif + # file manager install_DATA += chmod.png \ copy.gif \ diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index 8c0893d16..a9f2233b7 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -224,7 +224,7 @@ class CRCInput RC_tv = KEY_TV, RC_radio = KEY_RADIO, RC_text = KEY_TEXT, -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO RC_info = 0xFFFE, RC_epg = KEY_INFO, #else diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h index bb749eed1..86403884a 100644 --- a/src/gui/scan_setup.h +++ b/src/gui/scan_setup.h @@ -66,7 +66,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver CGenericMenuActivate msettings; CMenuOptionChooser * linkfe; -#if BOXMODEL_VUSOLO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K std::string modestr[16]; #else std::string modestr[4]; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 629b7f164..56e6eaedd 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4990,7 +4990,7 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.key_list_start = tconfig->getInt32( "key_list_start", (unsigned int)CRCInput::RC_nokey ); g_settings.key_list_end = tconfig->getInt32( "key_list_end", (unsigned int)CRCInput::RC_nokey ); -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME #else g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_pause ); @@ -5026,7 +5026,7 @@ void CNeutrinoApp::loadKeys(const char * fname) #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 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 +#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO 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 f67a7290c..75c95c0ae 100644 --- a/src/zapit/include/zapit/femanager.h +++ b/src/zapit/include/zapit/femanager.h @@ -31,7 +31,7 @@ #include -#if BOXMODEL_VUSOLO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K #define MAX_FE 16 #define MAX_ADAPTERS 4 #else diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 89d4ef752..24e93e603 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -1225,7 +1225,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 +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K pilot = PILOT_AUTO; #else pilot = PILOT_ON;