diff --git a/acinclude.m4 b/acinclude.m4
index e19df1912..baa64691d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -488,7 +488,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, multibox, multiboxse, hd51, bre2ze4k, h7, e4hdultra, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
+AS_HELP_STRING([], [valid for armbox: hd60, hd61, multibox, multiboxse, hd51, bre2ze4k, h7, e4hdultra, protek4k, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]),
[case "${withval}" in
generic|raspi)
@@ -517,7 +517,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]),
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi
;;
- hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
+ hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|protek4k|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
if test "$BOXTYPE" = "armbox"; then
BOXMODEL="$withval"
else
@@ -563,6 +563,7 @@ AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
AM_CONDITIONAL(BOXMODEL_E4HDULTRA, test "$BOXMODEL" = "e4hdultra")
+AM_CONDITIONAL(BOXMODEL_PROTEK4K, test "$BOXMODEL" = "protek4k")
AM_CONDITIONAL(BOXMODEL_OSMINI4K, test "$BOXMODEL" = "osmini4k")
AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k")
@@ -641,6 +642,8 @@ elif test "$BOXMODEL" = "h7"; then
AC_DEFINE(BOXMODEL_H7, 1, [h7])
elif test "$BOXMODEL" = "e4hdultra"; then
AC_DEFINE(BOXMODEL_E4HDULTRA, 1, [e4hdultra])
+elif test "$BOXMODEL" = "protek4k"; then
+ AC_DEFINE(BOXMODEL_PROTEK4K, 1, [protek4k])
elif test "$BOXMODEL" = "osmini4k"; then
AC_DEFINE(BOXMODEL_OSMINI4K, 1, [osmini4k])
@@ -731,7 +734,7 @@ AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true")
# BOXMODELs that allows to change osd resolution
case "$BOXMODEL" in
- hd2|hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro)
+ hd2|hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|protek4k|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/oled/themes/Makefile.am b/data/oled/themes/Makefile.am
index de3af21c1..5d1b69eab 100644
--- a/data/oled/themes/Makefile.am
+++ b/data/oled/themes/Makefile.am
@@ -17,3 +17,6 @@ endif
if BOXMODEL_E4HDULTRA
SUBDIRS += 220x176
endif
+if BOXMODEL_PROTEK4K
+SUBDIRS += 220x176
+endif
diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index f24883a68..322070471 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -568,6 +568,7 @@ start-block~rc_variables
{=var-set:_rc_ax_hd61=23=}
{=var-set:_rc_maxytec_multiboxse=24=}
{=var-set:_rc_axas_e4hd=25=}
+{=var-set:_rc_protek_4k_uhd=26=}
end-block~rc_variables
# ------- Remote
@@ -605,9 +606,10 @@ start-block~remote
{=if-equal:{=var-get:boxtype=}~AX HD61~ {=include-block:Y_Blocks.txt;rc_ax_hd61=}~
{=if-equal:{=var-get:boxtype=}~Maxytec Multibox SE 4K~ {=include-block:Y_Blocks.txt;rc_mutant_hd60=}~
{=if-equal:{=var-get:boxtype=}~AXAS E4HD 4K ULTRA~ {=include-block:Y_Blocks.txt;rc_axas_e4hd=}~
+ {=if-equal:{=var-get:boxtype=}~Protek 4K UHD~ {=include-block:Y_Blocks.txt;rc_axas_e4hd=}~
{=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=}~
@@ -637,9 +639,10 @@ start-block~remote
{=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=}~
{=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_axas_e4hd=}~ {=include-block:Y_Blocks.txt;rc_axas_e4hd=}~
+ {=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_protek_4k_uhd=}~ {=include-block:Y_Blocks.txt;rc_axas_e4hd=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
- =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
+ =}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
=}
end-block~remote
diff --git a/data/y-web/Y_Settings_yWeb.yhtm b/data/y-web/Y_Settings_yWeb.yhtm
index f13e0e692..3b111ad01 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/simple_display.cpp b/src/driver/simple_display.cpp
index 4641c012e..2cc55b021 100644
--- a/src/driver/simple_display.cpp
+++ b/src/driver/simple_display.cpp
@@ -45,7 +45,7 @@ static bool timer_icon = false;
#endif
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
-#if BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE
+#if BOXMODEL_E4HDULTRA || BOXMODEL_PROTEK4K || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE
#define DISPLAY_DEV "/dev/null"
#else
#define DISPLAY_DEV "/dev/dbox/oled0"
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 3d036f839..287b30028 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -263,7 +263,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
{ VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" }
};
-#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_E4HDULTRA || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_VUPLUS_ALL
+#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_E4HDULTRA || BOXMODEL_PROTEK4K || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_VUPLUS_ALL
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
{
{ -1, NONEXISTANT_LOCALE, "NTSC" },
diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp
index 2494ffc90..f1bbf0f43 100644
--- a/src/system/helpers.cpp
+++ b/src/system/helpers.cpp
@@ -2029,7 +2029,7 @@ int getActivePartition()
}
fclose(f);
}
-#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_E4HDULTRA || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
+#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_E4HDULTRA || BOXMODEL_PROTEK4K || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
FILE *f;
// first check for subdirboot layout
f = fopen("/sys/firmware/devicetree/base/chosen/bootargs", "r");
diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index f750568e6..685565956 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -351,7 +351,7 @@ void CFrontend::Init(void)
secSetTone(SEC_TONE_OFF, 20);
setDiseqcType((diseqc_t) config.diseqcType, true);
setTsidOnid(0);
-#if BOXMODEL_E4HDULTRA
+#if BOXMODEL_E4HDULTRA || BOXMODEL_PROTEK4K
secSetVoltage(SEC_VOLTAGE_OFF, 50);
#endif
mutex.unlock();