FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

74_AMADtasker: AMAD Taskerproject change to new battery states

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16886 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2018-06-19 07:30:39 +00:00
parent f6d12dbdc7
commit 6f930d160e
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- change: 74_AMADtasker: AMAD Taskerproject change to new battery states
- feature: 49_SSCamSTRM: new attr hideDisplayName regarding to Forum #88667 - feature: 49_SSCamSTRM: new attr hideDisplayName regarding to Forum #88667
- bugfix: 49_SSCam: global vars - bugfix: 49_SSCam: global vars
- bugfix: 88_HMCCU: fixed rpcServerAddr attribute and update of sysvar dpt - bugfix: 88_HMCCU: fixed rpcServerAddr attribute and update of sysvar dpt

4
fhem/FHEM/74_AMADDevice.pm
View File

@ -1070,6 +1070,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
<li>androidVersion - currently installed version of Android</li> <li>androidVersion - currently installed version of Android</li>
<li>automagicState - state of the Automagic or Tasker App <b>(prerequisite Android >4.3). In case you have Android >4.3 and the reading says "not supported", you need to enable Automagic/Tasker inside Android / Settings / Sound & notification / Notification access</b></li> <li>automagicState - state of the Automagic or Tasker App <b>(prerequisite Android >4.3). In case you have Android >4.3 and the reading says "not supported", you need to enable Automagic/Tasker inside Android / Settings / Sound & notification / Notification access</b></li>
<li>batteryHealth - the health of the battery (1=unknown, 2=good, 3=overheat, 4=dead, 5=over voltage, 6=unspecified failure, 7=cold) (Automagic only)</li> <li>batteryHealth - the health of the battery (1=unknown, 2=good, 3=overheat, 4=dead, 5=over voltage, 6=unspecified failure, 7=cold) (Automagic only)</li>
<li>powerPercent - state of battery in %</li>
<li>batterytemperature - the temperature of the battery (Automagic only)</li> <li>batterytemperature - the temperature of the battery (Automagic only)</li>
<li>bluetooth - on/off, bluetooth state</li> <li>bluetooth - on/off, bluetooth state</li>
<li>checkActiveTask - state of an app (needs to be defined beforehand). 0=not active or not active in foreground, 1=active in foreground, <b>see note below</b> (Automagic only)</li> <li>checkActiveTask - state of an app (needs to be defined beforehand). 0=not active or not active in foreground, 1=active in foreground, <b>see note below</b> (Automagic only)</li>
@ -1105,7 +1106,6 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
<li>nextAlarmTime - currently set time of alarm</li> <li>nextAlarmTime - currently set time of alarm</li>
<li>nfc - state of nfc service on/off</li> <li>nfc - state of nfc service on/off</li>
<li>nfcLastTagID - nfc_id of last scan nfc Tag / In order for the ID to be recognized correctly, the trigger NFC TagIDs must be processed in Flow NFC Tag Support and the TagId's Commase-separated must be entered. (Automagic only)</li> <li>nfcLastTagID - nfc_id of last scan nfc Tag / In order for the ID to be recognized correctly, the trigger NFC TagIDs must be processed in Flow NFC Tag Support and the TagId's Commase-separated must be entered. (Automagic only)</li>
<li>powerLevel - state of battery in %</li>
<li>powerPlugged - 0=no/1,2=yes, power supply connected</li> <li>powerPlugged - 0=no/1,2=yes, power supply connected</li>
<li>screen - on locked,unlocked/off locked,unlocked, state of display</li> <li>screen - on locked,unlocked/off locked,unlocked, state of display</li>
<li>screenBrightness - 0-255, level of screen-brightness</li> <li>screenBrightness - 0-255, level of screen-brightness</li>
@ -1258,6 +1258,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
<li>androidVersion - aktuell installierte Androidversion</li> <li>androidVersion - aktuell installierte Androidversion</li>
<li>automagicState - Statusmeldungen von der Automagic oder Tasker App <b>(Voraussetzung Android >4.3). Ist Android gr&ouml;&szlig;er 4.3 vorhanden und im Reading steht "wird nicht unterst&uuml;tzt", mu&szlig; in den Androideinstellungen unter Ton und Benachrichtigungen -> Benachrichtigungszugriff ein Haken f&uuml;r Automagic/Tasker gesetzt werden</b></li> <li>automagicState - Statusmeldungen von der Automagic oder Tasker App <b>(Voraussetzung Android >4.3). Ist Android gr&ouml;&szlig;er 4.3 vorhanden und im Reading steht "wird nicht unterst&uuml;tzt", mu&szlig; in den Androideinstellungen unter Ton und Benachrichtigungen -> Benachrichtigungszugriff ein Haken f&uuml;r Automagic/Tasker gesetzt werden</b></li>
<li>batteryHealth - Zustand der Battery (1=unbekannt, 2=gut, 3=&Uuml;berhitzt, 4=tot, 5=&Uuml;berspannung, 6=unbekannter Fehler, 7=kalt) (nur Automagic)</li> <li>batteryHealth - Zustand der Battery (1=unbekannt, 2=gut, 3=&Uuml;berhitzt, 4=tot, 5=&Uuml;berspannung, 6=unbekannter Fehler, 7=kalt) (nur Automagic)</li>
<li>powerPercent - Status der Batterie in %</li>
<li>batterytemperature - Temperatur der Batterie (nur Automagic)</li> <li>batterytemperature - Temperatur der Batterie (nur Automagic)</li>
<li>bluetooth - on/off, Bluetooth Status an oder aus</li> <li>bluetooth - on/off, Bluetooth Status an oder aus</li>
<li>checkActiveTask - Zustand einer zuvor definierten APP. 0=nicht aktiv oder nicht aktiv im Vordergrund, 1=aktiv im Vordergrund, <b>siehe Hinweis unten</b> (nur Automagic)</li> <li>checkActiveTask - Zustand einer zuvor definierten APP. 0=nicht aktiv oder nicht aktiv im Vordergrund, 1=aktiv im Vordergrund, <b>siehe Hinweis unten</b> (nur Automagic)</li>
@ -1293,7 +1294,6 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
<li>nextAlarmTime - aktive Alarmzeit</li> <li>nextAlarmTime - aktive Alarmzeit</li>
<li>nfc - Status des NFC on/off</li> <li>nfc - Status des NFC on/off</li>
<li>nfcLastTagID - nfc_id des zu letzt gescannten Tag's / Damit die ID korrekt erkannt wird muss im Flow NFC Tag Support der Trigger NFC TagIDs bearbeitet werden und die TagId's Kommasepariert eingetragen werden. (nur Automagic)</li> <li>nfcLastTagID - nfc_id des zu letzt gescannten Tag's / Damit die ID korrekt erkannt wird muss im Flow NFC Tag Support der Trigger NFC TagIDs bearbeitet werden und die TagId's Kommasepariert eingetragen werden. (nur Automagic)</li>
<li>powerLevel - Status der Batterie in %</li>
<li>powerPlugged - Netzteil angeschlossen? 0=NEIN, 1|2=JA</li> <li>powerPlugged - Netzteil angeschlossen? 0=NEIN, 1|2=JA</li>
<li>screen - on locked/unlocked, off locked/unlocked gibt an ob der Bildschirm an oder aus ist und gleichzeitig gesperrt oder nicht gesperrt</li> <li>screen - on locked/unlocked, off locked/unlocked gibt an ob der Bildschirm an oder aus ist und gleichzeitig gesperrt oder nicht gesperrt</li>
<li>screenBrightness - Bildschirmhelligkeit von 0-255</li> <li>screenBrightness - Bildschirmhelligkeit von 0-255</li>

29
fhem/FHEM/lib/74_AMADtaskerset_4.2.3.prj.xml
View File

@ -744,9 +744,9 @@ Telegram</label>
<Project sr="proj0" ve="2"> <Project sr="proj0" ve="2">
<cdate>1502789371413</cdate> <cdate>1502789371413</cdate>
<name>AMAD</name> <name>AMAD</name>
<pids>53,1015,1071,971,1023,1010,1021,1016,1035,1030,1007,1025,1013,1005,1026,1022,1008,1017,1020,1006,1011,1024,1014,1065,1029,1019,1028</pids> <pids>53,1014,1008,1015,1020,1023,1007,1016,1013,1065,1026,1022,1028,1025,1006,1035,1024,1011,1005,971,1021,1029,1030,1017,1010,1071,1019</pids>
<scenes>AMAD_settings,AMAD_Dialog_Message</scenes> <scenes>AMAD_settings,AMAD_Dialog_Message</scenes>
<tids>948,946,960,935,975,1063,985,936,953,1031,977,937,961,989,1004,967,999,997,988,994,979,976,957,980,990,991,918,959,920,850,981,972,932,970,962,969,1001,925,951,950,924,1000,926,986,987,939,996,995,1003,927,1036,974,954,1002,923,940,934,914,955,941,916,956,964,966,963,1072,949,978,944,943,947,942,973,984,958,993,968,998,1066,965,945,982,922,983,938,1055,992,931</tids> <tids>936,1063,957,956,923,981,934,920,962,961,978,948,945,925,955,995,960,926,999,1072,985,975,950,1055,959,939,914,943,967,996,979,850,954,998,927,924,987,938,937,944,951,918,949,932,931,966,941,972,983,963,994,1002,974,1004,935,940,942,982,997,964,969,976,958,990,1003,1066,980,922,991,988,1000,946,947,916,1036,977,989,968,1001,993,992,965,970,953,973,986,1031,984</tids>
<Kid sr="Kid"> <Kid sr="Kid">
<feat0>android.hardware.camera:y</feat0> <feat0>android.hardware.camera:y</feat0>
<feat1>android.hardware.bluetooth:y</feat1> <feat1>android.hardware.bluetooth:y</feat1>
@ -1841,7 +1841,7 @@ Only available if you select &amp;lt;b&amp;gt;Continue Task After Error&amp;lt;/
</Task> </Task>
<Task sr="task1004"> <Task sr="task1004">
<cdate>1503693866986</cdate> <cdate>1503693866986</cdate>
<edate>1523024585084</edate> <edate>1526108249339</edate>
<id>1004</id> <id>1004</id>
<nme>AMAD_SetCommands</nme> <nme>AMAD_SetCommands</nme>
<pri>100</pri> <pri>100</pri>
@ -2355,26 +2355,15 @@ Only available if you select &amp;lt;b&amp;gt;Continue Task After Error&amp;lt;/
<code>38</code> <code>38</code>
</Action> </Action>
<Action sr="act142" ve="7"> <Action sr="act142" ve="7">
<code>130</code>
<Str sr="arg0" ve="3">AMAD_informations</Str>
<Int sr="arg1">
<var>%priority+1</var>
</Int>
<Str sr="arg2" ve="3"/>
<Str sr="arg3" ve="3"/>
<Str sr="arg4" ve="3"/>
<Int sr="arg5" val="0"/>
</Action>
<Action sr="act143" ve="7">
<code>43</code> <code>43</code>
<label>wrong ID</label> <label>wrong ID</label>
</Action> </Action>
<Action sr="act144" ve="7"> <Action sr="act143" ve="7">
<code>548</code> <code>548</code>
<Str sr="arg0" ve="3">AMAD: Befehl mit falscher AMAD_ID empfangen</Str> <Str sr="arg0" ve="3">AMAD: Befehl mit falscher AMAD_ID empfangen</Str>
<Int sr="arg1" val="1"/> <Int sr="arg1" val="1"/>
</Action> </Action>
<Action sr="act145" ve="7"> <Action sr="act144" ve="7">
<code>38</code> <code>38</code>
</Action> </Action>
<Action sr="act15" ve="7"> <Action sr="act15" ve="7">
@ -8148,7 +8137,7 @@ Es können mehrere SSIDs durch slash "/" getrennt angegeben werden.</Str>
</Task> </Task>
<Task sr="task960"> <Task sr="task960">
<cdate>1502789397309</cdate> <cdate>1502789397309</cdate>
<edate>1523024368481</edate> <edate>1528637269209</edate>
<id>960</id> <id>960</id>
<nme>AMAD_informations</nme> <nme>AMAD_informations</nme>
<pri>100</pri> <pri>100</pri>
@ -8165,7 +8154,7 @@ Es können mehrere SSIDs durch slash "/" getrennt angegeben werden.</Str>
<code>547</code> <code>547</code>
<label>flowsetVersionAtDevice</label> <label>flowsetVersionAtDevice</label>
<Str sr="arg0" ve="3">%setreading</Str> <Str sr="arg0" ve="3">%setreading</Str>
<Str sr="arg1" ve="3">"flowsetVersionAtDevice": "4.2.2 (Tasker)"</Str> <Str sr="arg1" ve="3">"flowsetVersionAtDevice": "4.2.3 (Tasker)"</Str>
<Int sr="arg2" val="0"/> <Int sr="arg2" val="0"/>
<Int sr="arg3" val="0"/> <Int sr="arg3" val="0"/>
<Int sr="arg4" val="0"/> <Int sr="arg4" val="0"/>
@ -8265,9 +8254,9 @@ Es können mehrere SSIDs durch slash "/" getrennt angegeben werden.</Str>
</Action> </Action>
<Action sr="act16" ve="7"> <Action sr="act16" ve="7">
<code>547</code> <code>547</code>
<label>powerLevel</label> <label>batteryPercent</label>
<Str sr="arg0" ve="3">%setreading</Str> <Str sr="arg0" ve="3">%setreading</Str>
<Str sr="arg1" ve="3">%setreading,"powerLevel": "%BATT"</Str> <Str sr="arg1" ve="3">%setreading,"batteryPercent": "%BATT"</Str>
<Int sr="arg2" val="0"/> <Int sr="arg2" val="0"/>
<Int sr="arg3" val="0"/> <Int sr="arg3" val="0"/>
<Int sr="arg4" val="0"/> <Int sr="arg4" val="0"/>