Merge pull request #54 from RyanHS7VM/CurrentRainLevel

RainLevelCharacteristic

Author: skrollme

accessory/eveatmo-rain-accessory.js

@@ -26,6 +26,7 @@ module.exports = function(pHomebridge) {
 			super(homebridge, accessoryConfig, netatmoDevice);
 			this.buildServices(accessoryConfig);
 
+			this.rainLevel = 0;
 			this.rainLevelSum1 = 0;
 			this.rainLevelSum24 = 0;
 
@@ -67,6 +68,9 @@ module.exports = function(pHomebridge) {
 			var result = {};
 			var dashboardData = accessoryData.dashboard_data;
 			if (dashboardData) {
+				if (dashboardData.hasOwnProperty("Rain")) {
+					result.rainLevel = Math.round(dashboardData.Rain * 1000) / 1000;
+				}
 				if (dashboardData.hasOwnProperty("sum_rain_1")) {
 					result.rainLevelSum1 = Math.round(dashboardData.sum_rain_1 * 1000) / 1000;
 				}
@@ -87,6 +91,10 @@ module.exports = function(pHomebridge) {
 		applyWeatherData(weatherData) {
 			var dataChanged = false;
 
+			if (weatherData.hasOwnProperty("rainLevel") && this.rainLevel != weatherData.rainLevel) {
+				this.rainLevel = weatherData.rainLevel;
+				dataChanged = true;
+			}
 			if (weatherData.hasOwnProperty("rainLevelSum1") && this.rainLevelSum1 != weatherData.rainLevelSum1) {
 				this.rainLevelSum1 = weatherData.rainLevelSum1;
 				dataChanged = true;

service/eveatmo-rain.js

@@ -4,6 +4,7 @@ var homebridge;
 var Characteristic;
 
 const RAIN_LEVEL_STYPE_ID = "D92D5391-92AF-4824-AF4A-356F25F25EA1";
+const RAIN_LEVEL_CTYPE_ID = "C53F35CE-C615-4AA4-9112-EBF679C5EB14";
 const RAIN_LEVEL_SUM_1H_CTYPE_ID = "10c88f40-7ec4-478c-8d5a-bd0c3cce14b7";
 const RAIN_LEVEL_SUM_24H_CTYPE_ID = "ccc04890-565b-4376-b39a-3113341d9e0f";
 
@@ -12,6 +13,24 @@ module.exports = function(pHomebridge) {
 		homebridge = pHomebridge;
 		Characteristic = homebridge.hap.Characteristic;
 	}
+	
+	class RainLevelCharacteristic extends Characteristic {
+		constructor(accessory) {
+			super('Rain Level', RAIN_LEVEL_CTYPE_ID);
+			this.setProps({
+				format: Characteristic.Formats.FLOAT,
+				unit: "mm",
+				minValue: 0,
+				maxValue: 1000,
+				minStep: 0.001,
+				perms: [
+					Characteristic.Perms.READ,
+					Characteristic.Perms.NOTIFY
+				]
+			});
+			this.value = this.getDefaultValue();
+		}
+	}
 
 	class RainLevelSum1Characteristic extends Characteristic {
 		constructor(accessory) {
@@ -54,6 +73,9 @@ module.exports = function(pHomebridge) {
 			super(accessory.name, RAIN_LEVEL_STYPE_ID);
 			this.accessory = accessory;
 
+			this.addCharacteristic(RainLevelCharacteristic)
+				.on('get', this.getRainLevel.bind(this))
+				.eventEnabled = true;
 			this.addCharacteristic(RainLevelSum1Characteristic)
 				.on('get', this.getRainLevelSum1.bind(this))
 				.eventEnabled = true;
@@ -63,12 +85,20 @@ module.exports = function(pHomebridge) {
 		}
 
 		updateCharacteristics() {
+			this.getCharacteristic(RainLevelCharacteristic)
+				.updateValue(this.accessory.rainLevel);
 			this.getCharacteristic(RainLevelSum1Characteristic)
 				.updateValue(this.accessory.rainLevelSum1);
 			this.getCharacteristic(RainLevelSum24Characteristic)
 				.updateValue(this.accessory.rainLevelSum24);
 		}
 
+		getRainLevel(callback) {
+			this.accessory.refreshData(function(err, data) {
+				callback(err, this.accessory.rainLevel);
+			}.bind(this));
+		}
+
 		getRainLevelSum1(callback) {
 			this.accessory.refreshData(function(err, data) {
 				callback(err, this.accessory.rainLevelSum1);