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

rename unicable qrg to unicable freq for more plausibility

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59252156a9
Author: Frankenstone <dampf_acc@online.de>
Date: 2020-05-29 (Fri, 29 May 2020)


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

------------------
This commit was generated by Migit
This commit is contained in:
Frankenstone
2020-05-29 00:44:16 +02:00
committed by vanhofen
parent ebe7e38d40
commit d57c8a9533
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/initial/frontend.conf
View File

@@ -5,7 +5,7 @@ fe0_lastSatellitePosition=360
fe0_motorRotationSpeed=18
fe0_position_192=192,-1,-1,-1,0,0,9750,10600,11700,0,0,1
fe0_satellites=192
fe0_uni_qrg=0
fe0_uni_freq=0
fe0_uni_scr=-1
fe0_mode=1
fe1_diseqcRepeats=0
@@ -15,6 +15,6 @@ fe1_lastSatellitePosition=360
fe1_motorRotationSpeed=18
fe1_position_192=192,-1,-1,-1,0,0,9750,10600,11700,0,0,1
fe1_satellites=192
fe1_uni_qrg=0
fe1_uni_freq=0
fe1_uni_scr=-1
fe1_mode=0

2
data/locale/deutsch.locale
View File

@@ -2834,7 +2834,7 @@ tunersetup.terr Terrestrisch (DVB-T/T2)
unicable.lnb Unicable Eingang
unicable.pin Unicable PIN
unicable.pin_hint PIN (1 - 255) für Benutzerfrequenz\n0 bedeutet inaktiv / aus
unicable.qrg Unicable Frequenz
unicable.freq Unicable Frequenz
unicable.scr Unicable SCR
unit.decimal ,
unit.long.years Jahre

2
data/locale/english.locale
View File

@@ -2834,7 +2834,7 @@ tunersetup.terr Terrestrial (DVB-T/T2)
unicable.lnb Unicable Input
unicable.pin Unicable PIN
unicable.pin_hint PIN (1 - 255) for user frequency\n0 means inactive / off
unicable.qrg Unicable Frequency
unicable.freq Unicable Frequency
unicable.scr Unicable SCR
unit.decimal .
unit.long.years years

10
src/gui/scan_setup.cpp
View File

@@ -1157,11 +1157,11 @@ int CScanSetup::showUnicableSetup()
CFrontend *fe = CFEManager::getInstance()->getFE(fenumber);
frontend_config_t &fe_config = fe->getConfig();
int unicable_scr = fe_config.uni_scr;
int unicable_qrg = fe_config.uni_qrg;
int unicable_freq = fe_config.uni_freq;
int unicable_pin = fe_config.uni_pin;
CMenuOptionNumberChooser *uniscr = new CMenuOptionNumberChooser(LOCALE_UNICABLE_SCR, &unicable_scr, true, 0, dmode == DISEQC_UNICABLE ? 7 : 31);
CIntInput *uniqrg = new CIntInput(LOCALE_UNICABLE_QRG, &unicable_qrg, 4, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
CIntInput *unifreq = new CIntInput(LOCALE_UNICABLE_FREQ, &unicable_freq, 4, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
CMenuOptionNumberChooser *unipin = new CMenuOptionNumberChooser(LOCALE_UNICABLE_PIN, &unicable_pin, true, 0, 255, NULL, CRCInput::RC_nokey, NULL, 0, 0, LOCALE_OPTIONS_OFF);
unipin->setNumericInput(true);
unipin->setHint("", LOCALE_UNICABLE_PIN_HINT);
@@ -1170,16 +1170,16 @@ int CScanSetup::showUnicableSetup()
uni_setup->addIntroItems();
uni_setup->addItem(uniscr);
CMenuForwarder *mf = new CMenuDForwarder(LOCALE_UNICABLE_QRG, true, uniqrg->getValue(), uniqrg);
CMenuForwarder *mf = new CMenuDForwarder(LOCALE_UNICABLE_FREQ, true, unifreq->getValue(), unifreq);
uni_setup->addItem(mf);
uni_setup->addItem(unipin);
res = uni_setup->exec(NULL, "");
delete uni_setup;
if (res) {
fe_config.uni_scr = unicable_scr;
fe_config.uni_qrg = unicable_qrg;
fe_config.uni_freq = unicable_freq;
fe_config.uni_pin = unicable_pin;
printf("%s: scr: %d qrg: %d pin: %d\n", __func__, unicable_scr, unicable_qrg, unicable_pin);
printf("%s: scr: %d freq: %d pin: %d\n", __func__, unicable_scr, unicable_freq, unicable_pin);
}
return res;
}

2
src/system/locals.h
View File

@@ -2861,7 +2861,7 @@ typedef enum
LOCALE_UNICABLE_LNB,
LOCALE_UNICABLE_PIN,
LOCALE_UNICABLE_PIN_HINT,
LOCALE_UNICABLE_QRG,
LOCALE_UNICABLE_FREQ,
LOCALE_UNICABLE_SCR,
LOCALE_UNIT_DECIMAL,
LOCALE_UNIT_LONG_YEARS,

2
src/system/locals_intern.h
View File

@@ -2861,7 +2861,7 @@ const char * locale_real_names[] =
"unicable.lnb",
"unicable.pin",
"unicable.pin_hint",
"unicable.qrg",
"unicable.freq",
"unicable.scr",
"unit.decimal",
"unit.long.years",

2
src/zapit/include/zapit/frontend_types.h
View File

@@ -145,7 +145,7 @@ typedef struct frontend_config {
int diseqcRepeats;
int diseqcType;
int uni_scr;
int uni_qrg;
int uni_freq;
int uni_lnb;
int uni_pin;
int motorRotationSpeed;

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

@@ -254,7 +254,7 @@ bool CFEManager::loadSettings()
fe_config.motorRotationSpeed = getConfigValue(fe, "motorRotationSpeed", 18);
fe_config.highVoltage = getConfigValue(fe, "highVoltage", 0);
fe_config.uni_scr = getConfigValue(fe, "uni_scr", 0);
fe_config.uni_qrg = getConfigValue(fe, "uni_qrg", 0);
fe_config.uni_freq = getConfigValue(fe, "uni_freq", 0);
fe_config.uni_pin = getConfigValue(fe, "uni_pin", 0);
fe_config.diseqc_order = getConfigValue(fe, "diseqc_order", UNCOMMITED_FIRST);
fe_config.use_usals = getConfigValue(fe, "use_usals", 0);
@@ -359,7 +359,7 @@ void CFEManager::saveSettings(bool write)
setConfigValue(fe, "motorRotationSpeed", fe_config.motorRotationSpeed);
setConfigValue(fe, "highVoltage", fe_config.highVoltage);
setConfigValue(fe, "uni_scr", fe_config.uni_scr);
setConfigValue(fe, "uni_qrg", fe_config.uni_qrg);
setConfigValue(fe, "uni_freq", fe_config.uni_freq);
setConfigValue(fe, "uni_pin", fe_config.uni_pin);
setConfigValue(fe, "diseqc_order", fe_config.diseqc_order);
setConfigValue(fe, "use_usals", fe_config.use_usals);

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

@@ -250,7 +250,7 @@ CFrontend::CFrontend(int Number, int Adapter)
config.diseqcType = NO_DISEQC;
config.diseqcRepeats = 0;
config.uni_scr = 0; /* the unicable SCR address 0-7 */
config.uni_qrg = 0; /* the unicable frequency in MHz */
config.uni_freq = 0; /* the unicable frequency in MHz */
config.uni_lnb = 0; /* for two-position switches */
config.uni_pin = -1; /* for MDU setups */
config.highVoltage = false;
@@ -1981,7 +1981,7 @@ void CFrontend::setInput(t_satellite_position satellitePosition, uint32_t freque
uint32_t CFrontend::sendEN50494TuningCommand(const uint32_t frequency, const int high_band,
const int horizontal, const int bank)
{
uint32_t bpf = config.uni_qrg;
uint32_t bpf = config.uni_freq;
int pin = config.uni_pin;
if (config.uni_scr < 0 || config.uni_scr > 7) {
WARN("uni_scr out of range (%d)", config.uni_scr);
@@ -2003,7 +2003,7 @@ uint32_t CFrontend::sendEN50494TuningCommand(const uint32_t frequency, const int
cmd.msg_len = 6;
}
uint32_t ret = (t + 350) * 4000 - frequency;
INFO("[fe%d/%d] 18V=%d 22k=%d freq=%d qrg=%d scr=%d bank=%d pin=%d ret=%d",
INFO("[fe%d/%d] 18V=%d 22k=%d freq=%d uni_freq=%d scr=%d bank=%d pin=%d ret=%d",
adapter, fenumber, horizontal, high_band, frequency, bpf, config.uni_scr, bank, pin, ret);
if (!slave && info.type == FE_QPSK) {
cmd.msg[3] = (config.uni_scr << 5); /* adress */
@@ -2024,7 +2024,7 @@ uint32_t CFrontend::sendEN50494TuningCommand(const uint32_t frequency, const int
uint32_t CFrontend::sendEN50607TuningCommand(const uint32_t frequency, const int high_band, const int horizontal, const int bank)
{
uint32_t bpf = config.uni_qrg;
uint32_t bpf = config.uni_freq;
int pin = config.uni_pin;
struct dvb_diseqc_master_cmd cmd = { {0x70, 0x00, 0x00, 0x00, 0x00, 0x00}, 4 };
@@ -2038,7 +2038,7 @@ uint32_t CFrontend::sendEN50607TuningCommand(const uint32_t frequency, const int
if (t < 0x800 && config.uni_scr >= 0 && config.uni_scr < 32)
{
uint32_t ret = bpf * 1000;
INFO("[unicable-JESS] 18V=%d TONE=%d, freq=%d qrg=%d scr=%d bank=%d pin=%d ret=%d", currentVoltage == SEC_VOLTAGE_18, currentToneMode == SEC_TONE_ON, frequency, bpf, config.uni_scr, bank, pin, ret);
INFO("[unicable-JESS] 18V=%d TONE=%d, freq=%d uni_freq=%d scr=%d bank=%d pin=%d ret=%d", currentVoltage == SEC_VOLTAGE_18, currentToneMode == SEC_TONE_ON, frequency, bpf, config.uni_scr, bank, pin, ret);
if (!slave && info.type == FE_QPSK)
{
cmd.msg[1] = ((config.uni_scr & 0x1F) << 3) | /* user band adress ( 0 to 31) */