diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..97626ba
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/findbugs-idea.xml b/.idea/findbugs-idea.xml
new file mode 100644
index 0000000..1a73c97
--- /dev/null
+++ b/.idea/findbugs-idea.xml
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 8becbcb..8dd7442 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,4 +36,6 @@ dependencies {
compile('org.eclipse.paho:org.eclipse.paho.android.service:1.0.2') {
exclude module: 'support-v4'
}
-}
\ No newline at end of file
+}
+
+//apply plugin: 'checkstyle'
diff --git a/app/src/main/java/com/example/daniel/moodlightdimmer/DimmMainActivity.java b/app/src/main/java/com/example/daniel/moodlightdimmer/DimmMainActivity.java
index c1951fa..4b144ff 100644
--- a/app/src/main/java/com/example/daniel/moodlightdimmer/DimmMainActivity.java
+++ b/app/src/main/java/com/example/daniel/moodlightdimmer/DimmMainActivity.java
@@ -34,9 +34,9 @@ public class DimmMainActivity extends AppCompatActivity {
private Button buttonSet, buttonReconnect;
private Integer color;
private MqttAndroidClient client;
- private String device = "receiver";
+ private String device = "sender";
private String publisher_topic;
- private String broker = "tcp://raspi2:1883";
+ private String broker = "tcp://172.23.4.17:1883";
private Spinner spinnerlights;
private CheckBox checkBoxInstantSet;
private String[] adapter;
@@ -58,7 +58,7 @@ public class DimmMainActivity extends AppCompatActivity {
spinnerlights = (Spinner) findViewById(R.id.spinnerLights);
spinnerlights.setAdapter(new ArrayAdapter(this, R.layout.support_simple_spinner_dropdown_item, adapter));
- publisher_topic = "kitchen/switch/android/" + device == "sender"?getWifiMacAddress():"#";
+ publisher_topic = "kitchen/switch/android/" + getWifiMacAddress();
red.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
@@ -146,7 +146,7 @@ public class DimmMainActivity extends AppCompatActivity {
//String topic = publisher_topic;sf
//String payload = Integer.toHexString(color);
- if(sendCommand) SendCommand(spinnerlights.getSelectedItem().toString() + "; " + Integer.toHexString(color).substring(2), publisher_topic);
+ if(sendCommand) SendCommand(spinnerlights.getSelectedItem().toString() + ";" +Integer.toHexString(color).substring(2), publisher_topic);
}
else if(!client.isConnected() && device == "sender")
{
diff --git a/build.gradle b/build.gradle
index 1b9988e..df98452 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.5.0'
+ classpath 'com.android.tools.build:gradle:2.1.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f23df6e..a1e7d8b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Mon May 02 19:23:46 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip