diff --git a/fhem/FHEM/42_SYSMON.pm b/fhem/FHEM/42_SYSMON.pm index 171c75b43..3c7a2fb07 100644 --- a/fhem/FHEM/42_SYSMON.pm +++ b/fhem/FHEM/42_SYSMON.pm @@ -30,7 +30,7 @@ package main; use strict; use warnings; -my $VERSION = "1.8.0"; +my $VERSION = "1.8.1"; use constant { PERL_VERSION => "perl_version", @@ -1839,9 +1839,10 @@ sub SYSMON_ShowValuesHTML ($;@) # (optional) Liste der anzuzeigenden Werte (ReadingName[:Comment:[Postfix]],...) # Beispiel: define sysv weblink htmlCode {SYSMON_ShowValuesHTML('sysmon', ('date:Datum', 'cpu_temp:CPU Temperatur: °C', 'cpu_freq:CPU Frequenz: MHz'))} #------------------------------------------------------------------------------ -sub SYSMON_ShowValuesHTMLTitled ($$;@) +sub SYSMON_ShowValuesHTMLTitled ($;$@) { my ($name, $title, @data) = @_; + $title = $attr{$name}{'alias'} unless $title; return SYSMON_ShowValuesFmt($name, $title, 1, @data); } @@ -1864,9 +1865,10 @@ sub SYSMON_ShowValuesText ($;@) # (optional) Liste der anzuzeigenden Werte (ReadingName[:Comment:[Postfix]],...) # Beispiel: define sysv weblink htmlCode {SYSMON_ShowValuesText('sysmon', ('date:Datum', 'cpu_temp:CPU Temperatur: °C', 'cpu_freq:CPU Frequenz: MHz'))} #------------------------------------------------------------------------------ -sub SYSMON_ShowValuesTextTitled ($$;@) +sub SYSMON_ShowValuesTextTitled ($;$@) { my ($name, $title, @data) = @_; + $title = $attr{$name}{'alias'} unless $title; return SYSMON_ShowValuesFmt($name, $title, 0, @data); } @@ -2675,16 +2677,16 @@ If one (or more) of the multiplier is set to zero, the corresponding readings is define sysv1 weblink htmlCode {SYSMON_ShowValuesHTML('sysmon')}
define sysv2 weblink htmlCode {SYSMON_ShowValuesHTML('sysmon', ('date:Datum', 'cpu_temp:CPU Temperatur: °C', 'cpu_freq:CPU Frequenz: MHz'))}
- Text output method (see Weblink): SYSMON_ShowValuesHTMLTitled(<SYSMON-Instance>,<Title>[,<Liste>])

+ Text output method (see Weblink): SYSMON_ShowValuesHTMLTitled(<SYSMON-Instance>[,<Title>,<Liste>])


Text output method (see Weblink): SYSMON_ShowValuesText(<SYSMON-Instance>[,<Liste>])


- Text output method (see Weblink): SYSMON_ShowValuesTextTitled(<SYSMON-Instance>,<Title>[,<Liste>])

+ Text output method (see Weblink): SYSMON_ShowValuesTextTitled(<SYSMON-Instance>[,<Title>,<Liste>])


@@ -3223,9 +3225,9 @@ If one (or more) of the multiplier is set to zero, the corresponding readings is define sysv2 weblink htmlCode {SYSMON_ShowValuesHTML('sysmon', ('date:Datum', 'cpu_temp:CPU Temperatur: °C', 'cpu_freq:CPU Frequenz: MHz'))}
- HTML-Ausgabe-Methode (für ein Weblink): SYSMON_ShowValuesHTMLTitled(<SYSMON-Instance>,<Title>[,<Liste>])

+ HTML-Ausgabe-Methode (für ein Weblink): SYSMON_ShowValuesHTMLTitled(<SYSMON-Instance>[,<Title>,<Liste>])


@@ -3234,7 +3236,7 @@ If one (or more) of the multiplier is set to zero, the corresponding readings is Analog SYSMON_ShowValuesHTML, jedoch formatiert als reines Text.

- HTML-Ausgabe-Methode (für ein Weblink): SYSMON_ShowValuesTextTitled(<SYSMON-Instance>,<Title>[,<Liste>])

+ HTML-Ausgabe-Methode (für ein Weblink): SYSMON_ShowValuesTextTitled(<SYSMON-Instance>[,<Title>,<Liste>])