mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- add support for VU+ Solo 4k

Browse Source
This commit is contained in:
BPanther
2018-11-01 22:21:20 +01:00
committed by Thilo Graf
parent 50bf6c27c8
commit af87ebc788
10 changed files with 102 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
acinclude.m4
View File

@@ -418,6 +418,10 @@ AC_ARG_WITH(boxtype,
tripledragon|coolstream|spark|azbox|generic|armbox)
BOXTYPE="$withval"
;;
vusolo4k)
BOXTYPE="armbox"
BOXMODEL="$withval"
;;
*)
AC_MSG_ERROR([bad value $withval for --with-boxtype])
;;
@@ -426,7 +430,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])
AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k])
AS_HELP_STRING([], [valid for generic: raspi]),
[case "${withval}" in
hd1|hd2)
@@ -448,6 +452,13 @@ AS_HELP_STRING([], [valid for generic: raspi]),
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi
;;
vusolo4k)
if test "$BOXTYPE" = "armbox"; then
BOXMODEL="$withval"
else
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi
;;
hd51|hd60)
if test "$BOXTYPE" = "armbox"; then
BOXMODEL="$withval"
@@ -482,6 +493,7 @@ 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_RASPI, test "$BOXMODEL" = "raspi")
@@ -511,6 +523,9 @@ 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" = "vusolo4k"; then
AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
elif test "$BOXMODEL" = "raspi"; then
AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
fi

59
data/y-web/Y_Blocks.txt
View File

@@ -524,9 +524,10 @@ start-block~remote
{=if-equal:{=var-get:boxtype=}~CST Trinity Duo~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=if-equal:{=var-get:boxtype=}~AX-Technologies HD51~{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
{=if-equal:{=var-get:boxtype=}~Mutant HD51~ {=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
{=if-equal:{=var-get:boxtype=}~VU SOLO4K~ {=include-block:Y_Blocks.txt;rc_vusolo4k=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}=}=}=}=}
=}=}=}=}=}=}=}=}=}=}=}
=}=}
~
{=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~
@@ -541,9 +542,10 @@ start-block~remote
{=if-equal:{=var-get:yfbtype=}~8~ {=include-block:Y_Blocks.txt;rc_cst_v6=}~
{=if-equal:{=var-get:yfbtype=}~9~ {=include-block:Y_Blocks.txt;rc_ax_hd51=}~
{=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_vusolo4k=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}=}=}=}=}=}=}
=}=}=}=}=}=}=}=}=}=}=}=}=}
=}
end-block~remote
@@ -1051,3 +1053,56 @@ start-block~rc_mutant_hd51
<area shape="rect" coords="124,554,148,570" href="javascript:rcsim('KEY_PAUSE')" />
</map>
end-block~rc_mutant_hd51
# ------ Remote VU Solo 4K
start-block~rc_vusolo4k
<img src="images/rc_vusolo4k.png" usemap="#rc"/>
<map name="rc" id="rc">
<!--<area shape="circle" coords="33,28,10" id="113" alt="v1_mute" href="javascript:rcsim('KEY_POWER_TV');">-->
<area shape="circle" coords="105,28,10" id ="116" alt="Power" href="javascript:rcsim('KEY_POWER');">
<area shape="circle" coords="33,53,10" id ="388" alt="text" href="javascript:rcsim('KEY_TEXT');">
<area shape="circle" coords="58,53,10" id ="370" alt="subtitle" href="javascript:rcsim('KEY_SUB');">
<!--<area shape="circle" coords="82,53,10" id ="102" alt="v1_home" href="javascript:rcsim('KEY_HOME');">-->
<!--<area shape="circle" coords="105,53,10" id ="107" alt="v1_end" href="javascript:rcsim('107');">-->
<area shape="circle" coords="105,53,10" id ="107" alt="mute" href="javascript:rcsim('KEY_MUTE');">
<area shape="circle" coords="38,79,10" id ="2" alt="1" href="javascript:rcsim('KEY_1');">
<area shape="circle" coords="70,79,10" id ="3" alt="2" href="javascript:rcsim('KEY_2');">
<area shape="circle" coords="102,79,10" id ="4" alt="3" href="javascript:rcsim('KEY_3');">
<area shape="circle" coords="38,106,10" id ="5" alt="4" href="javascript:rcsim('KEY_4');">
<area shape="circle" coords="70,106,10" id ="6" alt="5" href="javascript:rcsim('KEY_5');">
<area shape="circle" coords="102,106,10" id ="7" alt="6" href="javascript:rcsim('KEY_6');">
<area shape="circle" coords="38,133,10" id ="8" alt="7" href="javascript:rcsim('KEY_7');">
<area shape="circle" coords="70,133,10" id ="9" alt="8" href="javascript:rcsim('KEY_8');">
<area shape="circle" coords="102,133,10" id ="10" alt="9" href="javascript:rcsim('9');">
<area shape="circle" coords="38,161,10" id ="412" alt="previous" href="javascript:rcsim('KEY_PREVIOUS');">
<area shape="circle" coords="70,161,10" id ="11" alt="0" href="javascript:rcsim('KEY_0');">
<area shape="circle" coords="102,161,10" id ="407" alt="next" href="javascript:rcsim('KEY_NEXT');">
<area shape="circle" coords="33,186,10" id ="398" alt="red" href="javascript:rcsim('KEY_RED');">
<area shape="circle" coords="58,186,10" id ="399" alt="green" href="javascript:rcsim('KEY_GREEN');">
<area shape="circle" coords="82,186,10" id ="400" alt="yellow" href="javascript:rcsim('KEY_YELLOW');">
<area shape="circle" coords="105,186,10" id ="401" alt="blue" href="javascript:rcsim('KEY_BLUE');">
<area shape="circle" coords="70,220,10" id ="103" alt="up" href="javascript:rcsim('KEY_UP');">
<area shape="circle" coords="35,255,10" id ="105" alt="left" href="javascript:rcsim('KEY_LEFT');">
<area shape="circle" coords="70,255,10" id ="352" alt="OK" href="javascript:rcsim('KEY_OK');">
<area shape="circle" coords="105,255,10" id ="106" alt="right" href="javascript:rcsim('KEY_RIGHT');">
<area shape="circle" coords="70,288,10" id ="108" alt="down" href="javascript:rcsim('KEY_DOWN');">
<area shape="circle" coords="40,316,10" id ="115" alt="volume up" href="javascript:rcsim('KEY_VOLUMEUP');">
<area shape="circle" coords="70,319,10" id ="174" alt="exit" href="javascript:rcsim('KEY_HOME');">
<area shape="circle" coords="99,316,10" id ="402" alt="channelup" href="javascript:rcsim('KEY_PAGEUP');">
<area shape="circle" coords="40,346,10" id ="114" alt="volume down" href="javascript:rcsim('KEY_VOLUMEDOWN');">
<area shape="circle" coords="70,343,10" id ="358" alt="epg" href="javascript:rcsim('KEY_INFO');"><!-- KEY_INFO = KEY_EPG -->
<area shape="circle" coords="99,346,10" id ="403" alt="channeldown" href="javascript:rcsim('KEY_PAGEDOWN');">
<area shape="circle" coords="36,375,10" id ="139" alt="menu" href="javascript:rcsim('KEY_MENU');">
<area shape="circle" coords="59,375,10" id ="393" alt="videoaltlast" href="javascript:rcsim('KEY_FAVORITES');">
<area shape="circle" coords="81,375,10" id ="392" alt="audio" href="javascript:rcsim('KEY_AUDIO');">
<area shape="circle" coords="104,375,10" id ="138" alt="help" href="javascript:rcsim('KEY_HELP');">
<area shape="circle" coords="36,397,10" id ="168" alt="rewind" href="javascript:rcsim('KEY_REWIND');">
<area shape="circle" coords="59,397,10" id ="207" alt="play" href="javascript:rcsim('KEY_PLAY');">
<area shape="circle" coords="81,397,10" id ="119" alt="pause" href="javascript:rcsim('KEY_PAUSE');">
<area shape="circle" coords="104,397,10" id ="208" alt="forward" href="javascript:rcsim('KEY_FORWARD');">
<area shape="circle" coords="36,422,10" id ="377" alt="tv" href="javascript:rcsim('KEY_TV');">
<area shape="circle" coords="59,422,10" id ="167" alt="record" href="javascript:rcsim('KEY_RECORD');">
<area shape="circle" coords="81,422,10" id ="128" alt="stop" href="javascript:rcsim('KEY_STOP');">
<area shape="circle" coords="104,422,10" id ="385" alt="radio" href="javascript:rcsim('KEY_RADIO');">
</map>
end-block~rc_vusolo4k

2
data/y-web/Y_Settings_yWeb.yhtm
View File

@@ -42,6 +42,7 @@ function do_init(){
case "8": // cst trinity duo
case "9": // ax hd51
case "10": // mutant hd51
case "11": // vusolo4k
sel=(sel*1+val*1);
break;
default:
@@ -131,6 +132,7 @@ select {
<option value="8">CST HD-2 | Trinity Duo</option>
<option value="9">AX | HD51</option>
<option value="10">Mutant | HD51</option>
<option value="11">VU | Solo 4K</option>
</select>
</td>
</tr>

6
data/y-web/images/Makefile.am
View File

@@ -91,11 +91,15 @@ install_DATA += rc_cst_v1.jpg \
rc_cst_v6.png
endif
if BOXTYPE_ARMBOX
if BOXMODEL_HD51
install_DATA += rc_ax_hd51.png \
rc_mutant_hd51.png
endif
if BOXMODEL_VUSOLO4K
install_DATA += rc_vusolo4k.png
endif
# file manager
install_DATA += chmod.png \
copy.gif \

BIN
data/y-web/images/rc_vusolo4k.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

5
src/driver/rcinput.h
View File

@@ -223,8 +223,13 @@ class CRCInput
RC_tv = KEY_TV,
RC_radio = KEY_RADIO,
RC_text = KEY_TEXT,
#if defined BOXMODEL_VUSOLO4K
RC_info = 0xFFFE,
RC_epg = KEY_INFO,
#else
RC_info = KEY_INFO,
RC_epg = KEY_EPG,
#endif
RC_recall = KEY_LAST,
RC_favorites = KEY_FAVORITES,
RC_sat = KEY_SAT,

4
src/gui/scan_setup.h
View File

@@ -66,7 +66,11 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
CGenericMenuActivate msettings;
CMenuOptionChooser * linkfe;
#if BOXMODEL_VUSOLO4K
std::string modestr[16];
#else
std::string modestr[4];
#endif
/* variables for selected frontend */
/* diseqc mode */

5
src/neutrino.cpp
View File

@@ -4852,9 +4852,12 @@ 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 HAVE_ARM_HARDWARE
#if BOXMODEL_HD51 || BOXMODEL_HD60
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
g_settings.mpkey_play = tconfig.getInt32( "mpkey.play", CRCInput::RC_play );
g_settings.mpkey_pause = tconfig.getInt32( "mpkey.pause", CRCInput::RC_playpause );
#else
g_settings.mpkey_play = tconfig.getInt32( "mpkey.play", CRCInput::RC_play );
g_settings.mpkey_pause = tconfig.getInt32( "mpkey.pause", CRCInput::RC_pause );

5
src/zapit/include/zapit/femanager.h
View File

@@ -31,8 +31,13 @@
#include <OpenThreads/ReentrantMutex>
#ifdef BOXMODEL_VUSOLO4K
#define MAX_FE 16
#define MAX_ADAPTERS 4
#else
#define MAX_FE 4
#define MAX_ADAPTERS 4
#endif
//#define DYNAMIC_DEMUX
//#define MAKE_FE_KEY(adapter, number) ((adapter << 8) | (number & 0xFF))

4
src/zapit/src/frontend.cpp
View File

@@ -1225,7 +1225,11 @@ 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 defined BOXMODEL_VUSOLO4K
pilot = PILOT_AUTO;
#else
pilot = PILOT_ON;
#endif
break;
case FEC_3_4:
fec = FEC_3_4;