TEMPer fixed

app/Sensor/CPUtemperature.php

@@ -42,7 +42,7 @@ class CPUtemperature extends \App\AbstractSensor
                 . "<p>Maybe <code>sensors</code> is not installed.</p>"
                 . "<p>You can install it with <code>sudo apt install lm-sensors</code></p>";}
         $Cores = self::parseCPUtemperature($record['cpu-temperature']);
-		$CPUS=self::parseCPU($record['cpu-temperature']);
+        $CPUS=self::parseCPU($record['cpu-temperature']);
         $return = "<table class='table table-sm'>";
         $return .= "<tr><th>Name</th><th>Temperature (°C)</th><th>T°crit (°C)</th></tr>";
         foreach ($CPUS as $CPU) {

app/Sensor/USBtemperature.php

@@ -20,9 +20,9 @@ class USBtemperature extends \App\AbstractSensor
                 . "<p>Maybe <code>TEMPer</code> is not installed.</p>"
                 . "<p>You can install it following the tutorial on the Gitlab repository</p>";
         }
-        $temper = self::parse($record["TEMPer"]);
-        $return= "<p>Ambient temperature (USB TEMPer) : ".$temper->temp[1].".".$temper->temp[2]." °C "."</p>";
-        return $return;//$record['TEMPer'];
+        $temper = self::parse($record['TEMPer']);
+        $return= "<p>Ambient temperature (USB TEMPer) : " . $temper->temp[1] . "." . $temper->temp[2] . " °C " . "</p>";
+        return $return;
     }
 
     public function status()
@@ -31,16 +31,11 @@ class USBtemperature extends \App\AbstractSensor
         if ($record == null) {
             return self::STATUS_UNKNOWN;
         }
-        //foreach (self::parse($record['TEMPer']) as $USBTemp) {
-         //   /* @var $USBTemp Temper */
-        
         $status = self::STATUS_OK;
-        /*
         $USBTemp = self::parse($record['TEMPer']);
-        if ((int)($USBTemp->temp[1]) > 75) {
+        if ((int)($USBTemp->temp[1]) > 60) {
             $status = self::STATUS_WARNING;
         }
-         */
         return $status;
         
     }

tests/Unit/ExampleTest.php

@@ -292,10 +292,10 @@ class ExampleTest extends TestCase
         $string = file_get_contents(__DIR__ . "/TEMPer");
         $TEMPer = new USBtemperature(new Server());
         $USBTemp = $TEMPer->parse($string);
-        $this->assertEquals("0a", $USBTemp->part1);
-        $this->assertEquals("6c", $USBTemp->part2);
-        $this->assertEquals("26", $USBTemp->temp[1]);
-        $this->assertEquals("68", $USBTemp->temp[2]);
+        $this->assertEquals("09", $USBTemp->part1);
+        $this->assertEquals("47", $USBTemp->part2);
+        $this->assertEquals("23", $USBTemp->temp[1]);
+        $this->assertEquals("75", $USBTemp->temp[2]);
     }
     /**
      * @group multicpu

tests/Unit/TEMPer

-Device /dev/hidraw4 : 413d:2107 interface 1 : (null) (null)
+Device /dev/hidraw1 : 413d:2107 interface 1 : (null) (null) 
 
-Writing data (9 bytes):
-00 01 80 33   01 00 00 00   00
+Writing data (9 bytes): 
+00 01 80 33 01 00 00 00 00 
 
 Response from device (8 bytes):
-80 80 0a 6c   4e 20 00 00
\ No newline at end of file
+80 80 09 47 4e 20 00 00
\ No newline at end of file