mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

build vuplus arm with dvbs2x

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/scan_setup.cpp
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
@@ -201,8 +208,7 @@ const CMenuOptionChooser::keyval TERRSETUP_SCANTP_FEC[TERRSETUP_SCANTP_FEC_COUNT
{ 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_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

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

@@ -95,7 +95,9 @@ typedef enum dvb_fec {
f3_5,
f4_5,
f9_10,
fNone = 15,
fNone = 15
#if BOXMODEL_VUPLUS_ARM
,
f13_45,
f9_20,
f11_20,
@@ -114,6 +116,7 @@ typedef enum dvb_fec {
f2_3_L,
f5_9_L,
f26_45_L
#endif
} dvb_fec_t;
static fe_sec_voltage_t unicable_lowvolt = SEC_VOLTAGE_13;
@@ -296,11 +299,13 @@ void CFrontend::getFEInfo(void)
fe_can_multistream = info.caps & FE_CAN_MULTISTREAM;
printf("[fe%d/%d] add delivery system DVB-S2 (delivery_system: %d / Multistream: %s)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i], fe_can_multistream ? "yes" :"no");
break;
#if BOXMODEL_VUPLUS_ARM
case SYS_DVBS2X:
deliverySystemMask |= DVB_S2X;
fe_can_multistream = info.caps & FE_CAN_MULTISTREAM;
printf("[fe%d/%d] add delivery system DVB-S2X (delivery_system: %d / Multistream: %s)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i], fe_can_multistream ? "yes" :"no");
break;
#endif
case SYS_DTMB:
deliverySystemMask |= DTMB;
printf("[fe%d/%d] add delivery system DTMB (delivery_system: %d)\n", adapter, fenumber, (fe_delivery_system_t)prop[0].u.buffer.data[i]);
@@ -482,6 +487,7 @@ fe_code_rate_t CFrontend::getCodeRate(const uint8_t fec_inner, delivery_system_t
case f9_10:
fec = FEC_9_10;
break;
#if BOXMODEL_VUPLUS_ARM
case f13_45:
fec = FEC_13_45;
break;
@@ -536,6 +542,7 @@ fe_code_rate_t CFrontend::getCodeRate(const uint8_t fec_inner, delivery_system_t
case f26_45_L:
fec = FEC_26_45_L;
break;
#endif
default:
if (zapit_debug)
printf("no valid fec for DVB-S2/DVB-S2X set!\n");
@@ -1007,9 +1014,11 @@ void CFrontend::getDelSys(delivery_system_t delsys, int f, int m, const char *&f
case PSK_8:
mod = "8PSK";
break;
#if BOXMODEL_VUPLUS_ARM
case APSK_8:
mod = "8APSK";
break;
#endif
case APSK_16:
mod = "16APSK";
break;
@@ -1123,6 +1132,7 @@ void CFrontend::getDelSys(delivery_system_t delsys, int f, int m, const char *&f
fec = "0";
break;
#endif
#if BOXMODEL_VUPLUS_ARM
case FEC_13_45:
fec = "13/45";
break;
@@ -1177,6 +1187,7 @@ void CFrontend::getDelSys(delivery_system_t delsys, int f, int m, const char *&f
case FEC_26_45_L:
fec = "26/45L";
break;
#endif
default:
INFO("[frontend] getDelSys: unknown FEC: %d !!!\n", f);
/* fall through */
@@ -1416,6 +1427,7 @@ int CFrontend::setFrontend(const FrontendParameters *feparams, bool nowait)
fec = FEC_NONE;
break;
#endif
#if BOXMODEL_VUPLUS_ARM
case FEC_13_45:
fec = FEC_13_45;
break;
@@ -1470,6 +1482,7 @@ int CFrontend::setFrontend(const FrontendParameters *feparams, bool nowait)
case FEC_26_45_L:
fec = FEC_26_45_L;
break;
#endif
default:
INFO("[fe%d/%d] DEMOD: unknown FEC: %d\n", adapter, fenumber, fec_inner);
/* fall through */

2
src/zapit/src/getservices.cpp
View File

@@ -725,9 +725,11 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr
case 2: // 8PSK
feparams.modulation = PSK_8;
break;
#if BOXMODEL_VUPLUS_ARM
case 3: // 8APSK
feparams.modulation = APSK_8;
break;
#endif
case 4: // 16APSK
feparams.modulation = APSK_16;
break;