diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm
index 57e7868..7f39a5e 100644
--- a/74_AMADDevice.pm
+++ b/74_AMADDevice.pm
@@ -58,7 +58,7 @@ eval "use Encode qw(encode encode_utf8);1" or $missingModul .= "Encode ";
eval "use JSON;1" or $missingModul .= "JSON ";
-my $modulversion = "4.1.99.30";
+my $modulversion = "4.1.99.33";
my $flowsetversion = "4.1.99.5";
@@ -123,6 +123,7 @@ sub AMADDevice_Initialize($) {
"IODev ".
"remoteServer:Automagic,Autoremote,TNES,other ".
"setTakePictureResolution:800x600,1024x768,1280x720,1600x1200,1920x1080 ".
+ "setTakePictureCamera:Back,Front ".
$readingFnAttributes;
foreach my $d(sort keys %{$modules{AMADDevice}{defptr}}) {
@@ -671,7 +672,11 @@ sub AMADDevice_Set($$@) {
return "Please set \"setTakePictureResolution\" Attribut first"
unless(AttrVal($name,'setTakePictureResolution','none') ne 'none');
- $path = "/fhem-amad/setCommands/takepicture?pictureresolution=" . AttrVal($name,'setTakePictureResolution','none');
+
+ return "Please set \"setTakePictureCamera\" Attribut first"
+ unless(AttrVal($name,'setTakePictureCamera','none') ne 'none');
+
+ $path = "/fhem-amad/setCommands/takepicture?pictureresolution=".AttrVal($name,'setTakePictureResolution','none')."&picturecamera=".AttrVal($name,'setTakePictureCamera','none');
$method = "POST";
}
@@ -1108,11 +1113,19 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
screenLock - Locks screen with request for PIN. attribute setScreenlockPIN - enter PIN here. Only use numbers, 4-16 numbers required.
screenOrientation - Auto,Landscape,Portait, set screen orientation (automatic, horizontal, vertical). attribute setScreenOrientation
system - issue system command (only with rooted Android devices). reboot,shutdown,airplanemodeON (can only be switched ON) attribute root , in Automagic "Preferences" "Root functions" need to be enabled.
+ takePicture - take a camera picture Attribut setTakePictureResolution
+
+ Attribut
+
setAPSSID - set WLAN AccesPoint SSID to prevent WLAN sleeps
setNotifySndFilePath - set systempath to notifyfile (default /storage/emulated/0/Notifications/
setTtsMsgSpeed - set speaking speed for TTS (Value between 0.5 - 4.0, 0.5 Step) default is 1.0
setTtsMsgLang - set speaking language for TTS, de or en (default is de)
setTtsMsgVol - is set, change automatically the media audio end set it back
+ set setTakePictureResolution - set the camera resolution for takePicture action (800x600,1024x768,1280x720,1600x1200,1920x1080)
+ setTakePictureCamera - which camera do you use (Back,Front).
nfc - schaltet nfc an oder aus /on/offAttribut root
openApp - öffnet eine ausgewählte App. Attribut setOpenApp
openURL - öffnet eine URL im Standardbrowser, sofern kein anderer Browser über das Attribut setOpenUrlBrowser ausgewählt wurde. Bsp: attr Tablet setOpenUrlBrowser de.ozerov.fully|de.ozerov.fully.MainActivity, das erste ist der Package Name und das zweite der Class Name
- setAPSSID - setzt die AccessPoint SSID um ein WLAN sleep zu verhindern
screen - on/off/lock/unlock schaltet den Bildschirm ein/aus oder sperrt/entsperrt ihn, in den Automagic Einstellungen muss "Admin Funktion" gesetzt werden sonst funktioniert "Screen off" nicht. Attribut setScreenOnForTimer ändert die Zeit wie lange das Display an bleiben soll!
screenFullscreen - on/off, (aktiviert/deaktiviert) den Vollbildmodus. Attribut setFullscreen
screenLock - Sperrt den Bildschirm mit Pinabfrage. Attribut setScreenlockPIN - hier die Pin dafür eingeben. Erlaubt sind nur Zahlen. Es müßen mindestens 4, bis max 16 Zeichen verwendet werden.
screenOrientation - Auto,Landscape,Portait, aktiviert die Bildschirmausrichtung (Automatisch,Horizontal,Vertikal). Attribut setScreenOrientation
system - setzt Systembefehle ab (nur bei gerootetet Geräen). reboot,shutdown,airplanemodeON (kann nur aktiviert werden) Attribut root , in den Automagic Einstellungen muss "Root Funktion" gesetzt werden
+ takePicture - löst die Kamera aus für ein Foto Attribut setTakePictureResolution
+
+ Attribute
+
setNotifySndFilePath - setzt den korrekten Systempfad zur Notifydatei (default ist /storage/emulated/0/Notifications/
setTtsMsgSpeed - setzt die Sprachgeschwindigkeit bei der Sprachausgabe(Werte zwischen 0.5 bis 4.0 in 0.5er Schritten) default ist 1.0
setTtsMsgLang - setzt die Sprache bei der Sprachausgabe, de oder en (default ist de)
@@ -1291,6 +1309,9 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
setVolMax - setzt die maximale Volume Gr&uoml;e für den Slider
setNotifyVolMax - setzt den maximalen Lautstärkewert für Benachrichtigungslautstärke für den Slider
setRingSoundVolMax - setzt den maximalen Lautstärkewert für Klingellautstärke für den Slider
+ setAPSSID - setzt die AccessPoint SSID um ein WLAN sleep zu verhindern
+ setTakePictureResolution - welche Kameraauflösung soll verwendet werden? (800x600,1024x768,1280x720,1600x1200,1920x1080)
+ setTakePictureCamera - welche Kamera soll verwendet werden (Back,Front).
Expression: param_orientation == "portrait"
param_orientation == "portrait"
+
+ true
+ Expression: param_picturecamera == "Back"
+ param_picturecamera == "Back"
+
true
Expression: param_pictureresolution == "1024x768"
@@ -1895,6 +1900,24 @@ putString("{param_exkey2}", "{param_exval2}");
2000
true
+
+ false
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1024x768 Front
+ false
+ /storage/emulated/0/AMADpicture.jpg
+ 1
+ 1024*768
+ 100
+ auto
+ none
+ auto
+ fixed
+ false
+ true
+ 2000
+ true
+
false
Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1280x720
@@ -1913,6 +1936,24 @@ putString("{param_exkey2}", "{param_exval2}");
2000
true
+
+ false
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1280x720 Front
+ false
+ /storage/emulated/0/AMADpicture.jpg
+ 1
+ 1280*720
+ 100
+ auto
+ none
+ auto
+ fixed
+ false
+ true
+ 2000
+ true
+
false
Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1600x1200
@@ -1931,6 +1972,24 @@ putString("{param_exkey2}", "{param_exval2}");
2000
true
+
+ false
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1600x1200 Front
+ false
+ /storage/emulated/0/AMADpicture.jpg
+ 1
+ 176*144
+ 100
+ auto
+ none
+ auto
+ fixed
+ false
+ true
+ 2000
+ true
+
false
Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1920x1080
@@ -1949,6 +2008,24 @@ putString("{param_exkey2}", "{param_exval2}");
2000
true
+
+ false
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1920x1080 Front
+ false
+ /storage/emulated/0/AMADpicture.jpg
+ 1
+ 176*144
+ 100
+ auto
+ none
+ auto
+ fixed
+ false
+ true
+ 2000
+ true
+
false
Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 800x600
@@ -1967,6 +2044,24 @@ putString("{param_exkey2}", "{param_exval2}");
2000
true
+
+ false
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 800x600 Front
+ false
+ /storage/emulated/0/AMADpicture.jpg
+ 1
+ 800*600
+ 100
+ auto
+ none
+ auto
+ fixed
+ false
+ true
+ 2000
+ true
+
true
Gerät sperren
@@ -3067,6 +3162,11 @@ fhemcmd = "setreading";
Script: notification_text = "not supported from your device"
+
+ true
+ Script: notification_text = "Take Picture: can not save camerapicture, path does not exist"
+
+
true
Script: powerinfo = "\"powerLevel\":" + " \"" + "{battery_percentage,numberformat,0}" + "\"" + "," + "\"powerPlugged\":" + " \"" + {battery_plugged} + "\"" + "," + "\"batteryTemperature\":" + " \"" + "{battery_temperature/10.0,numberformat.0.0}" + "\"" + "," + "\"batteryHealth\":" + " \"" + {battery_health} + "\""; fhemcmd = "setreading";
@@ -4799,30 +4899,43 @@ Soll der Assistent gelöscht werden?
Expression: showhomescreen"
Zeige Home Screen
Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*"
- Expression: takepicture
- Expression: param_button == "stop"
- 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_pictureresolution == "800x600"
- Expression: param_pictureresolution == "1024x768"
- Expression: param_pictureresolution == "1280x720"
- Expression: param_pictureresolution == "1600x1200"
- Expression: param_pictureresolution == "1920x1080"
- Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 800x600
- Vibrieren: Pattern 2 (-- --)
- Flows ausführen: Send Data to AMADCommBridge
- Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";
- Host erreichbar: {global_fhemip}:{global_bridgeport}
-
+ Expression: param_button == "stop"
+ Vibrieren: Pattern 2 (-- --)
+ Flows ausführen: Send Data to AMADCommBridge
+ Host erreichbar: {global_fhemip}:{global_bridgeport}
+
HTTP Request: /fhem-amad/deviceInfo/
Sprachbefehl angefordert
HTTP Request: /fhem-amad/setCommands/*
Periodischer Timer: alle 120s
- Expression: global_fhemip != null or global_bridgeport != null
- Expression: header_amadid == {global_amadid}
+ Expression: global_fhemip != null or global_bridgeport != null
+ Expression: header_amadid == {global_amadid}
+ 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
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1920x1080 Front
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1600x1200 Front
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1024x768 Front
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 800x600 Front
+ Foto aufnehmen: /storage/emulated/0/AMADpicture.jpg (ohne Benutzeroberfläche) 1280x720 Front
+ Expression: param_pictureresolution == "800x600"
+ Expression: param_pictureresolution == "1024x768"
+ Expression: param_pictureresolution == "1280x720"
+ Expression: param_pictureresolution == "1600x1200"
+ Expression: param_pictureresolution == "1920x1080"
+ Expression: param_picturecamera == "Back"
+ Expression: param_picturecamera == "Back"
+ Expression: param_picturecamera == "Back"
+ Expression: param_picturecamera == "Back"
+ Expression: param_picturecamera == "Back"
+ Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";
+ Expression: takepicture
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0)
+ Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";
+ Script: notification_text = "Take Picture: can not save camerapicture, path does not exist"
Update AMAD Flowset
@@ -5036,63 +5163,63 @@ Soll der Assistent gelöscht werden?
true
QUEUE
Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
- Script: notification_text = "Flowset Update: path for download not exist"
- Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";
- Flows ausführen: Send Data to AMADCommBridge
- Flow Aktiv: First Run Assistant
- Setze Flow Status: Deaktivieren First Run Assistant
- Prüfe und setze Bridgeport Variable
- Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0)
- Verzeichnisse erstellen: /storage/sdcard0/AMADNG_FlowsetUpdate
- Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/sdcard0)
- Verzeichnisse erstellen: /sdcard/AMADNG_FlowsetUpdate
- Gerätespeicherplatz: Freier Speicherplatz > 1kb (/sdcard)
- Verzeichnisse erstellen: /storage/emulated/0/AMADNG_FlowsetUpdate
- Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml nach /storage/emulated/0/AMADNG_FlowsetUpdate
- Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml nach /storage/sdcard0/AMADNG_FlowsetUpdate
- Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml nach /sdcard/AMADNG_FlowsetUpdate
- Flows/Widgets importieren: /storage/emulated/0/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
- Flows/Widgets importieren: /storage/sdcard0/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
- Flows/Widgets importieren: /sdcard/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
- Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
- Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
- Dateien löschen: /storage/emulated/0/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
- Dateien löschen: /sdcard/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
- Dateien löschen: /storage/sdcard0/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
-
+ Flows ausführen: Send Data to AMADCommBridge
+ Flow Aktiv: First Run Assistant
+ Setze Flow Status: Deaktivieren First Run Assistant
+ Prüfe und setze Bridgeport Variable
+ Verzeichnisse erstellen: /storage/sdcard0/AMADNG_FlowsetUpdate
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/sdcard0)
+ Verzeichnisse erstellen: /sdcard/AMADNG_FlowsetUpdate
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/sdcard)
+ Verzeichnisse erstellen: /storage/emulated/0/AMADNG_FlowsetUpdate
+ Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml nach /storage/emulated/0/AMADNG_FlowsetUpdate
+ Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml nach /storage/sdcard0/AMADNG_FlowsetUpdate
+ Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml nach /sdcard/AMADNG_FlowsetUpdate
+ Flows/Widgets importieren: /storage/emulated/0/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
+ Flows/Widgets importieren: /storage/sdcard0/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
+ Flows/Widgets importieren: /sdcard/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
+ Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
+ Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
+ Dateien löschen: /storage/emulated/0/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
+ Dateien löschen: /sdcard/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
+ Dateien löschen: /storage/sdcard0/AMADNG_FlowsetUpdate/currentFlowsetUpdate.xml
+
HTTP Request: /fhem-amad/currentFlowsetUpdate
- Expression: header_amadid == {global_amadid}
- Expression: header_amadid == {global_amadid}
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0)
+ Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";
+ Script: notification_text = "Flowset Update: path for download not exist"
+
VoiceControl
diff --git a/74_AMADtaskerset_4.1.99.3.prj.xml b/74_AMADtaskerset_4.1.99.5.prj.xml
similarity index 99%
rename from 74_AMADtaskerset_4.1.99.3.prj.xml
rename to 74_AMADtaskerset_4.1.99.5.prj.xml
index b7546f2..7b157b2 100644
--- a/74_AMADtaskerset_4.1.99.3.prj.xml
+++ b/74_AMADtaskerset_4.1.99.5.prj.xml
@@ -1,9 +1,9 @@
-
+
1080.0,1776.0
1513116735261
true
- 1512761338116
+ 1514566300708
1000
923
toGoAMAD
@@ -51,7 +51,7 @@
1513116735262
true
- 1512684208205
+ 1514566358989
1002
938
toGoAMAD
@@ -260,7 +260,7 @@
1513116735275
true
- 1513424368275
+ 1514473987581
1011
982
TNES AMAD
@@ -273,7 +273,7 @@
java.lang.Integer
<StringArrayList sr=""><_arrlst_com.taskerplugin.httpevent.extra.STRINGS_FILTERS0>device==AMAD</_arrlst_com.taskerplugin.httpevent.extra.STRINGS_FILTERS0><_arrlst_com.taskerplugin.httpevent.extra.STRINGS_FILTERS1>cmd</_arrlst_com.taskerplugin.httpevent.extra.STRINGS_FILTERS1></StringArrayList>
java.util.ArrayList
- 192.168.5.82
+ 192.168.5.81
java.lang.String
8765
java.lang.String
@@ -487,7 +487,7 @@
1513116735259
true
- 1513422799932
+ 1513464771034
999
982
AutoRemote AMAD
@@ -571,9 +571,9 @@ Way the message was sent (BT, Wifi, GCM)
1502789371413
AMAD
- 1006,1007,1003,1000,1011,999,997,1005,995,1001,1004,1014,996,994,1002,1008,1016,1012,998,1010
+ 1001,1002,994,1005,1011,1014,1012,1000,998,1006,1010,1008,999,1016,995,1004,1007,1003,997,996
AMAD_Dialog_Message,AMAD_settings
- 922,984,1050,1048,1023,980,1047,1020,1053,966,1013,1035,949,1041,1032,1033,1022,1038,920,1025,1049,1021,1034,962,970,926,954,1054,972,937,948,1051,1037,1055,979,1056,1030,914,1045,935,1028,1036,1043,983,1015,1057,938,967,982,975,944,927,974,969,1031,989,1024,1026,990,940,1058,968,978,1019,1044,1052,943,1046,939,947,951,1039,963,1029,918,965,934,923,1017,992
+ 984,944,1057,1019,922,972,938,1035,918,1041,1028,1036,923,975,947,980,1053,1044,1013,954,1054,990,1031,916,1033,914,1058,1038,970,1049,926,968,1046,1055,1050,951,1029,1015,1034,1022,1020,934,1017,949,979,943,967,978,966,939,1021,963,1023,1037,1045,1051,982,1048,962,1052,1026,940,1056,1024,1039,935,1043,1030,965,1032,927,992,937,969,1047,974,948,983,1025,989,920
android.hardware.bluetooth:y
android.hardware.wifi:y
@@ -653,7 +653,7 @@ Way the message was sent (BT, Wifi, GCM)
1512032010150
- 1513454811685
+ 1515014317697
720
1280
AMAD_settings
@@ -1182,6 +1182,7 @@ SSID:
1055
4
0,1124,707,53,0,593,1269,49
+ 916
Text_lastCommand
%AMAD_lastSetCommand
1512424887005
1055
- 105
- false
- %AMAD_lastSetCommand
-
-
548
letzter empfangener set-Befehl
+
+ 1515014192359
+ 1515014192359
+ 916
+
+ 105
+ %AMAD_lastSetCommand
+
+
+ 548
+ letzter empfangener set-Befehl in Zwischenablage kopiert
+
+
1503612697002
1512664308181
@@ -3802,7 +3812,7 @@ Art der Steuerung von FHEM set Befehlen, welche über die Bridge als Steuerbefeh
1503691080060
- 1512761338116
+ 1514566300708
923
100
@@ -3814,6 +3824,15 @@ Art der Steuerung von FHEM set Befehlen, welche über die Bridge als Steuerbefeh
+
+ 547
+ Enable set Profile
+ %AMAD_receive
+ on
+
1512327302282
@@ -6391,12 +6410,12 @@ TWlKU5rSlKY0pSlNaUpTmtKUpjSlfTWTSP4HD723A9m6n1sAAAAASUVORK5CYII=
1503692408945
- 1512684208205
+ 1514566358989
938
100
547
- disanable send Profiles
+ disable send Profiles
%AMAD_send
off
+ 547
+ disable set Profile
+ %AMAD_receive
+ off
+
+
137
AMAD_SendData2CommBridge
@@ -7612,7 +7640,7 @@ Code: %HTTPR
1502789397309
- 1513276239987
+ 1515620693000
970
AMAD_informations
100
@@ -7620,7 +7648,7 @@ Code: %HTTPR
547
flowsetVersionAtDevice
%setreading
- "flowsetVersionAtDevice": "Tasker v0.1"
+ "flowsetVersionAtDevice": "Tasker v0.2"
1503260793343
- 1512176548967
+ 1515484018445
975
AMAD_VoiceControl
- 100
+ 7
903
AMAD Voice Control
@@ -8409,6 +8437,7 @@ Code: %HTTPR
548
+ false
Antwort: "%value"
@@ -8527,7 +8556,7 @@ Code: %HTTPR
1503693866986
- 1513110531034
+ 1515619510405
982
AMAD_SetCommands
100
@@ -8555,24 +8584,37 @@ Code: %HTTPR
- 598
- %receive4
- /%receive2/%receive3/
+ 547
+ %command
+ %receive41
+
+ 123
+ false
+ service call notification 1
+
+ And
- %receive(#)
- 7
- 4
+ %tpe_app
+ 2
+ All
+
+
+ %ROOT
+ 2
+ yes
-
+
548
no root
AMAD: "set clearNotificationBar all" benötigt Root rechte
@@ -8591,7 +8633,7 @@ Code: %HTTPR
-
+
130
no root
AMAD_SendData2CommBridge
@@ -8616,7 +8658,7 @@ Code: %HTTPR
-
+
43
@@ -8626,11 +8668,11 @@ Code: %HTTPR
-
+
62
0,500,500,500
-
+
43
@@ -8640,11 +8682,11 @@ Code: %HTTPR
-
+
25
-
+
43
@@ -8654,7 +8696,7 @@ Code: %HTTPR
-
+
877
%tpe_action
-
+
43
@@ -8677,18 +8719,23 @@ Code: %HTTPR
-
+
+ 37
+ Parameter extrahieren
+
+
+ %receive4(#)
+ 7
+ 1
+
+
+
+
548
AMAD: "Flow install: not supported by Tasker"
-
- 590
- %receive4
- ?
-
-
+
130
AMAD_SendData2CommBridge
@@ -8699,7 +8746,7 @@ Code: %HTTPR
-
+
43
@@ -8709,12 +8756,12 @@ Code: %HTTPR
-
+
90
%tpe_callnumber
-
+
30
@@ -8731,7 +8778,7 @@ Code: %HTTPR
-
+
733
@@ -8741,7 +8788,7 @@ Code: %HTTPR
-
+
43
@@ -8751,10 +8798,10 @@ Code: %HTTPR
-
+
733
-
+
43
@@ -8764,7 +8811,7 @@ Code: %HTTPR
-
+
20
com.android.systemui.Somnambulator
@@ -8775,7 +8822,15 @@ Code: %HTTPR
-
+
+ 547
+ %valueall
+ %receive42
+
+
43
@@ -8785,21 +8840,13 @@ Code: %HTTPR
-
- 547
- %command
- %receive41
-
-
+
41
%tpe_smsnumber
%tpe_smsmessage
-
+
43
@@ -8809,7 +8856,7 @@ Code: %HTTPR
-
+
548
Baustelle
AMAD: "set screen lock|unlock" wird noch nicht unterstützt
@@ -8822,7 +8869,7 @@ Code: %HTTPR
-
+
130
Baustelle
AMAD_SendData2CommBridge
@@ -8841,7 +8888,7 @@ Code: %HTTPR
-
+
43
@@ -8851,7 +8898,7 @@ Code: %HTTPR
-
+
548
Baustelle
AMAD: "set screen on" wird noch nicht unterstützt
@@ -8864,7 +8911,7 @@ Code: %HTTPR
-
+
130
Baustelle
AMAD_SendData2CommBridge
@@ -8883,7 +8930,7 @@ Code: %HTTPR
-
+
16
@@ -8893,49 +8940,42 @@ Code: %HTTPR
-
- 38
-
38
- 37
- Parameter extrahieren
-
-
- %receive4(#)
- 7
- 1
-
-
-
-
- 547
- %valueall
- %receive42
-
-
590
%valueall
&
-
+
+ 38
+
+
+ 43
+ wrong ID
+
+
+ 548
+ AMAD: Befehl mit falscher AMAD_ID empfangen
+
+
+ 38
+
+
39
%cmdpair
%valueall()
-
+
590
%cmdpair
=
-
+
547
%name
%cmdpair1
@@ -8943,12 +8983,26 @@ Code: %HTTPR
-
+
590
%cmdpair
%name=
+
+ 596
+ %name
+
+
+ 547
+ %name
+ tpe_%name
+
547
%receive
@@ -8965,20 +9019,6 @@ Code: %HTTPR
- 596
- %name
-
-
- 547
- %name
- tpe_%name
-
-
596
%cmdpair2
-
+
547
%%name
%cmdpair2
@@ -9006,523 +9046,24 @@ Code: %HTTPR
-
+
40
-
+
38
-
+
37
+ check ID
- %type
+ %tpe_amad_id
2
- setCommands
+ %AMAD_amadid
-
- 37
-
-
- %command
- 2
- screenMsg
-
-
-
-
- 548
- %tpe_message
-
-
- 43
-
-
- %command
- 2
- ttsMsg
-
-
-
-
- 547
- %AMAD_lastSetCommand
- %receive
-
-
- 547
- %tpe_msglang
- deu-deu
-
-
- %tpe_msglang
- 4
- en
-
-
-
-
- 547
- %tpe_msglang
- eng-usa
-
-
- %tpe_msglang
- 2
- en
-
-
-
-
- 547
- %volume
- %VOLM
-
-
- 307
-
- %tpe_msgvol
-
-
-
- %tpe_msgvol
- 7
- 1
-
-
-
-
- 559
- %tpe_message
- com.google.android.tts:%tpe_msglang
-
- %tpe_msgspeed
-
-
-
- 307
-
- %volume
-
-
-
- %tpe_msgvol
- 7
- 1
-
-
-
-
- 43
-
-
- %command
- 2
- flowState
-
-
-
-
- 159
- %tpe_flowname
-
-
- %tpe_flowstate
- 2
- active
-
-
-
-
- 159
- %tpe_flowname
-
-
- %tpe_flowstate
- 2
- inactive
-
-
-
-
- 130
- AMAD_SendData2CommBridge
-
- %priority+1
-
- setreading
- "automagicState": "Flow %tpe_flowname has been set %tpe_flowstate"
-
-
- 547
- debug
- false
- %receive
- %AMAD_lastSetCommand
-
-
- 43
-
-
- %command
- 2
- flowRun
-
-
-
-
- 130
- %tpe_flowname
-
- %priority
-
-
-
- 43
-
-
- %command
- 2
- setVolume
-
-
-
-
- 307
-
- %tpe_volume
-
-
-
- 43
-
-
- %command
- 2
- setNotifiVolume
-
-
-
-
- 305
-
- %tpe_notifivolume
-
-
-
- 43
-
-
- %command
- 2
- setRingSoundVolume
-
-
-
-
- 304
-
- %tpe_ringsoundvolume
-
-
-
- 43
-
-
- %command
- 2
- setBrightness
-
-
-
-
- 810
-
- %tpe_brightness
-
-
-
- 590
- %receive
- /
-
-
- 43
-
-
- %command
- 2
- multimediaControl
-
-
-
-
- 130
- multimediaControl
- AMAD_multimediaControl
-
- %priority
-
- %tpe_mplayer
- %tpe_button
-
-
- 43
-
-
- %command
- 2
- setvoicecmd
-
-
-
-
- 130
- AMAD_VoiceControl
-
- %priority+1
-
-
-
- 43
-
-
- %command
- 2
- setScreenOrientation
-
-
-
-
- 822
-
-
- %tpe_orientation
- 2
- auto
-
-
-
-
- 822
- Baustelle
-
-
- %tpe_orientation
- 3
- auto
-
-
-
-
- 548
- Baustelle
- AMAD: "set screenOrientation landscape|portrait" wird noch nicht unterstützt
-
-
- %tpe_orientation
- 4
- landscape|portrait
-
-
-
-
- 130
- Baustelle
- AMAD_SendData2CommBridge
-
- %priority+1
-
- setreading
- "automagicState": "set screenOrientation landscape|portrait: not supported by Tasker"
-
-
- %tpe_orientation
- 4
- landscape|portrait
-
-
-
-
- 43
-
-
- %command
- 2
- setScreenFullscreen
-
-
-
-
- 547
- %type
- %receive3
-
-
- 548
- Baustelle
- AMAD: "set screenFullscreen on|off" wird noch nicht unterstützt
-
-
- 130
- Baustelle
- AMAD_SendData2CommBridge
-
- %priority+1
-
- setreading
- "automagicState": "set screenFullscreen on|off: not supported by Tasker"
-
-
- 43
-
-
- %command
- 2
- openURL
-
-
-
-
- 547
- %tpe_url
- http://%tpe_url
-
-
- %tpe_url
- 5
- ^http*
-
-
-
-
- 877
- android.intent.action.VIEW
- %tpe_url
- %tpe_browserapp
- %tpe_browserappclass
-
-
- 43
-
-
- %command
- 2
- setAlarm
-
-
-
-
- 566
-
- %tpe_hour
-
-
- %tpe_minute
-
- AMAD Wecker
-
-
- 43
-
-
- %command
- 2
- setTimer
-
-
-
-
- 547
- %tpe_seconds
- %tpe_minute*60
-
-
- 543
-
- %tpe_seconds
-
- AMAD Timer
-
-
+
130
statusRequest
AMAD_informations
@@ -9541,7 +9082,551 @@ Code: %HTTPR
+
+ 130
+ currentFlowsetUpdate
+ AMAD_UpdateFlowset
+
+ %priority+1
+
+
+
+ %type
+ 2
+ currentFlowsetUpdate
+
+
+
+
+ 37
+
+
+ %type
+ 2
+ setCommands
+
+
+
+
+ 37
+
+
+ %command
+ 2
+ screenMsg
+
+
+
+
+ 548
+ %tpe_message
+
+
+ 547
+ %AMAD_lastSetCommand
+ %receive
+
+
+ 43
+
+
+ %command
+ 2
+ ttsMsg
+
+
+
+
+ 547
+ %tpe_msglang
+ deu-deu
+
+
+ %tpe_msglang
+ 4
+ en
+
+
+
+
+ 547
+ %tpe_msglang
+ eng-usa
+
+
+ %tpe_msglang
+ 2
+ en
+
+
+
+
+ 547
+ %volume
+ %VOLM
+
+
+ 307
+
+ %tpe_msgvol
+
+
+
+ %tpe_msgvol
+ 7
+ 1
+
+
+
+
+ 559
+ %tpe_message
+ com.google.android.tts:%tpe_msglang
+
+ %tpe_msgspeed
+
+
+
+ 307
+
+ %volume
+
+
+
+ %tpe_msgvol
+ 7
+ 1
+
+
+
+
+ 43
+
+
+ %command
+ 2
+ flowState
+
+
+
+
+ 159
+ %tpe_flowname
+
+
+ %tpe_flowstate
+ 2
+ active
+
+
+
+
+ 159
+ %tpe_flowname
+
+
+ %tpe_flowstate
+ 2
+ inactive
+
+
+
+
+ 547
+ debug
+ false
+ %receive
+ %AMAD_lastSetCommand
+
+
+ 130
+ AMAD_SendData2CommBridge
+
+ %priority+1
+
+ setreading
+ "automagicState": "Flow %tpe_flowname has been set %tpe_flowstate"
+
+
+ 43
+
+
+ %command
+ 2
+ flowRun
+
+
+
+
+ 130
+ %tpe_flowname
+
+ %priority
+
+
+
+ 43
+
+
+ %command
+ 2
+ setVolume
+
+
+
+
+ 307
+
+ %tpe_volume
+
+
+
+ 43
+
+
+ %command
+ 2
+ setNotifiVolume
+
+
+
+
+ 305
+
+ %tpe_notifivolume
+
+
+
+ 43
+
+
+ %command
+ 2
+ setRingSoundVolume
+
+
+
+
+ 304
+
+ %tpe_ringsoundvolume
+
+
+
+ 43
+
+
+ %command
+ 2
+ setBrightness
+
+
+
+
+ 590
+ %receive
+ /
+
+
+ 810
+
+ %tpe_brightness
+
+
+
+ 43
+
+
+ %command
+ 2
+ multimediaControl
+
+
+
+
+ 130
+ multimediaControl
+ AMAD_multimediaControl
+
+ %priority
+
+ %tpe_mplayer
+ %tpe_button
+
+
+ 43
+
+
+ %command
+ 2
+ setvoicecmd
+
+
+
+
+ 130
+ AMAD_VoiceControl
+
+ %priority+1
+
+
+
+ 43
+
+
+ %command
+ 2
+ setScreenOrientation
+
+
+
+
+ 822
+
+
+ %tpe_orientation
+ 2
+ auto
+
+
+
+
+ 822
+ Baustelle
+
+
+ %tpe_orientation
+ 3
+ auto
+
+
+
+
+ 548
+ Baustelle
+ AMAD: "set screenOrientation landscape|portrait" wird noch nicht unterstützt
+
+
+ %tpe_orientation
+ 4
+ landscape|portrait
+
+
+
+
+ 130
+ Baustelle
+ AMAD_SendData2CommBridge
+
+ %priority+1
+
+ setreading
+ "automagicState": "set screenOrientation landscape|portrait: not supported by Tasker"
+
+
+ %tpe_orientation
+ 4
+ landscape|portrait
+
+
+
+
+ 547
+ %type
+ %receive3
+
+
+ 43
+
+
+ %command
+ 2
+ setScreenFullscreen
+
+
+
+
+ 548
+ Baustelle
+ AMAD: "set screenFullscreen on|off" wird noch nicht unterstützt
+
+
+ 130
+ Baustelle
+ AMAD_SendData2CommBridge
+
+ %priority+1
+
+ setreading
+ "automagicState": "set screenFullscreen on|off: not supported by Tasker"
+
+
+ 43
+
+
+ %command
+ 2
+ openURL
+
+
+
+
+ 547
+ %tpe_url
+ http://%tpe_url
+
+
+ %tpe_url
+ 5
+ ^http*
+
+
+
+
+ 877
+ android.intent.action.VIEW
+ %tpe_url
+ %tpe_browserapp
+ %tpe_browserappclass
+
+
+ 43
+
+
+ %command
+ 2
+ setAlarm
+
+
+
+
+ 566
+
+ %tpe_hour
+
+
+ %tpe_minute
+
+ AMAD Wecker
+
+
+ 43
+
+
+ %command
+ 2
+ setTimer
+
+
+
+
+ 547
+ %tpe_seconds
+ %tpe_minute*60
+
+
+ 547
+ %receive4
+ %receive
+
+
+ %receive(#)
+ 7
+ 4
+
+
+
+ 543
+
+ %tpe_seconds
+
+ AMAD Timer
+
+
43
@@ -9551,7 +9636,7 @@ Code: %HTTPR
-
+
664
pacman
CONTEXT
@@ -9564,7 +9649,7 @@ Code: %HTTPR
-
+
664
intent
pacman
@@ -9577,7 +9662,7 @@ Code: %HTTPR
-
+
664
CONTEXT
@@ -9591,7 +9676,7 @@ Code: %HTTPR
-
+
43
@@ -9601,7 +9686,7 @@ Code: %HTTPR
-
+
123
svc nfc enable
-
+
123
svc nfc disable
-
+
548
no root
AMAD: "set nfc on|off" benötigt Root rechte
@@ -9658,7 +9743,7 @@ Code: %HTTPR
-
+
130
no root
AMAD_SendData2CommBridge
@@ -9677,7 +9762,25 @@ Code: %HTTPR
-
+
+ 598
+ %receive4
+ /%receive2/%receive3/
+
+
+ %receive(#)
+ 7
+ 4
+
+
+
+
43
@@ -9687,26 +9790,7 @@ Code: %HTTPR
-
- 130
- currentFlowsetUpdate
- AMAD_UpdateFlowset
-
- %priority+1
-
-
-
- %type
- 2
- currentFlowsetUpdate
-
-
-
-
+
130
AMAD_SendData2CommBridge
@@ -9724,7 +9808,7 @@ Code: %HTTPR
-
+
333
@@ -9735,7 +9819,7 @@ Code: %HTTPR
-
+
59
@@ -9746,7 +9830,7 @@ Code: %HTTPR
-
+
59
@@ -9757,7 +9841,7 @@ Code: %HTTPR
-
+
43
@@ -9767,7 +9851,7 @@ Code: %HTTPR
-
+
312
@@ -9778,7 +9862,7 @@ Code: %HTTPR
-
+
312
@@ -9789,7 +9873,7 @@ Code: %HTTPR
-
+
312
@@ -9800,7 +9884,7 @@ Code: %HTTPR
-
+
312
@@ -9811,7 +9895,13 @@ Code: %HTTPR
-
+
+ 590
+ %receive4
+ ?
+
+
43
@@ -9821,22 +9911,7 @@ Code: %HTTPR
-
- 547
- %receive4
- %receive
-
-
- %receive(#)
- 7
- 4
-
-
-
-
+
294
@@ -9847,7 +9922,7 @@ Code: %HTTPR
-
+
294
@@ -9858,7 +9933,7 @@ Code: %HTTPR
-
+
43
@@ -9868,7 +9943,7 @@ Code: %HTTPR
-
+
445
%tpe_notifypath%tpe_notifyfile
-
+
43
@@ -9886,13 +9961,13 @@ Code: %HTTPR
-
+
548
Baustelle
AMAD: "set changetoBtDevice" wird noch nicht unterstützt
-
+
130
Baustelle
AMAD_SendData2CommBridge
@@ -9904,7 +9979,7 @@ Code: %HTTPR
-
+
43
@@ -9914,7 +9989,7 @@ Code: %HTTPR
-
+
779
-
- 123
- false
- service call notification 1
-
- And
-
- %tpe_app
- 2
- All
-
-
- %ROOT
- 2
- yes
-
-
-
1511655849449