diff --git a/73_AMADCommBridge.pm b/73_AMADCommBridge.pm index f09ec34..5804639 100755 --- a/73_AMADCommBridge.pm +++ b/73_AMADCommBridge.pm @@ -65,7 +65,7 @@ use warnings; use FHEM::Meta; my $modulversion = '4.4.1'; -my $flowsetversion = '4.4.0'; +my $flowsetversion = '4.4.1'; sub AMADCommBridge_Initialize($) { diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm index 5a69d54..29641e9 100755 --- a/74_AMADDevice.pm +++ b/74_AMADDevice.pm @@ -51,7 +51,7 @@ use warnings; use FHEM::Meta; my $modulversion = '4.4.0'; -my $flowsetversion = '4.4.0'; +my $flowsetversion = '4.4.1'; sub AMADDevice_Initialize($) { diff --git a/74_AMADautomagicFlowset_4.4.0.xml b/74_AMADautomagicFlowset_4.4.1.xml similarity index 93% rename from 74_AMADautomagicFlowset_4.4.0.xml rename to 74_AMADautomagicFlowset_4.4.1.xml index ac66719..af29f69 100644 --- a/74_AMADautomagicFlowset_4.4.0.xml +++ b/74_AMADautomagicFlowset_4.4.1.xml @@ -1,5 +1,5 @@ - + true Akku Ladestand: grösser als 0% @@ -477,6 +477,7 @@ irname=getString("name") true false {global_apssid} + true false @@ -3418,7 +3419,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA JSON - else if(param_mplayer == "VlcPlayer") { pname = "org.videolan.vlc"; - kname = "org.videolan.vlc.RemoteControlClientReceiver"; + kname = "androidx.media.session.MediaButtonReceiver"; } else if(param_mplayer == "AmazonMusic") @@ -4155,7 +4156,7 @@ Soll der Assistent gelöscht werden? First Run Assistant - AMADNG Info/Control Flowset v4.4.0 + AMADNG Info/Control Flowset v4.4.1 false PARALLEL @@ -4328,7 +4329,7 @@ Soll der Assistent gelöscht werden? Informations - AMADNG Info/Control Flowset v4.4.0 + AMADNG Info/Control Flowset v4.4.1 true QUEUE 900 @@ -4820,7 +4821,7 @@ Soll der Assistent gelöscht werden? NFC Tag Support - AMADNG Info/Control Flowset v4.4.0 + AMADNG Info/Control Flowset v4.4.1 true PARALLEL @@ -4834,7 +4835,7 @@ Soll der Assistent gelöscht werden? Send Data to AMADCommBridge - AMADNG Info/Control Flowset v4.4.0 + AMADNG Info/Control Flowset v4.4.1 true PARALLEL 900 @@ -4908,7 +4909,7 @@ Soll der Assistent gelöscht werden? SetCommands - AMADNG Info/Control Flowset v4.4.0 + AMADNG Info/Control Flowset v4.4.1 true QUEUE 900 @@ -5029,113 +5030,113 @@ Soll der Assistent gelöscht werden? Nummer anrufen: {param_callnumber} Expression: param_flowstate == "active" or param_flowstate == "inactive" Expression: param_flowstate == "active" - Setze Flow Status: Deaktivieren {param_flowname} - Script: notification_text = "Flow '{param_flowname}' has been set {param_flowstate}" - Expression: multimediaControl" - Starte Daydream - Expression: startDaydream" - Lautstärken setzen param_volume - Expression: setNotifiVolume" - Lautstärken setzen param_notifivolume - Audio Player steuern: Medienknopf Play/Pause (/{kname}) - Sound: {param_notifypath}{param_notifyfile} als Benachrichtigung - Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) - Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/emulated/0/Download - Script: flow_informations = "\"flow_informations\":" + " \"" + {informationFlow_state} + "\""; fhemcmd = "setreading"; - Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Flows ausführen: udef_trigger setLockPin - Flow Aktiv: Informations - Script: informationFlow_state = "aktiv" - Script: informationFlow_state = "inaktiv" - Setze Flow Status: Aktivieren Informations - Flow Aktiv: Send Data to AMADCommBridge - Setze Flow Status: Aktivieren Send Data to AMADCommBridge - SMS senden an: an {param_smsnumber} '{param_smsmessage}' (10 in 12h) - Expression: param_lockmod == "lock" - Expression: Airplanemode - Expression: param_nfc == "on" - Expression: param_nfc == "off" - NFC ein-/ausschalten: Aus - Expression: sendSms" - Expression: closeCall" - Expression: nfc" - NFC ein-/ausschalten: Ein - Expression: setRingSoundVolume" - Lautstärken setzen param_ringsoundvolume - Setze Timer - Expression: ttsMsg" - Expression: ttsMsgLang" - Medianlautstärken Speichern - Lautstärke einstellen: Medien auf Level {param_msgvol} - Expression: param_msgvol == "none" - Expression: param_msgvol == "none" - Medienlautstärke Wiederherstellen - Expression: flowState" - Setze Flow Status: Aktivieren {param_flowname} - Flows ausführen: VoiceControl - Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen - Expression: showhomescreen" - Zeige Home Screen - Vibrieren: Pattern 2 (-- --) - Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Expression: flowRun" - Flows ausführen: {param_flowname} - Flows ausführen: Update AMAD Flowset - Audio Player steuern: Medienknopf Stopp ({pname}/{kname}) - Expression: param_button == "mediaStop" - Expression: param_button == "mediaPlay" - Expression: param_button == "mediaNext" - Expression: param_button == "mediaBack" - Expression: trigger == "Sprachbefehl angefordert" - Expression: global_fhemip != null or global_bridgeport != null - Expression: header_amadid == {global_amadid} - Host erreichbar: {global_fhemip}:{global_bridgeport} - Script: Zuordnung Mediaplayer - Expression: currentFlowsetUpdate" - Expression: takepicture - Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) - Expression: param_pictureresolution == "800x600" - Expression: param_picturecamera == "Back" - Expression: param_pictureresolution == "1024x768" - Expression: param_picturecamera == "Back" - Expression: param_pictureresolution == "1280x720" - Expression: param_picturecamera == "Back" - Expression: param_pictureresolution == "1600x1200" - Expression: param_picturecamera == "Back" - Expression: param_pictureresolution == "1920x1080" - Expression: param_picturecamera == "Back" - Script: notification_text = "Take Picture: can not save camerapicture, path does not exist" - Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 800x600 Front - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1024x768 Front - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1280x720 Front - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1600x1200 Front - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1920x1080 Front - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 800x600 - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1024x768 - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1280x720 - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1600x1200 - Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1920x1080 - Expression: param_screenshotresolution == "1280x720" - Expression: param_screenshotresolution == "1920x1200" - Bildschirmfoto aufnehmen: 1920x1200 - Bildschirmfoto aufnehmen: 1280x720 - Bildschirmfoto aufnehmen: 1920x1080 - Expression: param_screenshotresolution == "1920x1080" - Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) - Schalte Display ein: Hell für {param_screenontime}s - Setze Display Helligkeit: {param_brightness} - Flows ausführen: Send Data to AMADCommBridge - Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Script: notification_text = "Take Screenshot: can not save screenshot, path does not exist" - Expression: takescreenshot - Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" - Expression: request_path == "/fhem-amad/setCommands/setBrightnessMode" - Setze Systemeinstellung: System screen_brightness_mode auf {param_brightnessmode} - Sprachausgabe: Englisch - Sprachausgabe: Deutsch - - + Expression: multimediaControl" + Starte Daydream + Expression: startDaydream" + Lautstärken setzen param_volume + Expression: setNotifiVolume" + Lautstärken setzen param_notifivolume + Sound: {param_notifypath}{param_notifyfile} als Benachrichtigung + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) + Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/emulated/0/Download + Script: flow_informations = "\"flow_informations\":" + " \"" + {informationFlow_state} + "\""; fhemcmd = "setreading"; + Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + Flows ausführen: udef_trigger setLockPin + Flow Aktiv: Informations + Script: informationFlow_state = "aktiv" + Script: informationFlow_state = "inaktiv" + Setze Flow Status: Aktivieren Informations + Flow Aktiv: Send Data to AMADCommBridge + Setze Flow Status: Aktivieren Send Data to AMADCommBridge + SMS senden an: an {param_smsnumber} '{param_smsmessage}' (10 in 12h) + Expression: param_lockmod == "lock" + Expression: Airplanemode + Expression: param_nfc == "on" + Expression: param_nfc == "off" + NFC ein-/ausschalten: Aus + Expression: sendSms" + Expression: closeCall" + Expression: nfc" + NFC ein-/ausschalten: Ein + Expression: setRingSoundVolume" + Lautstärken setzen param_ringsoundvolume + Setze Timer + Expression: ttsMsg" + Expression: ttsMsgLang" + Medianlautstärken Speichern + Lautstärke einstellen: Medien auf Level {param_msgvol} + Expression: param_msgvol == "none" + Expression: param_msgvol == "none" + Medienlautstärke Wiederherstellen + Flows ausführen: VoiceControl + Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen + Expression: showhomescreen" + Zeige Home Screen + Vibrieren: Pattern 2 (-- --) + Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + Expression: flowRun" + Flows ausführen: {param_flowname} + Flows ausführen: Update AMAD Flowset + Audio Player steuern: Medienknopf Stopp ({pname}/{kname}) + Expression: param_button == "mediaStop" + Expression: param_button == "mediaNext" + Expression: param_button == "mediaBack" + Expression: trigger == "Sprachbefehl angefordert" + Expression: global_fhemip != null or global_bridgeport != null + Expression: header_amadid == {global_amadid} + Host erreichbar: {global_fhemip}:{global_bridgeport} + Expression: currentFlowsetUpdate" + Expression: takepicture + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) + Expression: param_pictureresolution == "800x600" + Expression: param_picturecamera == "Back" + Expression: param_pictureresolution == "1024x768" + Expression: param_picturecamera == "Back" + Expression: param_pictureresolution == "1280x720" + Expression: param_picturecamera == "Back" + Expression: param_pictureresolution == "1600x1200" + Expression: param_picturecamera == "Back" + Expression: param_pictureresolution == "1920x1080" + Expression: param_picturecamera == "Back" + Script: notification_text = "Take Picture: can not save camerapicture, path does not exist" + Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 800x600 Front + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1024x768 Front + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1280x720 Front + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1600x1200 Front + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1920x1080 Front + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 800x600 + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1024x768 + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1280x720 + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1600x1200 + Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1920x1080 + Expression: param_screenshotresolution == "1280x720" + Expression: param_screenshotresolution == "1920x1200" + Bildschirmfoto aufnehmen: 1920x1200 + Bildschirmfoto aufnehmen: 1280x720 + Bildschirmfoto aufnehmen: 1920x1080 + Expression: param_screenshotresolution == "1920x1080" + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) + Schalte Display ein: Hell für {param_screenontime}s + Setze Display Helligkeit: {param_brightness} + Flows ausführen: Send Data to AMADCommBridge + Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + Script: notification_text = "Take Screenshot: can not save screenshot, path does not exist" + Expression: takescreenshot + Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" + Expression: request_path == "/fhem-amad/setCommands/setBrightnessMode" + Setze Systemeinstellung: System screen_brightness_mode auf {param_brightnessmode} + Sprachausgabe: Englisch + Sprachausgabe: Deutsch + Setze Flow Status: Aktivieren {param_flowname} + Setze Flow Status: Deaktivieren {param_flowname} + Script: notification_text = "Flow '{param_flowname}' has been set {param_flowstate}" + Expression: flowState" + Audio Player steuern: Medienknopf Play/Pause (/{kname}) + Expression: param_button == "mediaPlay" + Script: Zuordnung Mediaplayer + + @@ -5163,17 +5164,17 @@ Soll der Assistent gelöscht werden? - - + + - + - + @@ -5188,14 +5189,14 @@ Soll der Assistent gelöscht werden? - + - - + + @@ -5209,11 +5210,11 @@ Soll der Assistent gelöscht werden? - + - + @@ -5221,158 +5222,158 @@ Soll der Assistent gelöscht werden? - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + Update AMAD Flowset - AMADNG Info/Control Flowset v4.4.0 + AMADNG Info/Control Flowset v4.4.1 true QUEUE @@ -5434,7 +5435,7 @@ Soll der Assistent gelöscht werden? VoiceControl - AMADNG Info/Control Flowset v4.4.0 + AMADNG Info/Control Flowset v4.4.1 true QUEUE diff --git a/74_AMADtaskerset_4.4.0.prj.xml b/74_AMADtaskerset_4.4.1.prj.xml similarity index 99% rename from 74_AMADtaskerset_4.4.0.prj.xml rename to 74_AMADtaskerset_4.4.1.prj.xml index 01e1a54..7f9baca 100644 --- a/74_AMADtaskerset_4.4.0.prj.xml +++ b/74_AMADtaskerset_4.4.1.prj.xml @@ -1,4 +1,4 @@ - + 1440.0,2712.0 1540732022751 @@ -639,7 +639,6 @@ Telegram 1540732022826 - true 1540586468041 2606 2513 @@ -928,7 +927,7 @@ Telegram 1517475377117 true - 1542273204558 + 1556626567371 931 932 AMAD_Call(outgoing) @@ -951,12 +950,36 @@ Telegram + + 1556625891107 + true + 1556627058963 + 940 + 941 + AMAD_nfcLastTagID + + 2076 + 0 + + + + + 165 + + + %AMAD_send + 2 + on + + + + 1502789371413 AMAD - 2593,2598,2603,2610,2608,2613,2583,922,2586,2609,2584,2604,2602,2582,926,2592,2596,2588,2605,2612,2595,2607,2589,924,2591,2594,2611,2590,2601,2597,2587,931,2606,2585,918,2600,2599 - AMAD_settings,AMAD_Popup,Lock,AMAD_Dialog_Message - 2558,925,2563,2581,850,2522,2534,2531,2575,2576,2539,2538,2533,2528,2515,2552,2511,2490,2573,2537,2544,2568,932,2509,2540,2492,2545,2517,2580,2521,2512,2535,2499,2557,2556,2543,2493,2529,2541,2530,2559,2546,2555,2505,2495,2554,2567,2547,2527,2553,2578,2506,2500,2510,2516,2520,2496,2566,2561,2577,2507,2508,2562,2504,2519,2571,2572,920,2514,2564,2532,2491,2536,2569,2526,2551,2488,2518,2498,2549,2560,2570,923,2525,2524,2574,2502,2579,2565,2542,2548,2497,927,2503,2523,2513,914,2494,2501,2550 + 918,2590,940,2604,2595,2612,2594,2607,2606,2613,926,2605,2588,2596,2598,2593,2601,2608,2602,2584,924,2592,2589,2591,2586,2600,2585,2583,931,2610,2587,2582,2597,922,2599,2603,2609,2611 + AMAD_settings,AMAD_Dialog_Message,Lock,AMAD_Popup + 2559,2557,2576,2522,914,2564,2492,2560,2577,2539,850,2537,2499,2544,2567,2538,2503,2573,923,2555,2575,2543,2515,2510,2521,2505,2562,2571,2508,2547,2511,2565,2556,2519,2495,2520,2536,2581,2491,2554,2528,2578,925,2514,2558,2504,2551,2493,2523,2525,2490,2563,2542,2517,2569,2529,2498,2532,2531,2553,2533,2506,2494,2574,2552,2546,2516,2561,2534,2545,2572,2496,2524,2507,2549,2512,2509,2500,2527,2502,2568,2566,2518,2530,932,2535,941,2550,927,2488,2513,2548,2526,920,2579,2540,2501,2570,2541,2497,2580 android.hardware.bluetooth:y android.hardware.camera.front:y @@ -968,6 +991,7 @@ Telegram com.joaomgcd.autoremote bidoismorgan.httpevent com.schlimbo.amad + 21 1.0 10 @@ -978,10 +1002,10 @@ AMAD is an interface between SmartHome and Android device. Description: See the FHEM commandref description: -<a href="https://fhem.de/commandref.html#AMADDevice">https://fhem.de/commandref.html#AMADDevice</a> +<html><a href="https://fhem.de/commandref.html#AMADDevice">https://fhem.de/commandref.html#AMADDevice</a></html> Forum entry: -<a href="https://forum.fhem.de/index.php/topic,81167.0.html">https://forum.fhem.de/index.php/topic,81167.0.html</a> +<html><a href="https://forum.fhem.de/index.php/topic,81167.0.html">https://forum.fhem.de/index.php/topic,81167.0.html</a></html> AMAD @@ -5751,7 +5775,7 @@ Code: %HTTPR 1503937837718 1503937837718 2510 - 102 + 9 130 @@ -10030,6 +10054,7 @@ URL: %url 1512173777582 1512173777582 2563 + 9 37 @@ -11563,6 +11588,8 @@ Only available if you select &lt;b&gt;Continue Task After Error&lt;/ 248 false + + %tpe_screen @@ -12765,13 +12792,13 @@ Only available if you select &lt;b&gt;Continue Task After Error&lt;/ 1540808276450 - 1553805007312 + 1556654361557 850 AMAD_init 547 %AMAD_version - 4.4.0 (Tasker) + 4.4.1 (Tasker) @@ -13018,7 +13045,7 @@ Only available if you select &lt;b&gt;Continue Task After Error&lt;/ 1517475385032 - 1542273204558 + 1556625976253 932 6 @@ -13113,4 +13140,48 @@ Only available if you select &lt;b&gt;Continue Task After Error&lt;/ + + 1556625900242 + 1556627058963 + 941 + 6 + + 37 + + + %evtprm1 + 5 + evtprm1 + + + + + 548 + TagID: %evtprm1 + + + + 547 + + %setreading + "nfcLastTagID": "%evtprm1" + + + + + + 130 + AMAD_SendData2CommBridge + + %priority + + setreading + %setreading + + + + + 38 + +