From 1f2b85d71c8e839e50e60017f4fc01d49e85ab48 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Sun, 11 Feb 2018 19:30:16 +0100 Subject: [PATCH] change readingnames, add automatic tasker projectfile update --- 73_AMADCommBridge.pm | 22 +- 74_AMADDevice.pm | 14 +- ...ml => 74_AMADautomagicFlowset_4.1.99.9.xml | 748 +++++++++--------- 3 files changed, 399 insertions(+), 385 deletions(-) rename 74_AMADautomagicFlowset_4.1.99.8.xml => 74_AMADautomagicFlowset_4.1.99.9.xml (90%) diff --git a/73_AMADCommBridge.pm b/73_AMADCommBridge.pm index 0d673b8..75b4cf8 100644 --- a/73_AMADCommBridge.pm +++ b/73_AMADCommBridge.pm @@ -74,8 +74,8 @@ 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 $flowsetversion = "4.1.99.8"; +my $modulversion = "4.1.99.31"; +my $flowsetversion = "4.1.99.9"; @@ -664,9 +664,10 @@ sub AMADCommBridge_ProcessRead($$) { my $response; my $c; + my $fhempath = $attr{global}{modpath}; + if ( $data =~ /currentFlowsetUpdate.xml/ ) { - my $fhempath = $attr{global}{modpath}; $response = qx(cat $fhempath/FHEM/lib/74_AMADautomagicFlowset_$flowsetversion.xml); $c = $hash->{CD}; print $c "HTTP/1.1 200 OK\r\n", @@ -676,9 +677,20 @@ sub AMADCommBridge_ProcessRead($$) { $response; return; - } + + } elsif( $data =~ /currentTaskersetUpdate.prj.xml/ ) { - elsif ( $data =~ /installFlow_([^.]*.xml)/ ) { + $response = qx(cat $fhempath/FHEM/lib/74_AMADtaskerset_$flowsetversion.prj.xml); + $c = $hash->{CD}; + print $c "HTTP/1.1 200 OK\r\n", + "Content-Type: text/plain\r\n", + "Connection: close\r\n", + "Content-Length: ".length($response)."\r\n\r\n", + $response; + + return; + + } elsif ( $data =~ /installFlow_([^.]*.xml)/ ) { if( defined($1) ){ $response = qx(cat /tmp/$1); diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm index 91e0e52..f77deed 100644 --- a/74_AMADDevice.pm +++ b/74_AMADDevice.pm @@ -58,8 +58,8 @@ eval "use Encode qw(encode encode_utf8);1" or $missingModul .= "Encode "; eval "use JSON;1" or $missingModul .= "JSON "; -my $modulversion = "4.1.99.40"; -my $flowsetversion = "4.1.99.8"; +my $modulversion = "4.1.99.41"; +my $flowsetversion = "4.1.99.9"; @@ -1059,8 +1059,9 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • flowsetVersionAtDevice - currently installed version of the flowsets on the Android device
  • incomingCallerName - Callername from last Call
  • incomingCallerNumber - Callernumber from last Call
    • -
  • incommingWhatsAppMessageFrom - last WhatsApp message
    • -
  • incommingWhatsTelegramMessageFrom - last telegram message
    • +
  • incomingWhatsAppMessage - last WhatsApp message
    • +
  • incomingWhatsTelegramMessage - last telegram message
    • +
  • incomingSmsMessage - last SMS message
  • intentRadioName - name of the most-recent streamed intent radio
  • intentRadioState - state of intent radio player
  • keyguardSet - 0/1 keyguard set, 0=no 1=yes, does not indicate whether it is currently active
    • @@ -1235,8 +1236,9 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • flowsetVersionAtDevice - aktuell installierte Flowsetversion auf dem Device
  • incomingCallerName - Anrufername des eingehenden Anrufes
  • incomingCallerNumber - Anrufernummer des eingehenden Anrufes
    • -
  • incommingWhatsAppMessageFrom - letzte WhatsApp Nachricht
    • -
  • incommingWhatsTelegramMessageFrom - letzte Telegram Nachricht
    • +
  • incomingWhatsAppMessage - letzte WhatsApp Nachricht
    • +
  • incomingWhatsTelegramMessage - letzte Telegram Nachricht
    • +
  • incomingWhatsSmsMessage - letzte SMS Nachricht
  • intentRadioName - zuletzt gesrreamter Intent Radio Name
  • intentRadioState - Status des IntentRadio Players
  • keyguardSet - 0/1 Displaysperre gesetzt 0=nein 1=ja, bedeutet nicht das sie gerade aktiv ist
    • diff --git a/74_AMADautomagicFlowset_4.1.99.8.xml b/74_AMADautomagicFlowset_4.1.99.9.xml similarity index 90% rename from 74_AMADautomagicFlowset_4.1.99.8.xml rename to 74_AMADautomagicFlowset_4.1.99.9.xml index 21eeb3e..754c0bb 100644 --- a/74_AMADautomagicFlowset_4.1.99.8.xml +++ b/74_AMADautomagicFlowset_4.1.99.9.xml @@ -3060,20 +3060,20 @@ fhemcmd = "setreading"; true - Script: incommingSmsText = "\"incommingSmsText\":" + " \"" + {sms_sender} + " - " + replaceAll({sms_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - true - Script: incommingTelegramMessage = "\"incommingTelegramMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - true - Script: incommingWhatsAppMessage = "\"incommingWhatsAppMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - @@ -3290,7 +3290,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA JSON -