Skip to content

Commit

Permalink
try to build (reverted from commit 427c8b5)
Browse files Browse the repository at this point in the history
  • Loading branch information
@koivo
koivo committed Mar 6, 2017
1 parent 95a12b7 commit f6b44e7
Show file tree
Hide file tree
Showing 8 changed files with 814 additions and 2,157 deletions.
829 changes: 226 additions & 603 deletions lib/dvb/db.cpp
View file

Large diffs are not rendered by default.

721 changes: 93 additions & 628 deletions lib/dvb/frontend.cpp
View file

Large diffs are not rendered by default.

26 changes: 2 additions & 24 deletions lib/dvb/frontendparms.h
View file
Expand Up @@ -4,10 +4,8 @@
#include <vector>

#include <dvbsi++/satellite_delivery_system_descriptor.h>
#include <dvbsi++/s2_satellite_delivery_system_descriptor.h>
#include <dvbsi++/cable_delivery_system_descriptor.h>
#include <dvbsi++/terrestrial_delivery_system_descriptor.h>
#include <dvbsi++/t2_delivery_system_descriptor.h>

#include <lib/python/swig.h>
#include <lib/dvb/idvb.h>
Expand All @@ -21,7 +19,6 @@ struct eDVBFrontendParametersSatellite
{
#ifndef SWIG
void set(const SatelliteDeliverySystemDescriptor &);
void set(const S2SatelliteDeliverySystemDescriptor &);
#endif
enum {
Polarisation_Horizontal, Polarisation_Vertical, Polarisation_CircularLeft, Polarisation_CircularRight
Expand Down Expand Up @@ -52,17 +49,10 @@ struct eDVBFrontendParametersSatellite
enum {
Pilot_Off, Pilot_On, Pilot_Unknown
};
enum {
Band_Unknown, Band_C, Band_Ka, Band_Ku
};
enum {
PLS_Root, PLS_Gold, PLS_Combo, PLS_Unknown
};

bool no_rotor_command_on_tune;
int frequency, symbol_rate;
int polarisation, fec, inversion, orbital_position, system, modulation, rolloff, pilot, is_id, pls_mode, pls_code;
int plp_id;
int polarisation, fec, inversion, orbital_position, system, modulation, rolloff, pilot;
};
SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersSatellite);

Expand Down Expand Up @@ -100,7 +90,6 @@ struct eDVBFrontendParametersTerrestrial
{
#ifndef SWIG
void set(const TerrestrialDeliverySystemDescriptor &);
void set(const T2DeliverySystemDescriptor &);
#endif
enum {
Bandwidth_8MHz, Bandwidth_7MHz, Bandwidth_6MHz, Bandwidth_Auto, Bandwidth_5MHz, Bandwidth_1_712MHz, Bandwidth_10MHz
Expand Down Expand Up @@ -148,7 +137,7 @@ struct eDVBFrontendParametersTerrestrial
int hierarchy;
int inversion;
int system;
int plp_id;
int plpid;
};
SWIG_ALLOW_OUTPUT_SIMPLE(eDVBFrontendParametersTerrestrial);

Expand Down Expand Up @@ -214,10 +203,6 @@ class eDVBTransponderData : public iDVBTransponderData
int getRolloff() const;
int getPilot() const;
int getSystem() const;
int getSystems() const;
int getIsId() const;
int getPLSMode() const;
int getPLSCode() const;
int getBandwidth() const;
int getCodeRateLp() const;
int getCodeRateHp() const;
Expand Down Expand Up @@ -250,10 +235,6 @@ class eDVBSatelliteTransponderData : public eDVBTransponderData
int getRolloff() const;
int getPilot() const;
int getSystem() const;
int getSystems() const;
int getIsId() const;
int getPLSMode() const;
int getPLSCode() const;
};

class eDVBCableTransponderData : public eDVBTransponderData
Expand All @@ -272,7 +253,6 @@ class eDVBCableTransponderData : public eDVBTransponderData
int getFecInner() const;
int getModulation() const;
int getSystem() const;
int getSystems() const;
};

class eDVBTerrestrialTransponderData : public eDVBTransponderData
Expand All @@ -296,7 +276,6 @@ class eDVBTerrestrialTransponderData : public eDVBTransponderData
int getHierarchyInformation() const;
int getPlpId() const;
int getSystem() const;
int getSystems() const;
};

class eDVBATSCTransponderData : public eDVBTransponderData
Expand All @@ -313,7 +292,6 @@ class eDVBATSCTransponderData : public eDVBTransponderData
int getFrequency() const;
int getModulation() const;
int getSystem() const;
int getSystems() const;
};

class eDVBFrontendData : public iDVBFrontendData
Expand Down
45 changes: 11 additions & 34 deletions lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
View file
Expand Up @@ -70,9 +70,9 @@ def __init__(self, session, feid):
self.feid = feid
self.oldref = None
log.open(self.LOG_SIZE)
if config.Nims[self.feid].dvbs.configMode.value == 'advanced':
if config.Nims[self.feid].configMode.value == 'advanced':
self.advanced = True
self.advancedconfig = config.Nims[self.feid].dvbs.advanced
self.advancedconfig = config.Nims[self.feid].advanced
self.advancedsats = self.advancedconfig.sat
self.availablesats = map(lambda x: x[0], nimmanager.getRotorSatListForNim(self.feid))
else:
Expand Down Expand Up @@ -117,10 +117,7 @@ def __init__(self, session, feid):
cur.get("system", eDVBFrontendParametersSatellite.System_DVB_S),
cur.get("modulation", eDVBFrontendParametersSatellite.Modulation_QPSK),
cur.get("rolloff", eDVBFrontendParametersSatellite.RollOff_alpha_0_35),
cur.get("pilot", eDVBFrontendParametersSatellite.Pilot_Unknown),
cur.get("is_id", 0),
cur.get("pls_mode", eDVBFrontendParametersSatellite.PLS_Root),
cur.get("pls_code", 0))
cur.get("pilot", eDVBFrontendParametersSatellite.Pilot_Unknown))

self.tuner.tune(tp)
self.isMoving = False
Expand Down Expand Up @@ -273,7 +270,7 @@ def createConfig(self):
self.printMsg(_("Using tuner %s") % chr(0x41 + self.feid))
if not self.advanced:
self.printMsg(_("Configuration mode: %s") % _("simple"))
nim = config.Nims[self.feid].dvbs
nim = config.Nims[self.feid]
self.sitelon = nim.longitude.float
self.longitudeOrientation = nim.longitudeOrientation.value
self.sitelat = nim.latitude.float
Expand Down Expand Up @@ -1066,7 +1063,7 @@ def __init__(self, session, feid, fe_data):
self.fe_data = fe_data
Screen.__init__(self, session)
ConfigListScreen.__init__(self, None)
self.createConfig()
self.createConfig(fe_data)
self.initialSetup()
self.createSetup()
self.tuning.sat.addNotifier(self.tuningSatChanged)
Expand All @@ -1079,7 +1076,7 @@ def __init__(self, session, feid, fe_data):
"cancel": self.keyCancel,
}, -2)

def createConfig(self):
def createConfig(self, frontendData):
satlist = nimmanager.getRotorSatListForNim(self.feid)
orb_pos = self.fe_data.get("orbital_position", None)
orb_pos_str = str(orb_pos)
Expand All @@ -1104,9 +1101,7 @@ def createConfig(self):
"polarization": eDVBFrontendParametersSatellite.Polarisation_Horizontal,
"fec": eDVBFrontendParametersSatellite.FEC_Auto,
"fec_s2": eDVBFrontendParametersSatellite.FEC_9_10,
"modulation": eDVBFrontendParametersSatellite.Modulation_QPSK,
"pls_mode": eDVBFrontendParametersSatellite.PLS_Root,
"pls_code": 0 }
"modulation": eDVBFrontendParametersSatellite.Modulation_QPSK }
if frontendData is not None:
ttype = frontendData.get("tuner_type", "UNKNOWN")
defaultSat["system"] = frontendData.get("system", eDVBFrontendParametersSatellite.System_DVB_S)
Expand All @@ -1118,9 +1113,6 @@ def createConfig(self):
defaultSat["fec_s2"] = frontendData.get("fec_inner", eDVBFrontendParametersSatellite.FEC_Auto)
defaultSat["rolloff"] = frontendData.get("rolloff", eDVBFrontendParametersSatellite.RollOff_alpha_0_35)
defaultSat["pilot"] = frontendData.get("pilot", eDVBFrontendParametersSatellite.Pilot_Unknown)
defaultSat["is_id"] = frontendData.get("is_id", 0)
defaultSat["pls_mode"] = frontendData.get("pls_mode", eDVBFrontendParametersSatellite.PLS_Root)
defaultSat["pls_code"] = frontendData.get("pls_code", 0)
else:
defaultSat["fec"] = frontendData.get("fec_inner", eDVBFrontendParametersSatellite.FEC_Auto)
defaultSat["modulation"] = frontendData.get("modulation", eDVBFrontendParametersSatellite.Modulation_QPSK)
Expand Down Expand Up @@ -1161,9 +1153,7 @@ def createConfig(self):
(eDVBFrontendParametersSatellite.FEC_9_10, "9/10")])
self.scan_sat.modulation = ConfigSelection(default = defaultSat["modulation"], choices = [
(eDVBFrontendParametersSatellite.Modulation_QPSK, "QPSK"),
(eDVBFrontendParametersSatellite.Modulation_8PSK, "8PSK"),
(eDVBFrontendParametersSatellite.Modulation_16APSK, "16APSK"),
(eDVBFrontendParametersSatellite.Modulation_32APSK, "32APSK")])
(eDVBFrontendParametersSatellite.Modulation_8PSK, "8PSK")])
self.scan_sat.rolloff = ConfigSelection(default = defaultSat.get("rolloff", eDVBFrontendParametersSatellite.RollOff_alpha_0_35), choices = [
(eDVBFrontendParametersSatellite.RollOff_alpha_0_35, "0.35"),
(eDVBFrontendParametersSatellite.RollOff_alpha_0_25, "0.25"),
Expand All @@ -1173,12 +1163,6 @@ def createConfig(self):
(eDVBFrontendParametersSatellite.Pilot_Off, _("Off")),
(eDVBFrontendParametersSatellite.Pilot_On, _("On")),
(eDVBFrontendParametersSatellite.Pilot_Unknown, _("Auto"))])
self.scan_sat.is_id = ConfigInteger(default = defaultSat.get("is_id",0), limits = (0, 255))
self.scan_sat.pls_mode = ConfigSelection(default = defaultSat["pls_mode"], choices = [
(eDVBFrontendParametersSatellite.PLS_Root, _("Root")),
(eDVBFrontendParametersSatellite.PLS_Gold, _("Gold")),
(eDVBFrontendParametersSatellite.PLS_Combo, _("Combo"))])
self.scan_sat.pls_code = ConfigInteger(default = defaultSat.get("pls_code",0), limits = (0, 262142))

def initialSetup(self):
currtp = self.transponderToString([None, self.scan_sat.frequency.value, self.scan_sat.symbolrate.value, self.scan_sat.polarization.value])
Expand Down Expand Up @@ -1212,10 +1196,6 @@ def createSetup(self):
self.list.append(self.modulationEntry)
self.list.append(getConfigListEntry(_('Roll-off'), self.scan_sat.rolloff))
self.list.append(getConfigListEntry(_('Pilot'), self.scan_sat.pilot))
if nim.isMultistream():
self.list.append(getConfigListEntry(_('Input Stream ID'), self.scan_sat.is_id))
self.list.append(getConfigListEntry(_('PLS Mode'), self.scan_sat.pls_mode))
self.list.append(getConfigListEntry(_('PLS Code'), self.scan_sat.pls_code))
else: # "predefined_transponder"
self.list.append(getConfigListEntry(_("Transponder"), self.tuning.transponder))
currtp = self.transponderToString([None, self.scan_sat.frequency.value, self.scan_sat.symbolrate.value, self.scan_sat.polarization.value])
Expand Down Expand Up @@ -1261,7 +1241,7 @@ def keyRight(self):
ConfigListScreen.keyRight(self)

def keyGo(self):
returnvalue = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
returnvalue = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
satpos = int(self.tuning.sat.value)
if self.tuning.type.value == "manual_transponder":
if self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S2:
Expand All @@ -1278,14 +1258,11 @@ def keyGo(self):
self.scan_sat.system.value,
self.scan_sat.modulation.value,
self.scan_sat.rolloff.value,
self.scan_sat.pilot.value,
self.scan_sat.is_id.value,
self.scan_sat.pls_mode.value,
self.scan_sat.pls_code.value)
self.scan_sat.pilot.value)
elif self.tuning.type.value == "predefined_transponder":
transponder = nimmanager.getTransponders(satpos)[self.tuning.transponder.index]
returnvalue = (transponder[1] / 1000, transponder[2] / 1000,
transponder[3], transponder[4], 2, satpos, transponder[5], transponder[6], transponder[8], transponder[9], transponder[10], transponder[11], transponder[12])
transponder[3], transponder[4], 2, satpos, transponder[5], transponder[6], transponder[8], transponder[9])
self.close(returnvalue)

def keyCancel(self):
Expand Down

0 comments on commit f6b44e7

Please sign in to comment.