From b4941e3b40ed4f33bdbbe7dc33edfed2f5949172 Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Fri, 6 Apr 2018 12:37:35 +0000 Subject: [PATCH] 74_AMADDevice: add support to set and read Adaptive brightness git-svn-id: https://svn.fhem.de/fhem/trunk@16559 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/73_AMADCommBridge.pm | 2 +- fhem/FHEM/74_AMADDevice.pm | 17 +- ....xml => 74_AMADautomagicFlowset_4.2.2.xml} | 1692 +++++++++-------- ...prj.xml => 74_AMADtaskerset_4.2.2.prj.xml} | 53 +- 5 files changed, 933 insertions(+), 832 deletions(-) rename fhem/FHEM/lib/{74_AMADautomagicFlowset_4.2.1.xml => 74_AMADautomagicFlowset_4.2.2.xml} (82%) rename fhem/FHEM/lib/{74_AMADtaskerset_4.2.1.prj.xml => 74_AMADtaskerset_4.2.2.prj.xml} (99%) diff --git a/fhem/CHANGED b/fhem/CHANGED index f23a4c098..bec693913 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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: 74_AMADDevice: add support to set and read Adaptive brightness - bugfix: 88_xs1Bridge: blacklist option (forum #790923) - bugfix: 49_SSCam: V3.8.3, fix of version 3.8.2 - change: 49_SSCam: V3.8.2, internal codereview, minor fixes diff --git a/fhem/FHEM/73_AMADCommBridge.pm b/fhem/FHEM/73_AMADCommBridge.pm index 3032f6252..2ff094bfb 100644 --- a/fhem/FHEM/73_AMADCommBridge.pm +++ b/fhem/FHEM/73_AMADCommBridge.pm @@ -77,7 +77,7 @@ eval "use JSON;1" or $missingModul .= "JSON "; my $modulversion = "4.2.2"; -my $flowsetversion = "4.2.1"; +my $flowsetversion = "4.2.2"; diff --git a/fhem/FHEM/74_AMADDevice.pm b/fhem/FHEM/74_AMADDevice.pm index 7f387bc0e..40887e55c 100644 --- a/fhem/FHEM/74_AMADDevice.pm +++ b/fhem/FHEM/74_AMADDevice.pm @@ -60,8 +60,8 @@ eval "use JSON;1" or $missingModul .= "JSON "; -my $modulversion = "4.2.3"; -my $flowsetversion = "4.2.1"; +my $modulversion = "4.2.4"; +my $flowsetversion = "4.2.2"; @@ -550,6 +550,13 @@ sub AMADDevice_Set($$@) { $method = "POST"; } + elsif( lc $cmd eq 'screenbrightnessmode' ) { + my $mode = join( " ", @args ); + + $path = "/fhem-amad/setCommands/setBrightnessMode?brightnessmode=".($mode eq 'on' ? 1 : 0); + $method = "POST"; + } + elsif( lc $cmd eq 'screen' ) { my $mod = join( " ", @args ); @@ -773,7 +780,7 @@ sub AMADDevice_Set($$@) { $list .= $_ . ':' . join(',',@playerList) . ' '; } - $list .= "screenMsg ttsMsg screenBrightness:slider,0,1,255 screen:on,off,lock,unlock openURL nextAlarmTime:time timer:slider,1,1,60 statusRequest:noArg bluetooth:on,off notifySndFile clearNotificationBar:All,Automagic activateVoiceInput:noArg vibrate:noArg sendIntent openCall closeCall:noArg currentFlowsetUpdate:noArg installFlowSource doNotDisturb:never,always,alarmClockOnly,onlyImportant userFlowState userFlowRun sendSMS startDaydream:noArg volumeUp:noArg volumeDown:noArg mute:on,off showHomeScreen:noArg takePicture:noArg takeScreenshot:noArg"; + $list .= "screenMsg ttsMsg screenBrightnessMode:on,off screenBrightness:slider,0,1,255 screen:on,off,lock,unlock openURL nextAlarmTime:time timer:slider,1,1,60 statusRequest:noArg bluetooth:on,off notifySndFile clearNotificationBar:All,Automagic activateVoiceInput:noArg vibrate:noArg sendIntent openCall closeCall:noArg currentFlowsetUpdate:noArg installFlowSource doNotDisturb:never,always,alarmClockOnly,onlyImportant userFlowState userFlowRun sendSMS startDaydream:noArg volumeUp:noArg volumeDown:noArg mute:on,off showHomeScreen:noArg takePicture:noArg takeScreenshot:noArg"; $list .= " screenOrientation:auto,landscape,portrait" if( AttrVal( $name, "setScreenOrientation", "0" ) eq "1" ); $list .= " screenFullscreen:on,off" if( AttrVal( $name, "setFullscreen", "0" ) eq "1" ); @@ -1103,6 +1110,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • powerPlugged - 0=no/1,2=yes, power supply connected
  • screen - on locked,unlocked/off locked,unlocked, state of display
  • screenBrightness - 0-255, level of screen-brightness
    • +
  • screenBrightnessMode - Adaptive brightness on,off
  • screenFullscreen - on/off, full screen mode (Automagic only)
  • screenOrientation - Landscape/Portrait, screen orientation (horizontal,vertical)
  • screenOrientationMode - auto/manual, mode for screen orientation
    • @@ -1135,6 +1143,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • notifySndFile - plays a media-file which by default needs to be stored in the folder "/storage/emulated/0/Notifications/" of the Android device. You may use the attribute setNotifySndFilePath for defining a different folder.
  • openCall - initial a call and hang up after optional time / set DEVICE openCall 0176354 10 call this number and hang up after 10s
  • screenBrightness - 0-255, set screen brighness
    • +
  • screenBrightnessMode - turn Adaptive brightness on,off
  • screenMsg - display message on screen of Android device
  • sendintent - send intent string Example: set $AMADDEVICE sendIntent org.smblott.intentradio.PLAY url http://stream.klassikradio.de/live/mp3-192/stream.klassikradio.de/play.m3u name Klassikradio, first parameter contains the action, second parameter contains the extra. At most two extras can be used.
  • sendSMS - Sends an SMS to a specific phone number. Bsp.: sendSMS Dies ist ein Test|555487263
    • @@ -1290,6 +1299,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • powerPlugged - Netzteil angeschlossen? 0=NEIN, 1|2=JA
  • screen - on locked/unlocked, off locked/unlocked gibt an ob der Bildschirm an oder aus ist und gleichzeitig gesperrt oder nicht gesperrt
  • screenBrightness - Bildschirmhelligkeit von 0-255
    • +
  • screenBrightnessMode - Adaptive Helligkeit on,off
  • screenFullscreen - on/off, Vollbildmodus (An,Aus) (nur Automagic)
  • screenOrientation - Landscape,Portrait, Bildschirmausrichtung (Horizontal,Vertikal)
  • screenOrientationMode - auto/manual, Modus für die Ausrichtung (Automatisch, Manuell)
    • @@ -1321,6 +1331,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • nextAlarmTime - setzt die Alarmzeit. gilt aber nur innerhalb der nächsten 24Std.
  • openCall - ruft eine Nummer an und legt optional nach X Sekunden auf / set DEVICE openCall 01736458 10 / ruft die Nummer an und beendet den Anruf nach 10s
  • screenBrightness - setzt die Bildschirmhelligkeit, von 0-255.
    • +
  • screenBrightnessMode - schaltet die Adaptive Helligkeit on,off
  • screenMsg - versendet eine Bildschirmnachricht
  • sendintent - sendet einen Intentstring Bsp: set $AMADDeviceDEVICE sendIntent org.smblott.intentradio.PLAY url http://stream.klassikradio.de/live/mp3-192/stream.klassikradio.de/play.m3u name Klassikradio, der erste Befehl ist die Aktion und der zweite das Extra. Es können immer zwei Extras mitgegeben werden.
  • sendSMS - sendet eine SMS an eine bestimmte Telefonnummer. Bsp.: sendSMS Dies ist ein Test|555487263
    • diff --git a/fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.1.xml b/fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.2.xml similarity index 82% rename from fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.1.xml rename to fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.2.xml index f2206c2b7..c36386052 100644 --- a/fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.1.xml +++ b/fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.2.xml @@ -371,6 +371,14 @@ irname=getString("name") screen_brightness screenBrightness + + true + Systemeinstellung verändert: System screen_brightness_mode + true + SYSTEM + screen_brightness_mode + screenBrightnessMode + true Systemeinstellung verändert: System volume_music_bt_a2dp @@ -900,6 +908,11 @@ irname=getString("name") Expression: Reboot param_syscmd == "reboot" + + true + Expression: request_path == "/fhem-amad/setCommands/setBrightnessMode" + request_path == "/fhem-amad/setCommands/setBrightnessMode" + true Expression: respreadingsval != "kaputt" and respreadingsval != "none" @@ -1198,6 +1211,11 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" Expression: trigger == "Systemeinstellung verändert: System screen_brightness" trigger == "Systemeinstellung verändert: System screen_brightness" + + true + Expression: trigger == "Systemeinstellung verändert: System screen_brightness_mode" + trigger == "Systemeinstellung verändert: System screen_brightness_mode" + true Expression: trigger == "Systemeinstellung verändert: System volume_music_bt_a2dp" or trigger == "Systemeinstellung verändert: System volume_music_speaker" or trigger == "Systemeinstellung verändert: System volume_music_headphone" or trigger == "Systemeinstellung verändert: System volume_music_headset" @@ -3064,6 +3082,15 @@ playback_state = "skip backward" else if(playback_state == 11) { playback_state = "jump to position in playlist" +} + + + true + Script: if(screenBrightnessMode == 1) { screenBrightnessMode = "on"; } else { screenBrightnessMode = "off"; } + @@ -3324,6 +3351,12 @@ fhemcmd = "setreading"; true Script: screenBrightness = "\"screenBrightness\":" + " \"" + {screenBrightness} + "\""; fhemcmd = "setreading"; + + + true + Script: screenBrightnessMode = "\"screenBrightnessMode\":" + " \"" + {screenBrightnessMode} + "\""; fhemcmd = "setreading"; + @@ -3341,7 +3374,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA JSON -