From 197a32117fa992e9cd9eb39f9c97fae060f36bf1 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Thu, 4 Feb 2016 12:28:43 +0100 Subject: [PATCH] =?UTF-8?q?Attribut=20setScreenBrightness=20-=20Abfragen?= =?UTF-8?q?=20entfernt=20und=20Warnhinweis=20das=20das=20Attribut=20bald?= =?UTF-8?q?=20entfernt=20wird=20eingef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 74_AMAD.pm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/74_AMAD.pm b/74_AMAD.pm index 0ecbeba..9e12867 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -37,7 +37,7 @@ use TcpServerUtils; use Encode qw(encode); -my $version = "1.2.0"; +my $version = "1.2.1"; @@ -56,7 +56,7 @@ sub AMAD_Initialize($) { "checkActiveTask ". "setFullscreen:0,1 ". "setScreenOrientation:0,1 ". - "setScreenBrightness:0,1 ". + "setScreenBrightness:noArg ". "setBluetoothDevice ". "setScreenlockPIN ". "root:0,1 ". @@ -90,6 +90,9 @@ sub AMAD_Define($$) { $hash->{VERSION} = $version; $hash->{helper}{infoErrorCounter} = 0 if( $hash->{HOST} ); $hash->{helper}{setCmdErrorCounter} = 0 if( $hash->{HOST} ); + + + if( ! $hash->{HOST} ) { return "there is already a AMAD Bridge, did you want to define a AMAD host use: define AMAD " if( $modules{AMAD}{defptr}{BRIDGE} ); @@ -170,6 +173,11 @@ my ( $cmd, $name, $attrName, $attrVal ) = @_; } } + elsif( $attrName eq "setScreenBrightness" ) { + Log3 $name, 1, "AMAD ($name) - !!!The Attribut \"setScreenBrightness\" is obsolete and will be remove in the future!!! Please delete the attribut description in your AMAD Device"; + Log3 $name, 1, "AMAD ($name) - !!!Das Attribut \"setScreenBrightness\" wird nicht mehr benötigt und in zukünftigen Versionen entfernt!!! Bitte lösche die Attributszuweisung aus Deinem AMAD Device"; + } + elsif( $attrName eq "interval" ) { if( $cmd eq "set" ) { if( $attrVal < 60 ) { @@ -414,7 +422,9 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$) { my $t; my $v; while( ( $t, $v ) = each %buffer ) { + $v =~ s/null//g; + readingsBulkUpdate( $hash, $t, $v ) if( defined( $v ) ); } @@ -449,7 +459,7 @@ sub AMAD_Set($$@) { $list .= "volume:slider,0,1,15 "; $list .= "deviceState:online,offline "; $list .= "mediaPlayer:play,stop,next,back " if( ReadingsVal( $bname, "fhemServerIP", "none" ) ne "none"); - $list .= "screenBrightness:slider,0,1,255 " if( AttrVal( $name, "setScreenBrightness", "1" ) eq "1" ); + $list .= "screenBrightness:slider,0,1,255 "; $list .= "screen:on,off "; $list .= "screenOrientation:auto,landscape,portrait " if( AttrVal( $name, "setScreenOrientation", "1" ) eq "1" ); $list .= "screenFullscreen:on,off " if( AttrVal( $name, "setFullscreen", "1" ) eq "1" ); @@ -1313,6 +1323,7 @@ sub AMAD_decrypt($) {
  • notifySndFile - plays the specified media file on the Android device. The file to be played must be in the folder /storage/emulated/0/Notifications/.
  • openURL - opens a URL in your default browser
  • screen - are sets the screen on / off with barrier in the car Magic settings must "Admin Function" set will not work "Screen off".
    • +
  • screen Brightness - sets the screen brightness, 0-255
  • screenMsg - sends a message screen
  • Status Request - calls for a new Status Report in Device to
  • ttsMsg - sends a message which is output as a voice message
    • @@ -1325,7 +1336,6 @@ sub AMAD_decrypt($) {
    • changetoBtDevice - changes to another Bluetooth device. The attribute setBluetoothDevice must be set. See hint below!
    • openapp - opens a selected app. Attribute setOpenApp
      • -
    • screen Brightness - sets the screen brightness, 0-255 Attribute setScreenBrightness
      • If you want to use the "set screen brightness", a small adjustment in the flow SetCommands must be made. Opens the action (one of the squares very bottom) Set System Settings: System and makes a check "I have checked the settings, I know what I'm doing".
    • screen fullscreen - Switches to full screen mode on / off. Attribute SetFullscreen
    • screenLock - locked Screen by set Pinlock. Attribute setScreenlockPIN - There are only allowed numbers and it must be more than 4 and less as 16 character
      • @@ -1542,6 +1552,7 @@ sub AMAD_decrypt($) {
    • openURL - öffnet eine URL im Standardbrowser
    • screen - setzt den Bildschirm on/off mit Sperre, in den Automagic Einstellungen muss "Admin Funktion" gesetzt werden sonst funktioniert "Screen off" nicht.
    • screenMsg - versendet eine Bildschirmnachricht
      • +
    • screenBrightness - setzt die Bildschirmhelligkeit, von 0-255.
    • statusRequest - Fordert einen neuen Statusreport beim Device an
    • ttsMsg - versendet eine Nachricht welche als Sprachnachricht ausgegeben wird
    • vibrate - lässt das Androidgerät vibrieren
      • @@ -1553,7 +1564,6 @@ sub AMAD_decrypt($) {
      • changetoBtDevice - wechselt zu einem anderen Bluetooth Gerät. Attribut setBluetoothDevice muß gesetzt sein. Siehe Hinweis unten!
      • openApp - öffnet eine ausgewählte App. Attribut setOpenApp
        • -
      • screenBrightness - setzt die Bildschirmhelligkeit, von 0-255 Attribut setScreenBrightness
        • Wenn Ihr das "set screenBrightness" verwenden wollt, muss eine kleine Anpassung im Flow SetCommands vorgenommen werden. Öffnet die Aktion (eines der Vierecke ganz ganz unten) SetzeSystemeinstellung:System und macht einen Haken bei "Ich habe die Einstellungen überprüft, ich weiss was ich tue".
      • screenFullscreen - Schaltet den Vollbildmodus on/off. Attribut setFullscreen