From 27914e6a1931b35d074037c99e41f230da515e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Ple=C3=9F?= Date: Wed, 19 Nov 2014 03:21:14 +0100 Subject: [PATCH] and fixed the temperature typo everywhere else (hopefully) --- dump_grabber/dump_grabber/main.py | 2 -- healthdisplay/src/main/java/de/psychose/Main.java | 2 +- sensors2osc/sensors2osc/main.py | 2 +- sensors2osc/sensors2osc/sensorTest.py | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dump_grabber/dump_grabber/main.py b/dump_grabber/dump_grabber/main.py index 5dd5951..8b6aa9e 100644 --- a/dump_grabber/dump_grabber/main.py +++ b/dump_grabber/dump_grabber/main.py @@ -174,8 +174,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, except AttributeError: pass else: - if text == "temperatur": - text += "e" if actor == "merle": self.add_text(0, "%s = %s" % ( text, ", ".join([str(i) for i in args]))) diff --git a/healthdisplay/src/main/java/de/psychose/Main.java b/healthdisplay/src/main/java/de/psychose/Main.java index 3bcfa59..aad4233 100644 --- a/healthdisplay/src/main/java/de/psychose/Main.java +++ b/healthdisplay/src/main/java/de/psychose/Main.java @@ -148,7 +148,7 @@ public class Main { } }); - chaOSCclient.addListener("/" + actor.toLowerCase() + "/temperatur", new OSCListener() { + chaOSCclient.addListener("/" + actor.toLowerCase() + "/temperature", new OSCListener() { @Override public void acceptMessage(Date time, OSCMessage message) { if (message.getArguments().length == 1) { diff --git a/sensors2osc/sensors2osc/main.py b/sensors2osc/sensors2osc/main.py index 01a0606..e726c14 100644 --- a/sensors2osc/sensors2osc/main.py +++ b/sensors2osc/sensors2osc/main.py @@ -73,7 +73,7 @@ class EHealth2OSC(Forwarder): osc_message = OSCMessage("/%s/emg" % self.actor) osc_message.appendTypedArg(emg, "i") 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_sock.sendall(osc_message.encode_osc()) diff --git a/sensors2osc/sensors2osc/sensorTest.py b/sensors2osc/sensors2osc/sensorTest.py index 79ab7b7..5602db4 100644 --- a/sensors2osc/sensors2osc/sensorTest.py +++ b/sensors2osc/sensors2osc/sensorTest.py @@ -75,7 +75,7 @@ class EHealth2OSC(Forwarder): osc_message = OSCMessage("/%s/emg" % self.actor) osc_message.appendTypedArg(emg, "i") 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_sock.sendall(osc_message.encode_osc())