Pecus/piradio-mini
1
0
Fork 0
mirror of https://github.com/Pecusx/piradio-mini.git synced 2026-05-20 22:33:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct display RSS in standby (Pandora and Media Player modes)

Browse Source
This commit is contained in:
Pecusx
2017-02-25 14:10:49 +01:00
committed by GitHub
parent 507f9c3848
commit 14acb72efc
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio4.py
+18 -20
View File
@@ -235,6 +235,10 @@ class MyDaemon(Daemon):
msg = ' ' + todaysdate # extra 2 spaces before time (Pecus) msg = ' ' + todaysdate # extra 2 spaces before time (Pecus)
lcd.line2(msg) # in sleep mode time and date in second line of LCD (Pecus) lcd.line2(msg) # in sleep mode time and date in second line of LCD (Pecus)
display_sleep(lcd,radio) display_sleep(lcd,radio)
if config.rss: # RSS in standby only if on in config file (Pecus)
display_rss(lcd,rss)
else:
lcd.line3('')
# Timer function # Timer function
checkTimer(radio) checkTimer(radio)
@@ -299,23 +303,23 @@ def interrupt():
radio.setSwitch(0) radio.setSwitch(0)
# Rapid display of track play status # Rapid display of track play status
if radio.getSource() == radio.PLAYER or radio.getSource() == radio.PANDORA: if radio.getDisplayMode() != radio.MODE_SLEEP:
if radio.volumeChanged(): if radio.getSource() == radio.PLAYER or radio.getSource() == radio.PANDORA:
if radio.volumeChanged():
displayVolume(lcd,radio)
time.sleep(0.5)
else:
displayProgress(lcd,radio)
elif (radio.getTimer() and not interrupt) or radio.volumeChanged():
displayVolume(lcd,radio) displayVolume(lcd,radio)
time.sleep(0.5) interrupt = checkTimer(radio)
else:
displayProgress(lcd,radio)
elif (radio.getTimer() and not interrupt) or radio.volumeChanged(): if not interrupt:
displayVolume(lcd,radio) interrupt = checkState(radio) or radio.getInterrupt()
interrupt = checkTimer(radio)
if not interrupt: # sprawdzamy czy minal czas na potwierdzenie z Pandory i jesli tak to zerujemy flage potwierdzenia
interrupt = checkState(radio) or radio.getInterrupt() if radio.pandora_decision_time <= int(time.time()):
radio.pandora_decision = radio.OK
# sprawdzamy czy minal czas na potwierdzenie z Pandory i jesli tak to zerujemy flage potwierdzenia
if radio.pandora_decision_time <= int(time.time()):
radio.pandora_decision = radio.OK
return interrupt return interrupt
@@ -561,12 +565,6 @@ def display_sleep(lcd,radio):
if radio.alarmActive(): if radio.alarmActive():
message = "Alarm " + radio.getAlarmTime() message = "Alarm " + radio.getAlarmTime()
lcd.line4(message) lcd.line4(message)
if config.rss: # RSS in standby only if on in config file (Pecus)
rss_line = rss.getFeed() # (Pecus)
lcd.setScrollSpeed(0.2) # Scroll RSS a bit faster # (Pecus)
lcd.scroll3(rss_line,interrupt) # (Pecus)
else: # (Pecus)
lcd.line3('') # (Pecus)
return return
# Get the last ID stored in /var/lib/radiod # Get the last ID stored in /var/lib/radiod