diff --git a/data/initial/frontend.conf b/data/initial/frontend.conf index 013cef302..659df2bc0 100644 --- a/data/initial/frontend.conf +++ b/data/initial/frontend.conf @@ -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 diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 0382186e6..a8b58d7ec 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2647,7 +2647,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 diff --git a/data/locale/english.locale b/data/locale/english.locale index 209878f97..e6a414609 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2647,7 +2647,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 diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index d03f890b6..0e3bf2292 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -1144,11 +1144,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); @@ -1157,16 +1157,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; } diff --git a/src/system/locals.h b/src/system/locals.h index a74b9d920..acc3ab374 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2674,7 +2674,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, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index dd2a21135..b7f9cf947 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2674,7 +2674,7 @@ const char * locale_real_names[] = "unicable.lnb", "unicable.pin", "unicable.pin_hint", - "unicable.qrg", + "unicable.freq", "unicable.scr", "unit.decimal", "unit.long.years", diff --git a/src/zapit/include/zapit/frontend_types.h b/src/zapit/include/zapit/frontend_types.h index 39e684f91..d3e288aff 100644 --- a/src/zapit/include/zapit/frontend_types.h +++ b/src/zapit/include/zapit/frontend_types.h @@ -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; diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index d00a1aae9..c6393ef18 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -253,7 +253,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); @@ -358,7 +358,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); diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index 0cbcab8ec..ddf595ec9 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -249,16 +249,17 @@ CFrontend::CFrontend(int Number, int Adapter) currentDiseqc = 255; 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_lnb = 0; /* for two-position switches */ - config.uni_pin = -1; /* for MDU setups */ - config.highVoltage = false; - config.motorRotationSpeed = 0; //in 0.1 degrees per second + config.uni_scr = 0; /* the unicable SCR address 0-7 */ + 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; + config.motorRotationSpeed = 0; //in 0.1 degrees per second + + feTimeout = 40; + currentVoltage = SEC_VOLTAGE_OFF; + currentToneMode = SEC_TONE_ON; - feTimeout = 40; - currentVoltage = SEC_VOLTAGE_OFF; - currentToneMode = SEC_TONE_ON; /* some broken hardware (a coolstream neo on my desk) does not lower * the voltage below 18V without enough DC load on the coax cable. * with unicable bus setups, there is no DC load on the coax... leading @@ -1973,7 +1974,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); @@ -1995,7 +1996,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 */ @@ -2016,7 +2017,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 }; @@ -2030,7 +2031,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) */