diff --git a/acinclude.m4 b/acinclude.m4 index 264e5fefb..6e422347f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -458,7 +458,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: hd60, hd61, hd51, bre2ze4k, h7, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) +AS_HELP_STRING([], [valid for armbox: hd60, hd61, multiboxse, hd51, bre2ze4k, h7, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]), [case "${withval}" in generic|raspi) @@ -487,7 +487,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd60|hd61|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + hd60|hd61|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -527,6 +527,7 @@ AM_CONDITIONAL(BOXMODEL_CST_HD2, test "$BOXMODEL" = "hd2") # armbox AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_HD61, test "$BOXMODEL" = "hd61") +AM_CONDITIONAL(BOXMODEL_MULTIBOXSE, test "$BOXMODEL" = "multiboxse") AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") @@ -595,6 +596,8 @@ elif test "$BOXMODEL" = "hd60"; then AC_DEFINE(BOXMODEL_HD60, 1, [hd60]) elif test "$BOXMODEL" = "hd61"; then AC_DEFINE(BOXMODEL_HD61, 1, [hd61]) +elif test "$BOXMODEL" = "multiboxse"; then + AC_DEFINE(BOXMODEL_MULTIBOXSE, 1, [multiboxse]) elif test "$BOXMODEL" = "hd51"; then AC_DEFINE(BOXMODEL_HD51, 1, [hd51]) @@ -680,7 +683,7 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true") # all hisilicon BOXMODELs case "$BOXMODEL" in - hd60|hd61) + hd60|hd61|multiboxse) AC_DEFINE(BOXMODEL_HISILICON, 1, [hisilicon]) hisilicon=true ;; @@ -692,7 +695,7 @@ AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true") # BOXMODELs that allows to change osd resolution case "$BOXMODEL" in - hd2|hd60|hd61|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro) + hd2|hd60|hd61|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]) ;; esac diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index 4f83fcc18..5c3ff3968 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -549,6 +549,7 @@ start-block~rc_variables {=var-set:_rc_ax_hd60=21=} {=var-set:_rc_mutant_hd60=22=} {=var-set:_rc_ax_hd61=23=} +{=var-set:_rc_maxytec_multiboxse=24=} end-block~rc_variables # ------- Remote @@ -584,9 +585,10 @@ start-block~remote {=if-equal:{=var-get:boxtype=}~AX HD60~ {=include-block:Y_Blocks.txt;rc_ax_hd51=}~ {=if-equal:{=var-get:boxtype=}~Mutant HD60~ {=include-block:Y_Blocks.txt;rc_mutant_hd60=}~ {=if-equal:{=var-get:boxtype=}~AX HD61~ {=include-block:Y_Blocks.txt;rc_ax_hd61=}~ + {=if-equal:{=var-get:boxtype=}~Maxytec MultiboxSE 4K~ {=include-block:Y_Blocks.txt;rc_mutant_hd60=}~ {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=} - =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} + =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} =}=} ~ {=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_dbox_philips=}~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~ @@ -614,9 +616,10 @@ start-block~remote {=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_ax_hd60=}~ {=include-block:Y_Blocks.txt;rc_ax_hd51=}~ {=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_mutant_hd60=}~ {=include-block:Y_Blocks.txt;rc_mutant_hd60=}~ {=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_ax_hd61=}~ {=include-block:Y_Blocks.txt;rc_ax_hd61=}~ + {=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_maxytec_multiboxse=}~{=include-block:Y_Blocks.txt;rc_mutant_hd60=}~ {=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=} - =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} + =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=} =} end-block~remote @@ -1297,7 +1300,7 @@ start-block~rc_zgemma_h7 end-block~rc_zgemma_h7 -# ------ Remote Mutant HD60 +# ------ Remote Mutant HD60, Maxytec Multibox SE 4K start-block~rc_mutant_hd60 diff --git a/data/y-web/Y_Settings_yWeb.yhtm b/data/y-web/Y_Settings_yWeb.yhtm index 32b0f30c8..9d7a8269a 100644 --- a/data/y-web/Y_Settings_yWeb.yhtm +++ b/data/y-web/Y_Settings_yWeb.yhtm @@ -158,6 +158,7 @@ select { + diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 88148612b..2632ee0d9 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1757,7 +1757,7 @@ int CRCInput::translate(int code) case KEY_CHANNELDOWN: return RC_page_down; #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE case KEY_VIDEO: return RC_favorites; case KEY_TV2: diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 4869dc231..1c5923952 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -285,7 +285,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { -1, NONEXISTANT_LOCALE, "2160p 50Hz" }, { -1, NONEXISTANT_LOCALE, "Auto" } }; -#elif BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_H7 || BOXMODEL_BRE2ZE4K || BOXMODEL_VUPLUS_ALL +#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_VUPLUS_ALL CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = { { -1, NONEXISTANT_LOCALE, "NTSC" }, diff --git a/src/neutrino.cpp b/src/neutrino.cpp index bb3a80adb..7afd7fe2d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -337,7 +337,7 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = { { CRCInput::RC_green, "6", "", "green" }, { CRCInput::RC_yellow, "7,35", "", "yellow" }, { CRCInput::RC_blue, "27,28,21,20,1,39,10,11,24,19,14", "", "blue" }, -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE { CRCInput::RC_playpause, "9", "", "5" }, #else { CRCInput::RC_play, "9", "", "5" }, @@ -5666,7 +5666,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 BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME #elif BOXMODEL_VUPLUS_ALL g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause ); @@ -5702,7 +5702,7 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.mpkey_rewind = tconfig->getInt32( "mpkey.rewind", CRCInput::RC_rewind ); g_settings.mpkey_forward = tconfig->getInt32( "mpkey.forward", CRCInput::RC_forward ); g_settings.mpkey_stop = tconfig->getInt32( "mpkey.stop", CRCInput::RC_stop ); -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause ); g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); #elif BOXMODEL_VUPLUS_ALL diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 28f7e8c4b..fd35b5348 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -899,7 +899,7 @@ unsigned int revert_translate(unsigned int code) case RC_page_down: return KEY_CHANNELDOWN; #ifdef HAVE_ARM_HARDWARE -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS case RC_favorites: return KEY_VIDEO; #endif diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp index 0f5b25283..e585910cc 100644 --- a/src/system/helpers.cpp +++ b/src/system/helpers.cpp @@ -2108,7 +2108,7 @@ int getActivePartition() } fclose(f); } -#elif BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS FILE *f; // first check for subdirboot layout f = fopen("/sys/firmware/devicetree/base/chosen/bootargs", "r");