build vuplus arm with dvbs2x

Origin commit data
------------------
Branch: ni/coolstream
Commit: d180074418
Author: max_10 <max_10@gmx.de>
Date: 2021-12-19 (Sun, 19 Dec 2021)

Origin message was:
------------------
- build vuplus arm with dvbs2x

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2021-12-19 23:12:03 +01:00
committed by vanhofen
parent b85fa16bc3
commit 83c46506c4
3 changed files with 35 additions and 8 deletions

View File

@@ -133,7 +133,11 @@ const CMenuOptionChooser::keyval TERRSETUP_SCANTP_DELSYS[TERRSETUP_SCANTP_DELSYS
{ ISDBT, LOCALE_EXTRA_TP_DELSYS_ISDBT }
};
#if BOXMODEL_VUPLUS_ARM
#define SATSETUP_SCANTP_FEC_COUNT 28
#else
#define SATSETUP_SCANTP_FEC_COUNT 10
#endif
const CMenuOptionChooser::keyval SATSETUP_SCANTP_FEC[SATSETUP_SCANTP_FEC_COUNT] =
{
// S
@@ -147,8 +151,10 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_FEC[SATSETUP_SCANTP_FEC_COUNT]
{ FEC_3_5, LOCALE_EXTRA_FEC_3_5 },
{ FEC_4_5, LOCALE_EXTRA_FEC_4_5 },
{ FEC_8_9, LOCALE_EXTRA_FEC_8_9 },
{ FEC_9_10, LOCALE_EXTRA_FEC_9_10 },
{ FEC_9_10, LOCALE_EXTRA_FEC_9_10 }
#if BOXMODEL_VUPLUS_ARM
// S2X
,
{ FEC_13_45, LOCALE_EXTRA_FEC_13_45 },
{ FEC_9_20, LOCALE_EXTRA_FEC_9_20 },
{ FEC_11_20, LOCALE_EXTRA_FEC_11_20 },
@@ -167,6 +173,7 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_FEC[SATSETUP_SCANTP_FEC_COUNT]
{ FEC_2_3_L, LOCALE_EXTRA_FEC_2_3_L },
{ FEC_5_9_L, LOCALE_EXTRA_FEC_5_9_L },
{ FEC_26_45_L, LOCALE_EXTRA_FEC_26_45_L }
#endif
};
#if 0
@@ -178,7 +185,7 @@ const CMenuOptionChooser::keyval CABLESETUP_SCANTP_FEC[CABLESETUP_SCANTP_FEC_COU
{ FEC_3_4, LOCALE_EXTRA_FEC_3_4 },
{ FEC_5_6, LOCALE_EXTRA_FEC_5_6 },
{ FEC_7_8, LOCALE_EXTRA_FEC_7_8 },
{ FEC_AUTO, LOCALE_EXTRA_FEC_AUTO },
{ FEC_AUTO, LOCALE_EXTRA_FEC_AUTO }
};
#endif
@@ -198,11 +205,10 @@ const CMenuOptionChooser::keyval TERRSETUP_SCANTP_FEC[TERRSETUP_SCANTP_FEC_COUNT
{ FEC_AUTO, LOCALE_EXTRA_FEC_AUTO },
// DTMB ie
#if _HAVE_DVB57
{ FEC_2_5, LOCALE_EXTRA_FEC_2_5 },
{ FEC_2_5, LOCALE_EXTRA_FEC_2_5 },
#endif
{ FEC_3_5, LOCALE_EXTRA_FEC_3_5 },
{ FEC_4_5, LOCALE_EXTRA_FEC_4_5 },
{ FEC_3_5, LOCALE_EXTRA_FEC_3_5 },
{ FEC_4_5, LOCALE_EXTRA_FEC_4_5 }
};
#if _HAVE_DVB57
@@ -277,12 +283,18 @@ const CMenuOptionChooser::keyval TERRSETUP_SCANTP_TRANSMIT_MODE[TERRSETUP_SCANTP
{ TRANSMISSION_MODE_AUTO, LOCALE_EXTRA_TP_TRANSMIT_MODE_AUTO }
};
#if BOXMODEL_VUPLUS_ARM
#define SATSETUP_SCANTP_MOD_COUNT 6
#else
#define SATSETUP_SCANTP_MOD_COUNT 5
#endif
const CMenuOptionChooser::keyval SATSETUP_SCANTP_MOD[SATSETUP_SCANTP_MOD_COUNT] =
{
{ QPSK, LOCALE_EXTRA_TP_MOD_4 },
{ PSK_8, LOCALE_EXTRA_TP_MOD_8 },
#if BOXMODEL_VUPLUS_ARM
{ APSK_8, LOCALE_EXTRA_TP_MOD_8A },
#endif
{ APSK_16, LOCALE_EXTRA_TP_MOD_16A },
{ APSK_32, LOCALE_EXTRA_TP_MOD_32A },
{ QAM_AUTO, LOCALE_EXTRA_TP_MOD_AUTO }
@@ -368,7 +380,7 @@ const CMenuOptionChooser::keyval SATSETUP_FRONTEND_MODE[SATSETUP_FRONTEND_MODE_C
{ CFrontend::FE_MODE_INDEPENDENT, LOCALE_SATSETUP_FE_MODE_INDEPENDENT },
{ CFrontend::FE_MODE_MASTER, LOCALE_SATSETUP_FE_MODE_MASTER },
{ CFrontend::FE_MODE_LINK_LOOP, LOCALE_SATSETUP_FE_MODE_LINK_LOOP },
{ CFrontend::FE_MODE_LINK_TWIN, LOCALE_SATSETUP_FE_MODE_LINK_TWIN },
{ CFrontend::FE_MODE_LINK_TWIN, LOCALE_SATSETUP_FE_MODE_LINK_TWIN }
};
#define FRONTEND_FORCE_MODE_COUNT 3