diff --git a/app/Sensor/CPUtemperature.php b/app/Sensor/CPUtemperature.php index e748ddabe8de639d923228b55f7a71bb5f05d080..81826505c0132882d0a0a9394351e7d942d16dfd 100644 --- a/app/Sensor/CPUtemperature.php +++ b/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) { diff --git a/app/Sensor/USBtemperature.php b/app/Sensor/USBtemperature.php index b38e87e1368b8956e2977d0622d9f3faaef9e2b8..217acb4e709278de8c6fb9fb8bc81b67649e8b6e 100644 --- a/app/Sensor/USBtemperature.php +++ b/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; } diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php index 28e82d4d01c08ba2274acc69862c0e18afacc2cd..28a60c03300553e6f1c544fcc451cbf113ee15b2 100644 --- a/tests/Unit/ExampleTest.php +++ b/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 diff --git a/tests/Unit/TEMPer b/tests/Unit/TEMPer index 6f24190a6a96db9708b6b886853f483ea99e04de..9cab4a8050f73c1b4a7284196ea95a7395fa5b5c 100644 --- a/tests/Unit/TEMPer +++ b/tests/Unit/TEMPer @@ -1,7 +1,7 @@ -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