Hannes/counters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: enhance variable naming logic and update build number in library.json

Browse Source
This commit is contained in:
jhartworks
2026-04-16 15:21:30 +02:00
parent 82f2fdc54c
commit 9702a88cb3
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CounterClient/module.php
+11 -4
View File
@@ -212,10 +212,16 @@ class CounterClient extends IPSModule
} }
$value = round((float) $value, 3); $value = round((float) $value, 3);
$varName = mb_strtolower(IPS_GetName($varId)); $varName = mb_strtolower(IPS_GetName($varId));
$parentId = IPS_GetParent($varId);
if ($parentId > 0) {
$varName = mb_strtolower(IPS_GetName($parentId) . ' ' . IPS_GetName($varId));
}
$unitNorm = $this->normalizeUnit($unit); $unitNorm = $this->normalizeUnit($unit);
if (in_array($unitNorm, ['kwh', 'wh', 'mwh', 'm3', 'l'], true)) { if (in_array($unitNorm, ['kwh', 'kw/h', 'wh', 'mwh', 'm3', 'l'], true)) {
return [ return [
'field' => 'total_value', 'field' => 'total_value',
'value' => $value, 'value' => $value,
@@ -334,7 +340,6 @@ class CounterClient extends IPSModule
return null; return null;
} }
private function assignInOutValues(array &$counterData, array $items, string $fieldIn, string $fieldOut): void private function assignInOutValues(array &$counterData, array $items, string $fieldIn, string $fieldOut): void
{ {
foreach ($items as $item) { foreach ($items as $item) {
@@ -408,7 +413,8 @@ class CounterClient extends IPSModule
|| strpos($name, 'vl') !== false || strpos($name, 'vl') !== false
|| strpos($name, 'flow') !== false || strpos($name, 'flow') !== false
|| strpos($name, 'ein') !== false || strpos($name, 'ein') !== false
|| strpos($name, 'in') !== false; || strpos($name, ' in ') !== false
|| strpos($name, 'iv') !== false;
} }
private function looksLikeOut(string $name): bool private function looksLikeOut(string $name): bool
@@ -418,7 +424,8 @@ class CounterClient extends IPSModule
|| strpos($name, 'rl') !== false || strpos($name, 'rl') !== false
|| strpos($name, 'return') !== false || strpos($name, 'return') !== false
|| strpos($name, 'aus') !== false || strpos($name, 'aus') !== false
|| strpos($name, 'out') !== false; || strpos($name, ' out ') !== false
|| strpos($name, 'ri') !== false;
} }
private function normalizeUnit(string $unit): string private function normalizeUnit(string $unit): string
library.json
+1 -1
View File
@@ -8,6 +8,6 @@
"date": 1491343200 "date": 1491343200
}, },
"version": "1.1", "version": "1.1",
"build": 3, "build": 4,
"date": 0 "date": 0
} }