Skip to content

Commit

Permalink
Add experimental support for dab/dab+ (#5)
Browse files Browse the repository at this point in the history 
* Add experimental support for DAB/DAB+

First experimental support for DAB/DAB+ using dab-cmdline library.
Currently only the first program supported using the first available channel.
More to come...

* add missing colon from if checks

* correctly switch between modulations

Also pass decimal to dictionary in order
to select the right frequency.

* use yellow to switch to next dab program

When modulation is dab, the yellow button will be used
to switch to next dab/dab+ program by writing a new line
on input. The dab example program now checks input for new line.

* Change to correct dab frequencies when descending too

* Make sure modulation is saved and frequency limits are honnored

* Rename yellow to Next Station when DAB/DAB+
  • Loading branch information
@athoik
athoik committed Dec 21, 2017
1 parent 8453c1c commit 3781003
Showing 1 changed file with 41 additions and 21 deletions.
62 changes: 41 additions & 21 deletions plugin/plugin.py 100755 → 100644
View file
Expand Up @@ -13,6 +13,7 @@
import json
import time
from decimal import Decimal
from collections import OrderedDict

config.sdgradio = ConfigSubsection()
config.sdgradio.last = ConfigText(default = "87.5")
Expand All @@ -28,7 +29,9 @@
config.sdgradio.i = ConfigText(default = "107.0")
config.sdgradio.j = ConfigText(default = "108.0")
config.sdgradio.rds = ConfigBoolean(default = False)
config.sdgradio.modulation = ConfigSelection(choices=[("fm", _("FM")), ("am", _("AM")), ("lsb", _("LSB")), ("usb", _("USB"))], default="fm")
config.sdgradio.modulation = ConfigSelection(choices=[("fm", _("FM")), ("am", _("AM")), ("lsb", _("LSB")), ("usb", _("USB")), ("dab", _("DAB/DAB+"))], default="fm")

DAB_FREQ = OrderedDict([(Decimal('174.928'), '5A'), (Decimal('176.64'), '5B'), (Decimal('178.352'), '5C'), (Decimal('180.064'), '5D'), (Decimal('181.936'), '6A'), (Decimal('183.648'), '6B'), (Decimal('185.36'), '6C'), (Decimal('187.072'), '6D'), (Decimal('188.928'), '7A'), (Decimal('190.64'), '7B'), (Decimal('192.352'), '7C'), (Decimal('194.064'), '7D'), (Decimal('195.936'), '8A'), (Decimal('197.648'), '8B'), (Decimal('199.36'), '8C'), (Decimal('201.072'), '8D'), (Decimal('202.928'), '9A'), (Decimal('204.64'), '9B'), (Decimal('206.352'), '9C'), (Decimal('208.064'), '9D'), (Decimal('209.936'), '10A'), (Decimal('211.648'), '10B'), (Decimal('213.36'), '10C'), (Decimal('215.072'), '10D'), (Decimal('216.928'), '11A'), (Decimal('218.64'), '11B'), (Decimal('220.352'), '11C'), (Decimal('222.064'), '11D'), (Decimal('223.936'), '12A'), (Decimal('225.648'), '12B'), (Decimal('227.36'), '12C'), (Decimal('229.072'), '12D'), (Decimal('230.748'), '13A'), (Decimal('232.496'), '13B'), (Decimal('234.208'), '13C'), (Decimal('235.776'), '13D'), (Decimal('237.488'), '13E'), (Decimal('239.2'), '13F')])

try:
from enigma import addFont
Expand Down Expand Up @@ -111,10 +114,7 @@ def __init__(self, session):
self["prog_type"] = Label()
self["key_red"] = Label(config.sdgradio.modulation.getText())
self["key_green"] = Label(_("Save"))
if config.sdgradio.rds.value:
self["key_yellow"] = Label(_("RDS On"))
else:
self["key_yellow"] = Label(_("RDS Off"))
self["key_yellow"] = Label()
self["key_blue"] = Label(_("Log"))
self["info"] = Label(_("Info"))

Expand Down Expand Up @@ -169,6 +169,7 @@ def __init__(self, session):
self.onLayoutFinish.append(self.ShowPicture)

def PlayRadio(self, freq):
self.yellow_text()
self.doConsoleStop()
time.sleep(0.3)
self.Console = eConsoleAppContainer()
Expand All @@ -186,6 +187,8 @@ def PlayRadio(self, freq):
cmd = "rtl_fm -f %sM -M lsb -A std -s 3k -g 40 - | gst-launch-1.0 fdsrc ! audio/x-raw, format=S16LE, channels=1, layout=interleaved, rate=3000 ! audioresample ! audio/x-raw, format=S16LE, channels=1, layout=interleaved, rate=48000 ! dvbaudiosink" % freq
elif config.sdgradio.modulation.value == "usb":
cmd = "rtl_fm -f %sM -M usb -A std -s 3k -g 40 - | gst-launch-1.0 fdsrc ! audio/x-raw, format=S16LE, channels=1, layout=interleaved, rate=3000 ! audioresample ! audio/x-raw, format=S16LE, channels=1, layout=interleaved, rate=48000 ! dvbaudiosink" % freq
elif config.sdgradio.modulation.value == "dab":
cmd = "dab-rtlsdr-3 -C %s -W15 | gst-launch-1.0 fdsrc ! audio/x-raw, format=S16LE, channels=2, layout=interleaved, rate=48000 ! dvbaudiosink" % DAB_FREQ.get(Decimal(freq), '5A')
else:
cmd = "rtl_fm -f %sM -M wbfm -s 200000 -r 48000 - | gst-launch-1.0 fdsrc ! audio/x-raw, format=S16LE, channels=1, layout=interleaved, rate=48000 ! dvbaudiosink" % freq
print "[SDGRadio] PlayRadio cmd: %s" % cmd
Expand Down Expand Up @@ -233,6 +236,7 @@ def ShowPicture(self):

def ButtonSelect(self, number, freq):
self["freq"].setText(freq)
self.freqChange(Decimal(0))
self["radiotext"].setText("")
self["prog_type"].setText("")
self.setTitle("SDG Radio %s" % freq)
Expand All @@ -255,11 +259,20 @@ def buttonNumber(self, number):
def freqChange(self, value):
freq = self["freq"].getText()
newfreq = Decimal(freq) + value
if config.sdgradio.modulation == "fm":
if config.sdgradio.modulation.value == "fm":
if newfreq < Decimal("87.5"):
newfreq = Decimal("87.5")
if newfreq > Decimal("108.0"):
newfreq = Decimal("108.0")
elif config.sdgradio.modulation.value == "dab":
if newfreq < Decimal("174.928"):
newfreq = Decimal("174.928")
if newfreq > Decimal("239.2"):
newfreq = Decimal("239.2")
if newfreq > Decimal(freq):
newfreq = min(filter(lambda x: x >= newfreq, DAB_FREQ.keys()))
else:
newfreq = max(filter(lambda x: x <= newfreq, DAB_FREQ.keys()))
else:
if newfreq < Decimal("0.0"):
newfreq = Decimal("0.0")
Expand Down Expand Up @@ -288,14 +301,9 @@ def ok(self):
def red(self):
print "[SDGRadio] red"
config.sdgradio.modulation.selectNext()
config.sdgradio.modulation.save()
self["key_red"].setText(config.sdgradio.modulation.getText())
if config.sdgradio.modulation == "fm":
if config.sdgradio.rds.value:
self["key_yellow"].setText(_("RDS On"))
else:
self["key_yellow"].setText(_("RDS Off"))
else:
self["key_yellow"].setText("")
self.freqChange(Decimal(0))

def green(self):
print "[SDGRadio] green"
Expand Down Expand Up @@ -327,20 +335,32 @@ def info(self):

def yellow(self):
print "[SDGRadio] yellow"
config.sdgradio.rds.value = not config.sdgradio.rds.value
config.sdgradio.rds.save()
if config.sdgradio.rds.value:
self["key_yellow"].setText(_("RDS On"))
else:
self["key_yellow"].setText(_("RDS Off"))
self.doConsoleStop()
self.startup()
self.yellow_text()
if config.sdgradio.modulation.value == "fm":
config.sdgradio.rds.value = not config.sdgradio.rds.value
config.sdgradio.rds.save()
self.doConsoleStop()
self.startup()
elif config.sdgradio.modulation.value == "dab":
if self.Console:
self.Console.write("\n") # new line switches to next program

def blue(self):
print "[SDGRadio] blue"
text = "".join(self.log)
self.session.open(Console,_("Log"),["cat << EOF\n%s\nEOF" % text])

def yellow_text(self):
if config.sdgradio.modulation.value == "fm":
if config.sdgradio.rds.value:
self["key_yellow"].setText(_("RDS On"))
else:
self["key_yellow"].setText(_("RDS Off"))
elif config.sdgradio.modulation.value == "dab":
self["key_yellow"].setText(_("Next Station"))
else:
self["key_yellow"].setText("")

def main(session, **kwargs):
session.open(SDGRadioScreen)

Expand Down

0 comments on commit 3781003

Please sign in to comment.