more s2x stuff

Origin commit data
------------------
Branch: ni/coolstream
Commit: 674e842687
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2019-12-31 (Tue, 31 Dec 2019)


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

------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2019-12-31 00:25:09 +01:00
committed by vanhofen
parent 303c3010d4
commit c1ba54dde2
11 changed files with 659 additions and 69 deletions

View File

@@ -104,11 +104,12 @@ const CMenuOptionChooser::keyval SATSETUP_DISEQC_OPTIONS[SATSETUP_DISEQC_OPTION_
// { SMATV_REMOTE_TUNING, LOCALE_SATSETUP_SMATVREMOTE }
};
#define SATSETUP_SCANTP_DELSYS_COUNT 5
#define SATSETUP_SCANTP_DELSYS_COUNT 6
const CMenuOptionChooser::keyval SATSETUP_SCANTP_DELSYS[SATSETUP_SCANTP_DELSYS_COUNT] =
{
{ DVB_S, LOCALE_EXTRA_TP_DELSYS_DVBS },
{ DVB_S2, LOCALE_EXTRA_TP_DELSYS_DVBS2 },
{ DVB_S2X, LOCALE_EXTRA_TP_DELSYS_DVBS2X },
{ DSS, LOCALE_EXTRA_TP_DELSYS_DSS },
{ ISDBS, LOCALE_EXTRA_TP_DELSYS_ISDBS },
{ TURBO, LOCALE_EXTRA_TP_DELSYS_TURBO }
@@ -130,22 +131,40 @@ const CMenuOptionChooser::keyval TERRSETUP_SCANTP_DELSYS[TERRSETUP_SCANTP_DELSYS
{ ISDBT, LOCALE_EXTRA_TP_DELSYS_ISDBT }
};
#define SATSETUP_SCANTP_FEC_COUNT 10
//#define CABLESETUP_SCANTP_FEC_COUNT 5
#define SATSETUP_SCANTP_FEC_COUNT 28
const CMenuOptionChooser::keyval SATSETUP_SCANTP_FEC[SATSETUP_SCANTP_FEC_COUNT] =
{
// S
{ FEC_1_2, LOCALE_EXTRA_FEC_1_2 },
{ FEC_2_3, LOCALE_EXTRA_FEC_2_3 },
{ 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_1_2, LOCALE_EXTRA_FEC_1_2 },
{ FEC_2_3, LOCALE_EXTRA_FEC_2_3 },
{ 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 },
// S2
{ 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_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 },
// 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 },
{ FEC_23_36, LOCALE_EXTRA_FEC_23_36 },
{ FEC_25_36, LOCALE_EXTRA_FEC_25_36 },
{ FEC_13_18, LOCALE_EXTRA_FEC_13_18 },
{ FEC_26_45, LOCALE_EXTRA_FEC_26_45 },
{ FEC_28_45, LOCALE_EXTRA_FEC_28_45 },
{ FEC_7_9, LOCALE_EXTRA_FEC_7_9 },
{ FEC_77_90, LOCALE_EXTRA_FEC_77_90 },
{ FEC_32_45, LOCALE_EXTRA_FEC_32_45 },
{ FEC_11_15, LOCALE_EXTRA_FEC_11_15 },
{ FEC_1_2_L, LOCALE_EXTRA_FEC_1_2_L },
{ FEC_8_15_L, LOCALE_EXTRA_FEC_8_15_L },
{ FEC_3_5_L, LOCALE_EXTRA_FEC_3_5_L },
{ 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 }
};
#if 0
@@ -256,11 +275,14 @@ const CMenuOptionChooser::keyval TERRSETUP_SCANTP_TRANSMIT_MODE[TERRSETUP_SCANTP
{ TRANSMISSION_MODE_AUTO, LOCALE_EXTRA_TP_TRANSMIT_MODE_AUTO }
};
#define SATSETUP_SCANTP_MOD_COUNT 3
#define SATSETUP_SCANTP_MOD_COUNT 6
const CMenuOptionChooser::keyval SATSETUP_SCANTP_MOD[SATSETUP_SCANTP_MOD_COUNT] =
{
{ QPSK, LOCALE_EXTRA_TP_MOD_4 },
{ PSK_8, LOCALE_EXTRA_TP_MOD_8 },
{ APSK_8, LOCALE_EXTRA_TP_MOD_8A },
{ APSK_16, LOCALE_EXTRA_TP_MOD_16A },
{ APSK_32, LOCALE_EXTRA_TP_MOD_32A },
{ QAM_AUTO, LOCALE_EXTRA_TP_MOD_AUTO }
};