diff --git a/fhem/FHEM/70_ENIGMA2.pm b/fhem/FHEM/70_ENIGMA2.pm index ba6de05dd..108e72c33 100644 --- a/fhem/FHEM/70_ENIGMA2.pm +++ b/fhem/FHEM/70_ENIGMA2.pm @@ -24,7 +24,7 @@ # along with fhem. If not, see . # # -# Version: 1.2.6 +# Version: 1.2.7 # # Major Version History: # - 1.2.0 - 2013-12-21 @@ -611,14 +611,19 @@ sub ENIGMA2_GetStatus($;$) { my @servicetype = split( /:/, $currsrvinfo->{e2service}{$e2reading} ); - if ( defined( $servicetype[2] ) + if ( + defined( $servicetype[2] ) && $servicetype[2] eq "2" - && $hash->{READING}{input}{VAL} ne "radio" ) + && ( !defined( $hash->{READINGS}{input}{VAL} ) + || $hash->{READINGS}{input}{VAL} ne "radio" ) + ) { $hash->{helper}{lastInput} = "radio"; readingsBulkUpdate( $hash, "input", "radio" ); } - elsif ( $hash->{READING}{input}{VAL} ne "tv" ) { + elsif ( !defined( $hash->{READINGS}{input}{VAL} ) + || $hash->{READINGS}{input}{VAL} ne "tv" ) + { $hash->{helper}{lastInput} = "tv"; readingsBulkUpdate( $hash, "input", "tv" ); } @@ -1013,8 +1018,14 @@ sub ENIGMA2_Set($@) { my $usage = "Unknown argument " . $a[1] - . ", choose one of statusRequest:noArg toggle:noArg on:noArg off:noArg reboot:noArg restartGui:noArg shutdown:noArg volume:slider,0,1,100 volumeUp:noArg volumeDown:noArg mute:on,off msg remoteControl:UP,DOWN,LEFT,RIGHT,OK,MENU,EPG,ESC,EXIT,RECORD,RED,GREEN,YELLOW,BLUE,AUDIO channelUp:noArg channelDown:noArg play:noArg pause:noArg stop:noArg showText channel:" + . ", choose one of statusRequest:noArg toggle:noArg on:noArg off:noArg reboot:noArg restartGui:noArg shutdown:noArg volume:slider,0,1,100 volumeUp:noArg volumeDown:noArg msg remoteControl channelUp:noArg channelDown:noArg play:noArg pause:noArg stop:noArg showText channel:" . $channels; + $usage .= " mute:-,on,off" + if ( defined( $hash->{READINGS}{mute}{VAL} ) + && $hash->{READINGS}{mute}{VAL} eq "-" ); + $usage .= " mute:on,off" + if ( defined( $hash->{READINGS}{mute}{VAL} ) + && $hash->{READINGS}{mute}{VAL} ne "-" ); $usage .= " input:-,tv,radio" if ( defined( $hash->{READINGS}{input}{VAL} ) && $hash->{READINGS}{input}{VAL} eq "-" ); @@ -2507,7 +2518,7 @@ sub ENIGMA2_GetRemotecontrolCommand($) {
  • volume 0...100   -   set the volume level in percentage
  • volumeUp   -   increases the volume level
  • volumeDown   -   decreases the volume level
    • -
  • mute on,off   -   controls volume mute
    • +
  • mute on,off,toggle   -   controls volume mute
  • play on,off   -   starts/resumes playback
  • pause on,off   -   pauses current playback or enables timeshift
  • stop on,off   -   stops current playback
    • @@ -2550,16 +2561,17 @@ sub ENIGMA2_GetRemotecontrolCommand($) {

    Currently, the following commands are defined:

    -
    @@ -2573,6 +2585,7 @@ sub ENIGMA2_GetRemotecontrolCommand($) {
  • disable - Disable polling (true/false)
  • http-method - HTTP access method to be used; e.g. a FritzBox might need to use POST instead of GET (GET/POST)
  • https - Access box via secure HTTP (true/false)
    • +
  • model - The uses device model; set automatically according to device information
  • timeout - Set different polling timeout in seconds (default=6)

    • @@ -2585,36 +2598,49 @@ sub ENIGMA2_GetRemotecontrolCommand($) {
  • apid - Shows the audio process ID for current channel
  • ber - Shows Bit Error Rate for current channel
  • channel - Shows the service name of current channel or media file name; part of FHEM-4-AV-Devices compatibility
    • -
  • currentTitle - Shows the title of the running event; part of FHEM-4-AV-Devices compatibility
  • currentMedia - The service reference ID of current channel; part of FHEM-4-AV-Devices compatibility
    • +
  • currentTitle - Shows the title of the running event; part of FHEM-4-AV-Devices compatibility
  • enigmaversion - Shows the installed version of ENIGMA2
  • eventcurrenttime - Shows the current time of running event as UNIX timestamp
  • eventcurrenttime_hr - Shows the current time of running event in human-readable format
    • +
  • eventcurrenttime_next - Shows the current time of next event as UNIX timestamp
    • +
  • eventcurrenttime_next_hr - Shows the current time of next event in human-readable format
  • eventdescription - Shows the description of running event
    • +
  • eventdescription_next - Shows the description of next event
  • evenduration - Shows the total duration time of running event in seconds
  • evenduration_hr - Shows the total duration time of running event in human-readable format
    • -
  • eventid - Shows the ID of running event
    • +
  • evenduration_next - Shows the total duration time of next event in seconds
    • +
  • evenduration_next_hr - Shows the total duration time of next event in human-readable format
    • +
  • eventname - Shows the name of running event
    • +
  • eventname_next - Shows the name of next event
    • +
  • eventremaining - Shows the remaining duration time of running event in seconds
    • +
  • eventremaining_hr - Shows the remaining duration time of running event in human-readable format
    • +
  • eventremaining_next - Shows the remaining duration time of next event in seconds
    • +
  • eventremaining_next_hr - Shows the remaining duration time of next event in human-readable format
  • eventstart - Shows the starting time of running event as UNIX timestamp
  • eventstart_hr - Shows the starting time of running event in human readable format
    • +
  • eventstart_next - Shows the starting time of next event as UNIX timestamp
    • +
  • eventstart_next_hr - Shows the starting time of next event in human readable format
  • eventtitle - Shows the title of the running event
    • +
  • eventtitle_next - Shows the title of the next event
  • fpversion - Shows the firmware version for the front processor
  • hddX_capacity - Shows the total capacity of the installed hard drive in GB
  • hddX_free - Shows the free capacity of the installed hard drive in GB
  • hddX_model - Shows hardware details for the installed hard drive
  • imageversion - Shows the version for the installed software image
  • input - Shows currently used input; part of FHEM-4-AV-Devices compatibility
    • +
  • iswidescreen - Indicates widescreen format - 0=off 1=on
  • lanmac - Shows the device MAC address
  • model - Shows details about the device hardware
  • mute - Reports the mute status of the device (can be "on" or "off")
    • +
  • nextTitle - Shows the title of the next event; part of FHEM-4-AV-Devices compatibility
  • onid - The ON ID
  • pcrpid - The PCR process ID
  • pmtpid - The PMT process ID
  • power - Reports the power status of the device (can be "on" or "off")
  • presence - Reports the presence status of the receiver (can be "absent" or "present"). In case of an absent device, control is basically limited to turn it on again. This will only work if the device supports Wake-On-LAN packages, otherwise command "on" will have no effect.
    • -
  • serviceaspect - Aspect ratio for current channel
    • +
  • providername - Service provider of current channel
  • servicename - Name for current channel
    • -
  • servicenamespace - Namespace for current channel
    • -
  • serviceprovider - Service provider of current channel
  • servicereference - The service reference ID of current channel
  • servicevideosize - Video resolution for current channel
  • sid - The S-ID