* 0.7 - 2015/07/18 - owagner

  - fixed direct datapoint set variant of _inc fields
  - updated eclipse-paho to 1.0.2

README.md

@@ -90,9 +90,13 @@ Dependencies
 
 History
 -------
+* 0.7 - 2015/07/18 - owagner
+  - fixed direct datapoint set variant of _inc fields
+  - updated eclipse-paho to 1.0.2
+
 * 0.6 - 2015/07/15 - owagner
   - updated SDK libs to 1.8
-  - added support for the "_inc" variants of fields. Implements [3]
+  - added support for the "_inc" variants of fields. Implements #3
 
 * 0.5 - 2015/06/25 - owagner
   - fix syslog logging to ignore intermediate IO errors

build.gradle

@@ -1,4 +1,4 @@
-version = '0.6'
+version = '0.7'
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	compile 'com.eclipsesource.minimal-json:minimal-json:0.9.2'
-	compile 'org.eclipse.paho:mqtt-client:0.4.0'
+	compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2'
 	compile files(
 		'lib/huelocalsdk.jar',
 		'lib/huesdkresources.jar'
@@ -27,7 +27,7 @@ task listJars << {
 }
 
 jar {
-	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } { exclude "META-INF/**" }
 	archiveName 'hue2mqtt.jar'
 	manifest {
         attributes 	'Main-Class': 'com.tellerulam.hue2mqtt.Main',

src/main/java/com/tellerulam/hue2mqtt/MQTTHandler.java

@@ -65,7 +65,7 @@ public void run()
 
 	private boolean shouldBeConnected;
 
-	private final Pattern topicPattern=Pattern.compile("([^/]+/[^/]+)(?:/(on|bri|hue|sat|ct|alert|effect|colormode|reachable|x|y|transitiontime))?");
+	private final Pattern topicPattern=Pattern.compile("([^/]+/[^/]+)(?:/((?:on|bri|hue|sat|ct|alert|effect|colormode|reachable|x|y|transitiontime)(?:_inc)?))?");
 
 	private final Map<String,Integer> transitionTimeCache=new HashMap<>();
 
@@ -90,7 +90,7 @@ void processSet(String topic,MqttMessage msg)
 			// Third format
 			if("transitiontime".equals(m.group(2)))
 			{
-				// We only cache that, for future refernece
+				// We only cache that, for future reference
 				transitionTimeCache.put(m.group(1),Integer.valueOf(payload));
 				return;
 			}