FHEM/mod-AMAD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix voiceInput Reading lower cap only, new Flow setup

Browse Source
This commit is contained in:
Marko Oldenburg 2017-06-12 19:50:01 +02:00
parent 36b3d54433
commit 9e2e5119ca
3 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
73_AMADCommBridge.pm
View File

@ -68,8 +68,8 @@ use TcpServerUtils;
eval "use JSON;1" or $missingModul .= "JSON ";
my $modulversion = "3.9.72";
my $flowsetversion = "3.9.73";
my $modulversion = "3.9.73";
my $flowsetversion = "3.9.74";
@ -811,7 +811,7 @@ sub AMADCommBridge_ResponseProcessing($$) {
}
elsif ( $fhemcmd eq 'voiceinputvalue' ) {
my $fhemCmd = $decode_json->{payload}{voiceinputdata};
my $fhemCmd = lc($decode_json->{payload}{voiceinputdata});
readingsBeginUpdate( $bhash);
readingsBulkUpdate( $bhash, "receiveVoiceCommand", $fhemCmd, 1 );

2
74_AMADDevice.pm
View File

@ -55,7 +55,7 @@ eval "use JSON;1" or $missingModul .= "JSON ";
my $modulversion = "3.9.72";
my $flowsetversion = "3.9.73";
my $flowsetversion = "3.9.74";

88
74_AMADautomagicFlowset_3.9.73.xml → 74_AMADautomagicFlowset_3.9.74.xml
View File

@ -1763,7 +1763,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich"
<contentType>text/json</contentType>
<generalTextData>{firstrundata}</generalTextData>
<formFieldList>@@@@readingsNameXYZ@@readingsValueABC</formFieldList>
<timeout>5000</timeout>
<timeout>15000</timeout>
<setCustomHTTPHeaders>true</setCustomHTTPHeaders>
<customHTTPHeaders>Connection: close</customHTTPHeaders>
<storeInVariable>true</storeInVariable>
@ -1783,7 +1783,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich"
<contentType>text/json</contentType>
<generalTextData>{fhemdata}</generalTextData>
<formFieldList>@@@@readingsNameXYZ@@readingsValueABC</formFieldList>
<timeout>5000</timeout>
<timeout>15000</timeout>
<setCustomHTTPHeaders>true</setCustomHTTPHeaders>
<customHTTPHeaders>Connection: close</customHTTPHeaders>
<storeInVariable>true</storeInVariable>
@ -1823,7 +1823,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich"
<contentType>text/json</contentType>
<generalTextData>{setcmd}</generalTextData>
<formFieldList>@@@@readingsNameXYZ@@readingsValueABC</formFieldList>
<timeout>5000</timeout>
<timeout>15000</timeout>
<setCustomHTTPHeaders>true</setCustomHTTPHeaders>
<customHTTPHeaders>Connection: close</customHTTPHeaders>
<storeInVariable>true</storeInVariable>
@ -1843,7 +1843,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich"
<contentType>text/json</contentType>
<generalTextData>{voiceinputdata}</generalTextData>
<formFieldList>@@@@readingsNameXYZ@@readingsValueABC</formFieldList>
<timeout>5000</timeout>
<timeout>15000</timeout>
<setCustomHTTPHeaders>true</setCustomHTTPHeaders>
<customHTTPHeaders>FHEMDEVICE: {global_fhemdevice}
FHEMCMD: voiceinputvalue
@ -2717,7 +2717,7 @@ fhemcmd = "setreading";</script>
<action type="script">
<useDefaultName>false</useDefaultName>
<name>Script: Set FHEMDATA JSON</name>
<script>fhemdata = "\"flowsetVersionAtDevice\": \"3.9.73\",";
<script>fhemdata = "\"flowsetVersionAtDevice\": \"3.9.74\",";
@ -3375,7 +3375,7 @@ Soll der Assistent gelöscht werden?</text>
</action>
<flow type="flow">
<name>First Run Assistant</name>
<group>AMADNG Info/Control Flowset v3.9.73</group>
<group>AMADNG Info/Control Flowset v3.9.74</group>
<enabled>false</enabled>
<executionPolicy>PARALLEL</executionPolicy>
<triggercontainer id="t1" x="69.999725" y="-1487.5">
@ -3615,7 +3615,7 @@ Auf Wiedersehen.</actioncontainer>
</flow>
<flow type="flow">
<name>Informations</name>
<group>AMADNG Info/Control Flowset v3.9.73</group>
<group>AMADNG Info/Control Flowset v3.9.74</group>
<enabled>true</enabled>
<executionPolicy>QUEUE</executionPolicy>
<emergencyStopCount>900</emergencyStopCount>
@ -4070,7 +4070,7 @@ Auf Wiedersehen.</actioncontainer>
</flow>
<flow type="flow">
<name>Send Data to AMADCommBridge</name>
<group>AMADNG Info/Control Flowset v3.9.73</group>
<group>AMADNG Info/Control Flowset v3.9.74</group>
<enabled>true</enabled>
<executionPolicy>PARALLEL</executionPolicy>
<emergencyStopCount>900</emergencyStopCount>
@ -4090,55 +4090,55 @@ Auf Wiedersehen.</actioncontainer>
<conditioncontainer id="t11" x="-245.0" y="-402.5">Host erreichbar: {global_fhemip}:{global_bridgeport}</conditioncontainer>
<actioncontainer id="t12" x="700.0" y="1067.5">In Datei Schreiben: Deaktiviere Flows in /storage/emulated/0/file.txt (anhängen)</actioncontainer>
<actioncontainer id="t13" x="700.0" y="682.5">Setze Flow Status: Deaktivieren Informations,SetCommands</actioncontainer>
<actioncontainer id="t14" x="245.0" y="682.5">HTTP Request: send VOICEINPUTVALUE data to AMADCommBridge</actioncontainer>
<actioncontainer id="t15" x="-245.0" y="682.5">HTTP Request: send SET data to AMADCommBridge JSON</actioncontainer>
<actioncontainer id="t16" x="-490.0" y="682.5">HTTP Request: send READINGS data to AMADCommBridge JSON</actioncontainer>
<actioncontainer id="t17" x="-735.0" y="682.5">HTTP Request: send FIRSTRUN data to AMADCommBridge JSON</actioncontainer>
<actioncontainer id="t18" x="0.0" y="682.5">HTTP Request: send READINGSVAL data to AMADCommBridge JSON</actioncontainer>
<conditioncontainer id="t19" x="665.0" y="367.49994">Flow Aktiv: Informations</conditioncontainer>
<conditioncontainer id="t20" x="735.0" y="437.5">Flow Aktiv: SetCommands</conditioncontainer>
<conditioncontainer id="t21" x="665.0001" y="-402.5">Expression: trigger == "WLAN Getrennt: toGo"</conditioncontainer>
<actioncontainer id="t22" x="735.0" y="-52.500034">Script: togocount = togocount + 1</actioncontainer>
<conditioncontainer id="t23" x="735.0" y="-192.49997">Expression: togocount &lt; 6</conditioncontainer>
<actioncontainer id="t24" x="735.0" y="87.50002">Pause: 1s (Gerät wach halten)</actioncontainer>
<actioncontainer id="t25" x="1225.0" y="682.5">Setze Flow Status: Aktivieren Informations,SetCommands</actioncontainer>
<conditioncontainer id="t26" x="1120.0001" y="367.49994">Flow Aktiv: Informations</conditioncontainer>
<conditioncontainer id="t27" x="1190.0001" y="437.5">Flow Aktiv: SetCommands</conditioncontainer>
<conditioncontainer id="t28" x="1155.0" y="-402.5">Expression: trigger == "WLAN Verbunden: toGo"</conditioncontainer>
<actioncontainer id="t29" x="1225.0" y="1067.5">In Datei Schreiben: Aktiviere Flows in /storage/emulated/0/file.txt (anhängen)</actioncontainer>
<conditioncontainer id="t14" x="665.0" y="367.5">Flow Aktiv: Informations</conditioncontainer>
<conditioncontainer id="t15" x="735.0" y="437.5">Flow Aktiv: SetCommands</conditioncontainer>
<conditioncontainer id="t16" x="665.0" y="-402.5">Expression: trigger == "WLAN Getrennt: toGo"</conditioncontainer>
<actioncontainer id="t17" x="735.0" y="-52.5">Script: togocount = togocount + 1</actioncontainer>
<conditioncontainer id="t18" x="735.0" y="-192.5">Expression: togocount &lt; 6</conditioncontainer>
<actioncontainer id="t19" x="735.0" y="87.5">Pause: 1s (Gerät wach halten)</actioncontainer>
<actioncontainer id="t20" x="1225.0" y="682.5">Setze Flow Status: Aktivieren Informations,SetCommands</actioncontainer>
<conditioncontainer id="t21" x="1120.0" y="367.5">Flow Aktiv: Informations</conditioncontainer>
<conditioncontainer id="t22" x="1190.0" y="437.5">Flow Aktiv: SetCommands</conditioncontainer>
<conditioncontainer id="t23" x="1155.0" y="-402.5">Expression: trigger == "WLAN Verbunden: toGo"</conditioncontainer>
<actioncontainer id="t24" x="1225.0" y="1067.5">In Datei Schreiben: Aktiviere Flows in /storage/emulated/0/file.txt (anhängen)</actioncontainer>
<actioncontainer id="t25" x="-735.0" y="682.5">HTTP Request: send FIRSTRUN data to AMADCommBridge JSON</actioncontainer>
<actioncontainer id="t26" x="-490.0" y="682.5">HTTP Request: send READINGS data to AMADCommBridge JSON</actioncontainer>
<actioncontainer id="t27" x="-245.0" y="682.5">HTTP Request: send SET data to AMADCommBridge JSON</actioncontainer>
<actioncontainer id="t28" x="0.0" y="682.5">HTTP Request: send READINGSVAL data to AMADCommBridge JSON</actioncontainer>
<actioncontainer id="t29" x="245.0" y="682.5">HTTP Request: send VOICEINPUTVALUE data to AMADCommBridge</actioncontainer>
<actioncontainer id="t30" x="-490.0" y="402.5">Script: Set FHEMDATA JSON</actioncontainer>
<connection from="t1" to="t11" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t2" to="t6" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t3" to="t7" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t4" to="t10" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t5" to="t8" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t6" to="t15" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t7" to="t14" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t8" to="t18" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t6" to="t27" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t7" to="t29" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t8" to="t28" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t9" to="t30" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t10" to="t17" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t10" to="t25" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t11" to="t9" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t11" to="t2" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t11" to="t5" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t11" to="t3" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t11" to="t4" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t11" to="t21" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t11" to="t28" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t19" to="t20" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t20" to="t13" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t21" to="t19" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t21" to="t23" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t22" to="t24" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t23" to="t22" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t24" to="t11" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t26" to="t27" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t27" to="t25" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t28" to="t26" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t30" to="t16" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t11" to="t16" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t11" to="t23" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t14" to="t15" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t15" to="t13" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t16" to="t14" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t16" to="t18" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t17" to="t19" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t18" to="t17" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t19" to="t11" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t21" to="t22" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t22" to="t20" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t23" to="t21" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t30" to="t26" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
</flow>
<flow type="flow">
<name>SetCommands</name>
<group>AMADNG Info/Control Flowset v3.9.73</group>
<group>AMADNG Info/Control Flowset v3.9.74</group>
<enabled>true</enabled>
<executionPolicy>QUEUE</executionPolicy>
<emergencyStopCount>900</emergencyStopCount>
@ -4491,7 +4491,7 @@ Auf Wiedersehen.</actioncontainer>
</flow>
<flow type="flow">
<name>Update AMAD Flowset</name>
<group>AMADNG Info/Control Flowset v3.9.73</group>
<group>AMADNG Info/Control Flowset v3.9.74</group>
<enabled>true</enabled>
<executionPolicy>QUEUE</executionPolicy>
<triggercontainer id="t1" x="420.0" y="-682.5">
@ -4547,7 +4547,7 @@ Auf Wiedersehen.</actioncontainer>
</flow>
<flow type="flow">
<name>VoiceControl</name>
<group>AMADNG Info/Control Flowset v3.9.73</group>
<group>AMADNG Info/Control Flowset v3.9.74</group>
<enabled>true</enabled>
<executionPolicy>QUEUE</executionPolicy>
<triggercontainer id="t1" x="70.0" y="-52.5" />