diff --git a/CHANGED b/CHANGED index f8916669c..0eb2759ad 100644 --- a/CHANGED +++ b/CHANGED @@ -1,5 +1,8 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 49_SSCam: V7.4.0, new set command createReadingsGroup, change set + snap to avoid insufficiency get snapinfo if camera + are very similar in SVS - bugfix: 74_XiaomiBTLESens: fix humidity bug - bugfix: 88_HMCCU: Some minor bugs fixed - bugfix: 42_XiaomiBTLESens: bugfix humidity reading diff --git a/FHEM/49_SSCam.pm b/FHEM/49_SSCam.pm index d37394848..f354dd008 100644 --- a/FHEM/49_SSCam.pm +++ b/FHEM/49_SSCam.pm @@ -45,6 +45,8 @@ use HttpUtils; # Versions History intern our %SSCam_vNotesIntern = ( + "7.4.0" => "24.11.2018 new set command \"createReadingsGroup\", versionNotes can process lists like \"2,6\", changed compatibility check, use SnapId when get information after took snapshot and sscam state-event ", + "7.3.3" => "18.11.2018 change rights decsption in commandRef ", "7.3.2" => "12.11.2018 fix Warning in line 4954, set COMPATIBILITY to 8.2.2 ", "7.3.1" => "31.10.2018 fix connection lost failure if several SSCamSTRM devices are defined and updated by longpoll from same parent device ", "7.3.0" => "28.10.2018 usage of attribute \"livestreamprefix\" changed, exec SSCam_getStmUrlPath on boot ", @@ -92,6 +94,8 @@ our %SSCam_vNotesIntern = ( # Versions History extern our %SSCam_vNotesExtern = ( + "7.4.0" => "20.11.2018 new command \"createReadingsGroup\". By this command a ReadingsGroup with a name of your choice (or use the default name) can be created. ". + "Procedure changes of taking snapshots avoid inaccuracies if camera names in SVS very similar. ", "7.3.2" => "12.11.2018 fix Warning if 'livestreamprefix' is set to DEF, COMPATIBILITY set to 8.2.2 ", "7.3.0" => "28.10.2018 In attribute \"livestreamprefix\" can now \"DEF\" be specified to overwrite livestream address by specification from device definition ", "7.2.1" => "23.10.2018 COMPATIBILITY changed to 8.2.1 ", @@ -173,6 +177,9 @@ our %SSCam_vNotesExtern = ( # Hint Hash en our %SSCam_vHintsExt_en = ( + "6" => "There are some Icons in directory www/images/sscam available for SSCam. Thereby the system can use the icons please do:
". + "- in FHEMWEB device attribute iconPath complete with \"sscam\", e.g.: attr WEB iconPath default:fhemSVG:openautomation:sscam
". + "After that execute \"rereadicons\" or restart FHEM. ", "5" => "Find more Informations about manage users and the appropriate privilege profiles in ". "Surveillance Station online help ", "4" => "The message Meldung \"WARNING - The current/simulated SVS-version ... may be incompatible with SSCam version...\" means that ". @@ -188,9 +195,11 @@ our %SSCam_vHintsExt_en = ( # Hint Hash de our %SSCam_vHintsExt_de = ( + "6" => "Für SSCam wird ein Satz Icons im Verzeichnis www/images/sscam zur Verfügung gestellt. Damit das System sie findet bitte setzen:
". + "- im FHEMWEB Device Attribut iconPath um \"sscam\" ergänzen, z.B.: attr WEB iconPath default:fhemSVG:openautomation:sscam
". + "Danach ein \"rereadicons\" bzw. einen FHEM restart ausführen. ", "5" => "Informationen zum Management von Usern und entsprechenden Rechte-Profilen sind in der ". "Surveillance Station Online-Hilfe zu finden.", - "4" => "Die Meldung \"WARNING - The current/simulated SVS-version ... may be incompatible with SSCam version...\" ist ein Hinweis darauf, dass ". "die eingesetzte SSCam Version noch nicht mit der verwendeten Version von Synology Surveillance Station (Reading \"SVSversion\") getestet ". "wurde. Die kompatible SVS-Version ist im Internal COMPATIBILITY ersichtlich.\n". @@ -203,7 +212,7 @@ our %SSCam_vHintsExt_de = ( ); # getestete SVS-Version -my $compstat = "8.2.2"; +my $compstat = "8.2"; # Aufbau Errorcode-Hashes (siehe Surveillance Station Web API) my %SSCam_errauthlist = ( @@ -615,6 +624,7 @@ sub SSCam_Set($@) { "disable:noArg ". "optimizeParams ". ((ReadingsVal("$name", "CapPIR", "false") ne "false") ? "pirSensor:activate,deactivate ": ""). + "createReadingsGroup ". "runView:live_fw".$hlslfw."live_link,live_open,lastrec_fw,lastrec_fw_MJPEG,lastrec_fw_MPEG4/H.264,lastrec_open,lastsnap_fw ". ((ReadingsVal("$name", "CapPTZPan", "false") ne "false") ? "setPreset ": ""). ((ReadingsVal("$name", "CapPTZPan", "false") ne "false") ? "setHome:---currentPosition---,".ReadingsVal("$name","Presets","")." " : ""). @@ -630,6 +640,7 @@ sub SSCam_Set($@) { # setlist für SVS Devices $setlist = "Unknown argument $opt, choose one of ". "credentials ". + "createReadingsGroup ". "extevent:1,2,3,4,5,6,7,8,9,10 ". ($hash->{HELPER}{APIHMMAXVER}?"homeMode:on,off ": ""); } @@ -759,6 +770,89 @@ sub SSCam_Set($@) { $attr{$livedev}{room} = $room; return "Livestream device \"$livedev\" created and assigned to room \"$room\"."; + } elsif ($opt eq "createReadingsGroup") { + if (!$hash->{CREDENTIALS}) {return "Credentials of $name are not set - make sure you've set it with \"set $name credentials username password\"";} + my $rgdev = $prop?$prop:"RG.SSCam"; + + my $rgdef = '<%it_camera>,On/Offline>,< >,,< >,erkennung>,< >,,< >,(MB)>,< >,,< >,Modul>,< >,'."\n". + 'TYPE=SSCam:FILTER=MODEL!=SVS:Availability,< >,state,< >,CamMotDetSc,< >,CamLastRecTime,< >,UsedSpaceMB,< >,LastUpdateTime,< >,?!disable,< >,?!LSnap,?!LRec,?!Start,?!Stop'."\n". + '< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >'."\n". + '< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >'."\n". + '< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >'."\n". + '<%it_server>,On/Off>,< >,,< >, >,< >,< >,< >,< >, >,< >,< >,< >,< >,< >,< >,< >,< >,< >,< >'."\n". + 'TYPE=SSCam:FILTER=MODEL=SVS:HomeModeState,< >,state,< >,< >,< >,< >,< >,< >, >,< >,< >,< >,?!disable,< >,< >,< >,< >,< >'."\n". + ''; + + my $ret = CommandDefine($hash->{CL},"$rgdev readingsGroup $rgdef"); + return $ret if($ret); + + my $room = AttrVal($name,"room","SSCam"); + CommandAttr($hash->{CL},"$rgdev room $room"); + CommandAttr($hash->{CL},"$rgdev alias Überblick Kameras"); + + my $cellStyle = '{'."\n". + ' "c:0" => \'style="text-align:left;font-weight:normal"\','."\n". + ' "c:1" => \'style="text-align:left;font-weight:normal"\','."\n". + ' "c:4" => \'style="text-align:center;font-weight:bold"\','."\n". + ' "c:5" => \'style="text-align:center;color:green;font-weight:normal"\','."\n". + ' "c:9" => \'style="text-align:center;font-weight:normal"\''."\n". + '}'; + CommandAttr($hash->{CL},"$rgdev cellStyle $cellStyle"); + + my $commands = '{'."\n". + ' "Availability.enabled" => "set $DEVICE disable",'."\n". + ' "Availability.disabled" => "set $DEVICE enable",'."\n". + ' "HomeModeState.on" => "set $DEVICE homeMode off",'."\n". + ' "HomeModeState.off" => "set $DEVICE homeMode on",'."\n". + ' "'.$rgdev.'.Start" => "set %DEVICE runView live_fw",'."\n". + ' "Start" => "set %DEVICE runView live_fw",'."\n". + ' "LRec" => "set %DEVICE runView lastrec_fw",'."\n". + ' "LSnap" => "set %DEVICE runView lastsnap_fw",'."\n". + ' "Stop" => "set %DEVICE stopView",'."\n". + ' "Record" => "runView:",'."\n". + ' "disable" => "disable:"'."\n". + '}'; + CommandAttr($hash->{CL},"$rgdev commands $commands"); + + my $nameStyle = 'style = "color:black;font-weight:bold;text-align:center"'; + CommandAttr($hash->{CL},"$rgdev nameStyle $nameStyle"); + + my $valueColumns = '{'."\n". + ' \'Wiedergabe\' => \'colspan="4"\''."\n". + '}'; + CommandAttr($hash->{CL},"$rgdev valueColumns $valueColumns"); + + my $valueFormat = '{'."\n". + ' ($READING eq "CamMotDetSc" && $VALUE eq "disabled") ? "external" : $VALUE'."\n". + '}'; + CommandAttr($hash->{CL},"$rgdev valueFormat $valueFormat"); + + my $valueIcon = '{'."\n". + ' "Availability.enabled" => "remotecontrol/black_btn_GREEN",'."\n". + ' "Availability.disabled" => "remotecontrol/black_btn_RED",'."\n". + ' "HomeModeState.on" => "status_available",'."\n". + ' "HomeModeState.off" => "status_away_1\@orange",'."\n". + ' "Start" => "black_btn_MJPEG",'."\n". + ' "LRec" => "black_btn_LASTRECIFRAME",'."\n". + ' "LSnap" => "black_btn_LSNAP",'."\n". + ' "Stop" => "remotecontrol/black_btn_POWEROFF3",'."\n". + ' "state.initialized" => "remotecontrol/black_btn_STOP",'."\n". + ' "state" => "%devStateIcon"'."\n". + '}'; + CommandAttr($hash->{CL},"$rgdev valueIcon $valueIcon"); + + my $valueStyle = '{'."\n". + ' if($READING eq "Availability" && $VALUE eq "enabled"){ \' style="color:green" \' }'."\n". + ' elsif( $READING eq "Availability" && $VALUE eq "disabled"){ \' style="color:red" \' }'."\n". + ' elsif( $READING eq "CamMotDetSc" && $VALUE =~ /SVS.*/ ){ \' style="color:orange" \' }'."\n". + ' elsif( $READING eq "CamMotDetSc" && $VALUE eq "disabled"){ \' style="color:LimeGreen" \' }'."\n". + ' elsif( $READING eq "CamMotDetSc" && $VALUE =~ /Cam.*/ ){ \' style="color:SandyBrown" \' }'."\n". + '}'; + CommandAttr($hash->{CL},"$rgdev valueStyle $valueStyle"); + + + return "readingsGroup device \"$rgdev\" created and assigned to room \"$room\"."; + } elsif ($opt eq "enable" && SSCam_IsModelCam($hash)) { if (!$hash->{CREDENTIALS}) {return "Credentials of $name are not set - make sure you've set it with \"set $name credentials username password\"";} SSCam_camenable($hash); @@ -1180,11 +1274,14 @@ sub SSCam_Get($@) { $ret .= ""; $ret .= ""; if($arg && $arg =~ /[\d]+/) { - if(AttrVal("global","language","EN") eq "DE") { - %hs = ( $arg => $SSCam_vHintsExt_de{$arg} ); - } else { - %hs = ( $arg => $SSCam_vHintsExt_en{$arg} ); - } + my @hints = split(",",$arg); + foreach (@hints) { + if(AttrVal("global","language","EN") eq "DE") { + $hs{$_} = $SSCam_vHintsExt_de{$_}; + } else { + $hs{$_} = $SSCam_vHintsExt_en{$_}; + } + } } else { if(AttrVal("global","language","EN") eq "DE") { %hs = %SSCam_vHintsExt_de; @@ -3892,9 +3989,15 @@ sub SSCam_camop ($) { my $limit = $hash->{HELPER}{SNAPLIMIT}; my $imgsize = $hash->{HELPER}{SNAPIMGSIZE}; my $keyword = $hash->{HELPER}{KEYWORD}; - Log3($name,4, "$name - Call getsnapinfo with params: Image numbers => $limit, Image size => $imgsize, Keyword => $keyword"); - $url = "$proto://$serveraddr:$serverport/webapi/$apitakesnappath?api=\"$apitakesnap\"&method=\"List\"&version=\"$apitakesnapmaxver\"&keyword=\"$keyword\"&imgSize=\"$imgsize\"&limit=\"$limit\"&_sid=\"$sid\""; - + my $snapid = ReadingsVal("$name", "LastSnapId", " "); + if($OpMode eq "getsnapinfo") { + Log3($name,4, "$name - Call getsnapinfo with params: Image numbers => $limit, Image size => $imgsize, Id => $snapid"); + $url = "$proto://$serveraddr:$serverport/webapi/$apitakesnappath?api=\"$apitakesnap\"&method=\"List\"&version=\"$apitakesnapmaxver\"&idList =\"$snapid\"&keyword=\"$keyword\"&imgSize=\"$imgsize\"&limit=\"$limit\"&_sid=\"$sid\""; + } else { + Log3($name,4, "$name - Call getsnapinfo with params: Image numbers => $limit, Image size => $imgsize, Keyword => $keyword"); + $url = "$proto://$serveraddr:$serverport/webapi/$apitakesnappath?api=\"$apitakesnap\"&method=\"List\"&version=\"$apitakesnapmaxver\"&keyword=\"$keyword\"&imgSize=\"$imgsize\"&limit=\"$limit\"&_sid=\"$sid\""; + } + } elsif ($OpMode eq "getsnapfilename") { # der Filename der aktuellen Schnappschuß-ID wird ermittelt $snapid = ReadingsVal("$name", "LastSnapId", " "); @@ -4549,9 +4652,10 @@ sub SSCam_camop_parse ($) { } elsif ($OpMode eq "Snap") { # ein Schnapschuß wurde aufgenommen # falls Aufnahme noch läuft -> state = on setzen - SSCam_refresh($hash,0,0,0); # kein Room-Refresh, kein SSCam-state-Event, kein SSCamSTRM-Event + SSCam_refresh($hash,0,1,0); # kein Room-Refresh, SSCam-state-Event, kein SSCamSTRM-Event $snapid = $data->{data}{'id'}; + readingsSingleUpdate($hash,"LastSnapId",$snapid, 0) if($snapid); readingsBeginUpdate($hash); readingsBulkUpdate($hash,"Errorcode","none"); @@ -4887,7 +4991,7 @@ sub SSCam_camop_parse ($) { } # Kompatibilitätscheck - my $avsc = $major.$minor.(($small=~/\d/)?$small:0); + my $avsc = $major.$minor; my $avcomp = $hash->{COMPATIBILITY}; $avcomp =~ s/\.//g; @@ -6529,6 +6633,7 @@ sub SSCam_experror {
  • provides a panel for camera control (at PTZ-cameras)
  • create different types of discrete Streaming-Devices (createStreamDev)
  • Activation / Deactivation of a camera integrated PIR sensor
    • +
  • Creation of a readingsGroup device to display an overview of all defined SSCam devices (createReadingsGroup)

    • @@ -6677,8 +6782,8 @@ sub SSCam_experror {
  • set ... off session: ServeillanceStation - observer with enhanced privilege "manual recording"
  • set ... snap session: ServeillanceStation - observer
  • set ... delPreset session: ServeillanceStation - observer
    • -
  • set ... disable session: ServeillanceStation - manager
    • -
  • set ... enable session: ServeillanceStation - manager
    • +
  • set ... disable session: ServeillanceStation - manager with edit camera right
    • +
  • set ... enable session: ServeillanceStation - manager with edit camera right
  • set ... expmode session: ServeillanceStation - manager
  • set ... extevent session: DSM - user as member of admin-group
  • set ... goPreset session: ServeillanceStation - observer with privilege objective control of camera
    • @@ -6778,13 +6883,28 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay>

    +
      +
    • set <name> createReadingsGroup [<name of readingsGroup>]     (valid for CAM/SVS)

      • + + This command creates a readingsGroup device to display an overview of all defined SSCam devices. + A name for the new readingsGroup device can be specified. Is no own name specified, the readingsGroup device will be + created with name "RG.SSCam". +
      +

      +
    +
    • set <name> createSnapGallery     (valid for CAM)

      • A snapshot gallery will be created as a separate device (type SSCamSTRM). The device will be provided in room "SnapGallery". With the "snapGallery..."-attributes respectively the specific attributes of the SSCamSTRM-device - you are able to manipulate the properties of the new snapshot gallery device.
      + you are able to manipulate the properties of the new snapshot gallery device. +

      + + Note
      + The camera names in Synology SVS should not be very similar, otherwise the retrieval of snapshots could come to inaccuracies. +

    @@ -7235,6 +7355,11 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay> command.
    If you want create a snapgallery output by triggering, e.g. with an "at" or "notify", you should use the "get <name> snapGallery" command instead of "set". +

    + + Note
    + The camera names in Synology SVS should not be very similar, otherwise the retrieval of snapshots could come to inaccuracies. +

    @@ -7369,7 +7494,8 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay>
      Note:
      Depended from quantity and resolution (quality) of the snapshot images adequate CPU and/or main memory - ressources are needed. + ressources are needed. The camera names in Synology SVS should not be very similar, otherwise the retrieval of + snapshots could come to inaccuracies.


    @@ -7586,7 +7712,9 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay>
  • ptzPanel_iconPath
    Path for icons used in PTZ-control panel, default is "www/images/sscam". - The attribute value will be used for all icon-files except *.svg.

    • + The attribute value will be used for all icon-files except *.svg.
    + For further information execute "get <name> versionNotes 2,6". +
  • ptzPanel_iconPrefix
    @@ -7845,6 +7973,7 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay>
  • erstellen eines Paneels zur Kamera-Steuerung. (bei PTZ-Kameras)
  • erzeugen unterschiedlicher Typen von separaten Streaming-Devices (createStreamDev)
  • Aktivierung / Deaktivierung eines kamerainternen PIR-Sensors
    • +
  • Erzeugung einer readingsGroup zur Anzeige aller definierten SSCam-Devices (createReadingsGroup)

    • @@ -7997,8 +8126,8 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay>
  • set ... credentials -
  • set ... delPreset session: ServeillanceStation - Betrachter
    • -
  • set ... disable session: ServeillanceStation - Manager
    • -
  • set ... enable session: ServeillanceStation - Manager
    • +
  • set ... disable session: ServeillanceStation - Manager mit dem Kamera bearbeiten Recht
    • +
  • set ... enable session: ServeillanceStation - Manager mit dem Kamera bearbeiten Recht
  • set ... expmode session: ServeillanceStation - Manager
  • set ... extevent session: DSM - Nutzer Mitglied von Admin-Gruppe
  • set ... goPreset session: ServeillanceStation - Betrachter mit Privileg Objektivsteuerung der Kamera
    • @@ -8099,6 +8228,15 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay> SSCamSTRM-Devices können die Eigenschaften des PTZ-Paneels beeinflusst werden.


    + +
      +
    • set <name> createReadingsGroup [<Name der readingsGroup>]     (gilt für CAM/SVS)

      • + + Es wird ein readingsGroup-Device zur Übersicht aller vorhandenen SSCam-Devices erstellt. Es kann ein eigener Name angegeben + werden. Ist kein Name angegeben, wird eine readingsGroup mit dem Namen "RG.SSCam" erzeugt. +
      +

      +
    • set <name> createSnapGallery     (gilt für CAM)

      • @@ -8106,7 +8244,14 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay> Es wird eine Schnappschußgallerie als separates Device (Type SSCamSTRM) erzeugt. Das Device wird im Raum "SnapGallery" erstellt. Mit den "snapGallery..."-Attributen bzw. den spezifischen Attributen des erzeugten SSCamSTRM-Devices - können die Eigenschaften der Schnappschußgallerie beeinflusst werden.
      + können die Eigenschaften der Schnappschußgallerie beeinflusst werden. +

      + + Hinweis
      + Die Namen der Kameras in der SVS sollten sich nicht stark ähneln, da es ansonsten zu Ungenauigkeiten beim Abruf der + Schnappschußgallerie kommen kann. +
      +

    @@ -8562,6 +8707,12 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay> dargestellt. Alle weiteren Funktionen und Attribute entsprechen dem "get <name> snapGallery" Kommando.
    Wenn die Ausgabe einer Schnappschußgalerie, z.B. über ein "at oder "notify", getriggert wird, sollte besser das "get <name> snapGallery" Kommando anstatt "set" verwendet werden. +

    + + Hinweis
    + Die Namen der Kameras in der SVS sollten sich nicht stark ähneln, da es ansonsten zu Ungenauigkeiten beim Abruf der + Schnappschußgallerie kommen kann. +

    @@ -8702,7 +8853,8 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay>
      Hinweis:
      Abhängig von der Anzahl und Auflösung (Qualität) der Schnappschuß-Images werden entsprechend ausreichende CPU und/oder - RAM-Ressourcen benötigt. + RAM-Ressourcen benötigt. Die Namen der Kameras in der SVS sollten sich nicht stark ähneln, da es ansonsten zu + Ungnauigkeiten beim Abruf der Schnappschußgallerie kommen kann.


    @@ -8932,7 +9084,9 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay>
  • ptzPanel_iconPath
    Pfad für Icons im PTZ-Steuerungspaneel, default ist "www/images/sscam". - Der Attribut-Wert wird für alle Icon-Dateien außer *.svg verwendet.

    • + Der Attribut-Wert wird für alle Icon-Dateien außer *.svg verwendet.
    + Für weitere Information bitte "get <name> versionNotes 2,6" ausführen. +
  • ptzPanel_iconPrefix