Add external TEMPer sensor support

NEMSLinux · Oct 7, 2020 · 6a83cfe · 6a83cfe
1 parent 1bc66e3
commit 6a83cfe
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/info2.sh b/info2.sh
@@ -471,19 +471,35 @@ EOQ;
     $temperARR = json_decode(trim($temper));
     $temperTempOffset = floatval(trim(shell_exec("cat /usr/local/share/nems/nems.conf | grep temper.temp | printf '%s' $(cut -n -d '=' -f 2)")));
     $temperHumOffset = floatval(trim(shell_exec("cat /usr/local/share/nems/nems.conf | grep temper.hum | printf '%s' $(cut -n -d '=' -f 2)")));
-    if (isset($temperARR[0]->{'internal temperature'})) {
+
+    $temperARR['sensors']['thermal'] = 0;
+    if (isset($temperARR[0]->{'external temperature'})) {
+      $temperARR['output']['temperature'] = ($temperARR[0]->{'external temperature'} + $temperTempOffset);
+      $temperARR['sensors']['thermal'] = 1;
+      $temperARR['sensors']['temp_location'] = 'external';
+    } else if (isset($temperARR[0]->{'internal temperature'})) {
       $temperARR['output']['temperature'] = ($temperARR[0]->{'internal temperature'} + $temperTempOffset);
       $temperARR['sensors']['thermal'] = 1;
-    } else {
+      $temperARR['sensors']['temp_location'] = 'internal';
+    }
+    if ($temperARR['sensors']['thermal'] == 0) {
       $temperARR['output']['temperature'] = 0;
-      $temperARR['sensors']['thermal'] = 0;
+      $temperARR['sensors']['temp_location'] = 'not_present';
     }
-    if (isset($temperARR[0]->{'internal humidity'})) {
+
+    $temperARR['sensors']['humidity'] = 0;
+    if (isset($temperARR[0]->{'external humidity'})) {
+      $temperARR['output']['humidity'] = ($temperARR[0]->{'external humidity'} + $temperHumOffset);
+      $temperARR['sensors']['humidity'] = 1;
+      $temperARR['sensors']['hum_location'] = 'external';
+    } else if (isset($temperARR[0]->{'internal humidity'})) {
       $temperARR['output']['humidity'] = ($temperARR[0]->{'internal humidity'} + $temperHumOffset);
       $temperARR['sensors']['humidity'] = 1;
-    } else {
+      $temperARR['sensors']['hum_location'] = 'internal';
+    }
+    if ($temperARR['sensors']['humidity'] == 0) {
       $temperARR['output']['humidity'] = 0;
-      $temperARR['sensors']['humidity'] = 0;
+      $temperARR['sensors']['hum_location'] = 'not_present';
     }
     print_r(json_encode($temperARR));