diff --git a/acinclude.m4 b/acinclude.m4 index 66f2054fe..b26244839 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -454,7 +454,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, hd61, bre2ze4k, h7, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) +AS_HELP_STRING([], [valid for armbox: hd51, hd60, hd61, bre2ze4k, h7, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) AS_HELP_STRING([], [valid for mipsbox: vuduo]), [case "${withval}" in generic|raspi) @@ -483,7 +483,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd51|hd60|hd61|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + hd51|hd60|hd61|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -532,6 +532,7 @@ AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k") AM_CONDITIONAL(BOXMODEL_OSMIO4KPLUS, test "$BOXMODEL" = "osmio4kplus") AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k") +AM_CONDITIONAL(BOXMODEL_VUDUO4KSE, test "$BOXMODEL" = "vuduo4kse") AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k") AM_CONDITIONAL(BOXMODEL_VUUNO4K, test "$BOXMODEL" = "vuuno4k") AM_CONDITIONAL(BOXMODEL_VUUNO4KSE, test "$BOXMODEL" = "vuuno4kse") @@ -595,6 +596,8 @@ elif test "$BOXMODEL" = "vusolo4k"; then AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) elif test "$BOXMODEL" = "vuduo4k"; then AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k]) +elif test "$BOXMODEL" = "vuduo4kse"; then + AC_DEFINE(BOXMODEL_VUDUO4KSE, 1, [vuduo4kse]) elif test "$BOXMODEL" = "vuultimo4k"; then AC_DEFINE(BOXMODEL_VUULTIMO4K, 1, [vuultimo4k]) elif test "$BOXMODEL" = "vuuno4k"; then @@ -609,7 +612,7 @@ fi # all vuplus BOXMODELs case "$BOXMODEL" in - vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo) + vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo) AC_DEFINE(BOXMODEL_VUPLUS_ALL, 1, [vuplus_all]) vuplus_all=true ;; @@ -621,7 +624,7 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$vuplus_all" = "true") # all vuplus arm BOXMODELs case "$BOXMODEL" in - vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) AC_DEFINE(BOXMODEL_VUPLUS_ARM, 1, [vuplus_arm]) vuplus_arm=true ;; @@ -657,14 +660,14 @@ AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true") # BOXMODELs that allows to change osd resolution case "$BOXMODEL" in - hd2|hd51|hd60|hd61|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo) + hd2|hd51|hd60|hd61|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]) ;; esac # BOXMODELs that needs GraphLCD support case "$BOXMODEL" in - vusolo4k|vuduo4k|vuultimo4k|vuuno4kse) + vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4kse) AC_DEFINE(ENABLE_GRAPHLCD, 1, [include GraphLCD support]) enable_graphlcd=yes ;; diff --git a/data/oled/themes/Makefile.am b/data/oled/themes/Makefile.am index fd92a7b7c..75bc25f2f 100644 --- a/data/oled/themes/Makefile.am +++ b/data/oled/themes/Makefile.am @@ -8,6 +8,9 @@ endif if BOXMODEL_VUDUO4K SUBDIRS += 480x320 endif +if BOXMODEL_VUDUO4KSE +SUBDIRS += 480x320 +endif if BOXMODEL_VUULTIMO4K SUBDIRS += 800x480 endif diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index 3e24189b6..db1443a47 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -538,6 +538,7 @@ 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+ DUO4KSE~ {=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=}~ @@ -546,7 +547,7 @@ start-block~remote {=if-equal:{=var-get:boxtype=}~AirDigital Zgemma H7C/S~ {=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=}~ @@ -569,10 +570,11 @@ start-block~remote {=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=}~ - {=if-equal:{=var-get:yfbtype=}~19~ {=include-block:Y_Blocks.txt;rc_zgemma_h7=}~ + {=if-equal:{=var-get:yfbtype=}~19~ {=include-block:Y_Blocks.txt;rc_vuplus=}~ + {=if-equal:{=var-get:yfbtype=}~20~ {=include-block:Y_Blocks.txt;rc_zgemma_h7=}~ {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=} - =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} + =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} =} end-block~remote @@ -1143,7 +1145,7 @@ start-block~rc_wwio_bre2ze4k end-block~rc_wwio_bre2ze4k -# ------ Remote VU+ Solo 4K/Duo 4K/Ultimo 4K/Zero 4K/Uno 4K SE +# ------ Remote VU+ Solo 4K, Duo 4K, Duo 4K SE, Ultimo 4K, Zero 4K, Uno 4K, Uno 4K SE start-block~rc_vuplus diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp index 59109c2f4..a84feacc6 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -868,7 +868,7 @@ void cGLCD::Run(void) static uint32_t *fbp = fb->getFrameBufferPointer(); int lcd_width = bitmap->Width(); int lcd_height = bitmap->Height(); -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE ||BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE unsigned int fb_stride = fb->getStride()/4; if (!showImage(fbp, fb_stride, fb_height, 0, 0, lcd_width, lcd_height, false, false)) { @@ -892,7 +892,7 @@ void cGLCD::Run(void) if (g_settings.glcd_mirror_video && !doStandbyTime && !doStandbyWeather) { -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE ||BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE lcd->SetMirrorVideo(true); #else char ws[10]; @@ -918,7 +918,7 @@ void cGLCD::Run(void) continue; #endif } -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE ||BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE else lcd->SetMirrorVideo(false); #endif diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h index 7d07442a1..93a28a960 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 || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K std::string modestr[16]; #else std::string modestr[4]; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index cb42f79f9..d22af0404 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -711,7 +711,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.glcd_brightness_dim_time = configfile.getString("glcd_brightness_dim_time", GLCD_DEFAULT_BRIGHTNESS_DIM_TIME); #if BOXMODEL_VUUNO4KSE g_settings.glcd_scroll_speed = configfile.getInt32("glcd_scroll_speed", 1); -#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K +#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K g_settings.glcd_scroll_speed = configfile.getInt32("glcd_scroll_speed", 2); #else g_settings.glcd_scroll_speed = configfile.getInt32("glcd_scroll_speed", 5); diff --git a/src/zapit/include/linux/dvb/dmx.h b/src/zapit/include/linux/dvb/dmx.h index bcd7569c2..908ff4ade 100644 --- a/src/zapit/include/linux/dvb/dmx.h +++ b/src/zapit/include/linux/dvb/dmx.h @@ -77,7 +77,7 @@ typedef enum dmx_ts_pes DMX_PES_SUBTITLE3, DMX_PES_PCR3, -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K DMX_PES_AUDIO4, DMX_PES_VIDEO4, DMX_PES_TELETEXT4, @@ -250,7 +250,7 @@ typedef enum { DMX_SOURCE_FRONT1, DMX_SOURCE_FRONT2, DMX_SOURCE_FRONT3, -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K DMX_SOURCE_FRONT4, DMX_SOURCE_FRONT5, DMX_SOURCE_FRONT6, @@ -282,7 +282,7 @@ typedef enum { DMX_SOURCE_DVR1, DMX_SOURCE_DVR2, DMX_SOURCE_DVR3 -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K , DMX_SOURCE_DVR4 , DMX_SOURCE_DVR5 , DMX_SOURCE_DVR6 diff --git a/src/zapit/include/zapit/femanager.h b/src/zapit/include/zapit/femanager.h index b6a1b3024..2769142a0 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 || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUDUO4KSE || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K #define MAX_FE 16 #define MAX_ADAPTERS 4 #else