Merge branch 'master' into develop

orttech · Mar 30, 2020 · f6976a8 · f6976a8
2 parents 07ec37c + cc9357d
commit f6976a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/driver/io_eibd.js b/driver/io_eibd.js
@@ -138,9 +138,9 @@ var io = {
 	convertData: function (inputData, dataType, direction) {
 
 		var returnData = inputData;
-		if (dataType == '9.xxx') {
+		if (dataType === '9.xxx') {
 
-			if (direction == 'from') {
+			if (direction === 'from') {
 
 				data = parseInt(inputData, 16).toString(10);
 				wert = (data & 0x07ff);
@@ -188,26 +188,26 @@ var io = {
 
 			}
 		}
-		else if (dataType == '1.001') {
-			if (direction == 'to') {
+		else if (dataType === '1.001') {
+			if (direction === 'to') {
 
 				returnData = '8' + inputData;
 			}
 		}
-		else if (dataType = '13.xx') {
+		else if (dataType === '13.xxx') {
 
 			returnData = parseInt(inputData, 16);
 		}
-		else if (dataType == '5.001') {
+		else if (dataType === '5.001') {
 
-			if (direction == 'from') {
+			if (direction === 'from') {
 
 				returnData = inputData;
 				//returnData = Math.round(parseInt(inputData, 10) / 2.55);
 
 
 			}
-			else if (direction == 'to') {
+			else if (direction === 'to') {
 
 				returnData = inputData;
 				returnData = Math.round(inputData * 2.55) + 0x8000;

diff --git a/lib/weather/service/yr.no.php b/lib/weather/service/yr.no.php
@@ -71,7 +71,6 @@ public function run()
 
 			if ($i < 4 and $day->attributes()->period == 2)
 			{
-
 				$this->data['forecast'][$i]['date'] = (string)$day->attributes()->from;
 				$this->data['forecast'][$i]['conditions'] = translate((string)$day->symbol->attributes()->name, 'yr.no');
 				$this->data['forecast'][$i]['wind'] = translate((string)$day->windSpeed->attributes()->name.' from '.(string)$day->windDirection->attributes()->code, 'yr.no').$windspeed;