Fixed sensors

Author: zambrovski

src/main/java/de/techjava/mqtt/tf/comm/MqttReceiver.java

@@ -52,8 +52,8 @@ public void init() {
 	 *            listener to register.
 	 */
 	public void addListener(final String topic, final MqttCallback callback) {
-		logger.info("Adding listener {} to topic '{}'", callback.getClass().getSimpleName(), topic);
-		final String fullTopic = topicPrefix + topic;
+	    final String fullTopic = topicPrefix + topic;
+		logger.info("Adding listener {} to topic '{}'", callback.getClass().getSimpleName(), fullTopic);
 		Collection<MqttCallback> callbacksForTopic = this.listeners.get(fullTopic);
 		if (callbacksForTopic == null) {
 			callbacksForTopic = new ArrayList<MqttCallback>();
@@ -62,7 +62,7 @@ public void addListener(final String topic, final MqttCallback callback) {
 				this.client.subscribe(fullTopic);
 				logger.info("Subscribed to topic '{}'", fullTopic);
 			} catch (MqttException e) {
-				logger.error("Error registering listener", e);
+				logger.error("Error registering listener.", e);
 			}
 		}
 		callbacksForTopic.add(callback);
@@ -77,7 +77,7 @@ public void messageArrived(final String topic, final MqttMessage message) throws
 				try {
 					mqttCallback.messageArrived(topic, message);
 				} catch (Exception e) {
-					logger.warn("Exception in message processing", e);
+					logger.warn("Exception in message processing.", e);
 				}
 			}
 		}

src/main/java/de/techjava/mqtt/tf/device/Barometer.java

@@ -54,7 +54,7 @@ public void setupDevice(final String uid, final BrickletBarometer barometer) {
         boolean enable = !envHelper.isDisabled(uid, Barometer.class);
         if (enable) {
             barometer.addAirPressureListener((airPressure) -> {
-                sender.sendMessage(envHelper.getTopic(uid) + topic, airPressure);
+                sender.sendMessage(envHelper.getTopic(uid) + topic, Double.valueOf(airPressure / 1000.0d));
             });
             try {
                 barometer.setAirPressureCallbackPeriod(envHelper.getCallback(uid, callbackperiod));

src/main/java/de/techjava/mqtt/tf/device/Hygrometer.java

@@ -54,7 +54,7 @@ public void setupDevice(final String uid, final BrickletHumidity sensor) {
         boolean enable = !envHelper.isDisabled(uid, Hygrometer.class);
         if (enable) {
             sensor.addHumidityListener((humidity) -> {
-                sender.sendMessage(envHelper.getTopic(uid) + topic, humidity);
+                sender.sendMessage(envHelper.getTopic(uid) + topic, Double.valueOf(humidity / 10.0d));
             });
             try {
                 sensor.setHumidityCallbackPeriod(envHelper.getCallback(uid, callbackperiod));

src/main/java/de/techjava/mqtt/tf/device/Thermometer.java

@@ -23,9 +23,9 @@
 public class Thermometer implements DeviceFactory<BrickletTemperature>, DeviceController<BrickletTemperature> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Thermometer.class);
-    @Value("${tinkerforge.thermometer.callbackperiod?: 10000}")
+    @Value("${tinkerforge.thermometer.callbackperiod:10000}")
     private long callbackperiod;
-    @Value("${tinkerforge.thermometer.topic?:temperature}")
+    @Value("${tinkerforge.thermometer.topic:temperature}")
     private String topic;
 
     @Autowired
@@ -44,9 +44,8 @@ public void init() {
     }
 
     @Override
-    public BrickletTemperature createDevice(String uid) {
-        BrickletTemperature sensor = new BrickletTemperature(uid, ipcon);
-        return sensor;
+    public BrickletTemperature createDevice(final String uid) {
+        return new BrickletTemperature(uid, ipcon);
     }
 
     @Override