diff options
| -rw-r--r-- | .graveyard/temper/.gitignore (renamed from god/temper/.gitignore) | 0 | ||||
| -rw-r--r-- | .graveyard/temper/99-tempsensor.rules (renamed from god/temper/99-tempsensor.rules) | 0 | ||||
| -rw-r--r-- | .graveyard/temper/Makefile (renamed from god/temper/Makefile) | 4 | ||||
| -rwxr-xr-x | .graveyard/temper/collectd-temper.sh (renamed from god/temper/collectd-temper.sh) | 0 | ||||
| -rw-r--r-- | .graveyard/temper/temper.c (renamed from god/temper/temper.c) | 2 | ||||
| -rw-r--r-- | .graveyard/temper/temper.h (renamed from god/temper/temper.h) | 0 | ||||
| -rwxr-xr-x | god/streams/bin/relaxxapi.py | 4 | ||||
| -rwxr-xr-x | god/streams/bin/streams | 2 |
8 files changed, 6 insertions, 6 deletions
diff --git a/god/temper/.gitignore b/.graveyard/temper/.gitignore index 7e50641a..7e50641a 100644 --- a/god/temper/.gitignore +++ b/.graveyard/temper/.gitignore diff --git a/god/temper/99-tempsensor.rules b/.graveyard/temper/99-tempsensor.rules index 441a469e..441a469e 100644 --- a/god/temper/99-tempsensor.rules +++ b/.graveyard/temper/99-tempsensor.rules diff --git a/god/temper/Makefile b/.graveyard/temper/Makefile index 80c0206f..d18ad710 100644 --- a/god/temper/Makefile +++ b/.graveyard/temper/Makefile @@ -1,12 +1,12 @@ all: infest infest: temper rules-install -CFLAGS = -O2 -Wall +CFLAGS = -O2 -Wall -DDEBUG temper: temper.c ${CC} -DUNIT_TEST -o $@ $^ -lusb chmod +s temper - cp -a temper /usr/bin + #cp -a temper /usr/bin clean: rm -f temper *.o diff --git a/god/temper/collectd-temper.sh b/.graveyard/temper/collectd-temper.sh index f66e9acc..f66e9acc 100755 --- a/god/temper/collectd-temper.sh +++ b/.graveyard/temper/collectd-temper.sh diff --git a/god/temper/temper.c b/.graveyard/temper/temper.c index 390f9056..f0730ab3 100644 --- a/god/temper/temper.c +++ b/.graveyard/temper/temper.c @@ -221,7 +221,7 @@ TemperGetOtherStuff(Temper *t, char *buf, int length) #define USB_TIMEOUT 1000 /* milliseconds */ -#define DEBUG_MODE 0 +#define DEBUG_MODE 1 #define SLEEP_TIMEOUT 10 int diff --git a/god/temper/temper.h b/.graveyard/temper/temper.h index 7ea6280a..7ea6280a 100644 --- a/god/temper/temper.h +++ b/.graveyard/temper/temper.h diff --git a/god/streams/bin/relaxxapi.py b/god/streams/bin/relaxxapi.py index f367caef..55e628b0 100755 --- a/god/streams/bin/relaxxapi.py +++ b/god/streams/bin/relaxxapi.py @@ -78,7 +78,7 @@ class relaxx: def get_first(self): return json.loads(self._playlist("getPlaylistInfo","0",""))[0] - def get_first(self): + def get_last(self): return json.loads(self._playlist("getPlaylistInfo","0",""))[-1] def clear(self): @@ -124,7 +124,7 @@ class relaxx: if state["status"]["state"] == "play" : ident = state["status"]["song"] current = state["playlist"]["file"][int(ident)] - return current.get("Name",current.get("Artist")) + " - " + current["Title"] + return current.get("Name",current.get("Artist","unkown artist")) + " - " + current.get("Title","unknown title") else: return "" diff --git a/god/streams/bin/streams b/god/streams/bin/streams index ea6e9a90..8e00a733 100755 --- a/god/streams/bin/streams +++ b/god/streams/bin/streams @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 import os import sys from subprocess import Popen, PIPE |