ctdo
/
psychose
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

and fixed the temperature typo everywhere else (hopefully)

This commit is contained in:
Lucas Pleß 2014-11-19 03:21:14 +01:00
parent 33b8ee0ec7
commit 27914e6a19
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dump_grabber/dump_grabber/main.py
View File

@ -174,8 +174,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow,
except AttributeError: except AttributeError:
pass pass
else: else:
if text == "temperatur":
text += "e"
if actor == "merle": if actor == "merle":
self.add_text(0, "%s = %s" % ( self.add_text(0, "%s = %s" % (
text, ", ".join([str(i) for i in args]))) text, ", ".join([str(i) for i in args])))

2
healthdisplay/src/main/java/de/psychose/Main.java
View File

@ -148,7 +148,7 @@ public class Main {
} }
}); });
chaOSCclient.addListener("/" + actor.toLowerCase() + "/temperatur", new OSCListener() { chaOSCclient.addListener("/" + actor.toLowerCase() + "/temperature", new OSCListener() {
@Override @Override
public void acceptMessage(Date time, OSCMessage message) { public void acceptMessage(Date time, OSCMessage message) {
if (message.getArguments().length == 1) { if (message.getArguments().length == 1) {

2
sensors2osc/sensors2osc/main.py
View File

@ -73,7 +73,7 @@ class EHealth2OSC(Forwarder):
osc_message = OSCMessage("/%s/emg" % self.actor) osc_message = OSCMessage("/%s/emg" % self.actor)
osc_message.appendTypedArg(emg, "i") osc_message.appendTypedArg(emg, "i")
osc_sock.sendall(osc_message.encode_osc()) osc_sock.sendall(osc_message.encode_osc())
osc_message = OSCMessage("/%s/temperatur" % self.actor) osc_message = OSCMessage("/%s/temperature" % self.actor)
osc_message.appendTypedArg(temp, "i") osc_message.appendTypedArg(temp, "i")
osc_sock.sendall(osc_message.encode_osc()) osc_sock.sendall(osc_message.encode_osc())

2
sensors2osc/sensors2osc/sensorTest.py
View File

@ -75,7 +75,7 @@ class EHealth2OSC(Forwarder):
osc_message = OSCMessage("/%s/emg" % self.actor) osc_message = OSCMessage("/%s/emg" % self.actor)
osc_message.appendTypedArg(emg, "i") osc_message.appendTypedArg(emg, "i")
osc_sock.sendall(osc_message.encode_osc()) osc_sock.sendall(osc_message.encode_osc())
osc_message = OSCMessage("/%s/temperatur" % self.actor) osc_message = OSCMessage("/%s/temperature" % self.actor)
osc_message.appendTypedArg(temp, "i") osc_message.appendTypedArg(temp, "i")
osc_sock.sendall(osc_message.encode_osc()) osc_sock.sendall(osc_message.encode_osc())