From 4489913818f3b974ad91d31f3cbbd3c3ba34f5e0 Mon Sep 17 00:00:00 2001 From: Eugene Schava Date: Wed, 9 Mar 2016 23:18:01 +0200 Subject: [PATCH] different fixes --- .idea/compiler.xml | 2 +- .idea/libraries/purejavahidapi_0_0_1.xml | 9 --------- ht2000.iml | 1 - pom.xml | 21 ++++++++++++++++++++- release/gui.bat | 2 +- release/mqtt.bat | 2 +- release/print.bat | 2 +- src/com/eschava/ht2000/mqtt/MQTTMain.java | 4 ++++ 8 files changed, 28 insertions(+), 15 deletions(-) delete mode 100644 .idea/libraries/purejavahidapi_0_0_1.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b8f243a..0a1104d 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -17,7 +17,7 @@ - + diff --git a/.idea/libraries/purejavahidapi_0_0_1.xml b/.idea/libraries/purejavahidapi_0_0_1.xml deleted file mode 100644 index 1eac80e..0000000 --- a/.idea/libraries/purejavahidapi_0_0_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ht2000.iml b/ht2000.iml index 4d42302..bbe9910 100644 --- a/ht2000.iml +++ b/ht2000.iml @@ -9,7 +9,6 @@ - diff --git a/pom.xml b/pom.xml index d5597ef..dfa1b2c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.eschava ht2000 - 0.1-SNAPSHOT + 0.2-SNAPSHOT src @@ -34,6 +34,25 @@ + + + org.codehaus.mojo + ideauidesigner-maven-plugin + 1.0-beta-1 + + + + javac2 + + + + + + true + true + true + + diff --git a/release/gui.bat b/release/gui.bat index 11a1ba8..f6d2d8c 100644 --- a/release/gui.bat +++ b/release/gui.bat @@ -1,2 +1,2 @@ @echo off -java -classpath lib/* com.eschava.ht2000.gui.HT2000Window \ No newline at end of file +java -classpath "lib/*" com.eschava.ht2000.gui.HT2000Window \ No newline at end of file diff --git a/release/mqtt.bat b/release/mqtt.bat index f66f952..b54f647 100644 --- a/release/mqtt.bat +++ b/release/mqtt.bat @@ -11,7 +11,7 @@ SET co2Topic=/ht-2000/co2 SET interval=60 -java -classpath lib/* ^ +java -classpath "lib/*" ^ -DmqttUrl=%mqttUrl% ^ -DmqttClientId=%mqttClientId% ^ -DmqttUser=%mqttUser% ^ diff --git a/release/print.bat b/release/print.bat index a274481..c520a5a 100644 --- a/release/print.bat +++ b/release/print.bat @@ -1,2 +1,2 @@ @echo off -java -classpath lib/* com.eschava.ht2000.console.PrintState \ No newline at end of file +java -classpath "lib/*" com.eschava.ht2000.console.PrintState \ No newline at end of file diff --git a/src/com/eschava/ht2000/mqtt/MQTTMain.java b/src/com/eschava/ht2000/mqtt/MQTTMain.java index 1a02190..0e1584b 100644 --- a/src/com/eschava/ht2000/mqtt/MQTTMain.java +++ b/src/com/eschava/ht2000/mqtt/MQTTMain.java @@ -40,6 +40,10 @@ private static byte[] getPayload(double v) { return String.valueOf(v).getBytes(); } + private static byte[] getPayload(int v) { + return String.valueOf(v).getBytes(); + } + public static void main(String[] args) throws Exception { new MqttMain().start(); }