From 72ff0c69d2afdfef9aa39c8eb3147574623ea316 Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Fri, 1 Jun 2018 20:33:04 +0000 Subject: [PATCH] 74_NUKIDevice:, 74_AMADDevice change battery and batteryLevel to batteryState and batteryPercent git-svn-id: https://svn.fhem.de/fhem/trunk@16804 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/74_NUKIDevice.pm | 8 +- fhem/FHEM/74_XiaomiBTLESens.pm | 13 +- ....xml => 74_AMADautomagicFlowset_4.2.3.xml} | 578 +++++++++--------- ...prj.xml => 74_AMADtaskerset_4.2.3.prj.xml} | 0 4 files changed, 302 insertions(+), 297 deletions(-) rename fhem/FHEM/lib/{74_AMADautomagicFlowset_4.2.2.xml => 74_AMADautomagicFlowset_4.2.3.xml} (92%) rename fhem/FHEM/lib/{74_AMADtaskerset_4.2.2.prj.xml => 74_AMADtaskerset_4.2.3.prj.xml} (100%) diff --git a/fhem/FHEM/74_NUKIDevice.pm b/fhem/FHEM/74_NUKIDevice.pm index de2e5eb2f..1872bce6f 100644 --- a/fhem/FHEM/74_NUKIDevice.pm +++ b/fhem/FHEM/74_NUKIDevice.pm @@ -135,6 +135,7 @@ sub NUKIDevice_Define($$) { Log3 $name, 3, "NUKIDevice ($name) - defined with Code: $code"; + Log3 $name, 1, "NUKIDevice ($name) - reading battery a deprecated and will be remove in future"; $attr{$name}{room} = "NUKI" if( !defined( $attr{$name}{room} ) ); @@ -447,8 +448,6 @@ sub NUKIDevice_WriteReadings($$) { $battery = "ok"; } elsif ( $decode_json->{batteryCritical} eq "true" or $decode_json->{batteryCritical} == 1 ) { $battery = "low"; - } else { - $battery = "parseError"; } } @@ -486,6 +485,7 @@ sub NUKIDevice_WriteReadings($$) { readingsBulkUpdate( $hash, "lockState", $decode_json->{stateName} ); readingsBulkUpdate( $hash, "state", $decode_json->{stateName} ); readingsBulkUpdate( $hash, "battery", $battery ); + readingsBulkUpdate( $hash, "batteryState", $battery ); readingsBulkUpdate( $hash, "success", $decode_json->{success} ); readingsBulkUpdate( $hash, "name", $decode_json->{name} ); @@ -618,7 +618,7 @@ sub NUKIDevice_CGI() {
  • rssi - value of rssi
  • succes - true, false Returns the status of the last closing command. Ok or not Ok.
  • batteryCritical - Is the battery in a critical state? True, false
    • -
  • battery - battery status, ok / low
    • +
  • batteryState - battery status, ok / low


    • @@ -679,7 +679,7 @@ sub NUKIDevice_CGI() {
  • rssi - rssi Wert des Smart Locks
  • succes - true, false Gibt des Status des letzten Schließbefehles wieder. Geklappt oder nicht geklappt.
  • batteryCritical - Ist die Batterie in einem kritischen Zustand? true, false
    • -
  • battery - Status der Batterie, ok/low
    • +
  • batteryState - Status der Batterie, ok/low


    • diff --git a/fhem/FHEM/74_XiaomiBTLESens.pm b/fhem/FHEM/74_XiaomiBTLESens.pm index da14ddc80..850deeb47 100644 --- a/fhem/FHEM/74_XiaomiBTLESens.pm +++ b/fhem/FHEM/74_XiaomiBTLESens.pm @@ -170,6 +170,7 @@ sub XiaomiBTLESens_Define($$) { CommandAttr(undef,$name . ' room XiaomiBTLESens') if( AttrVal($name,'room','none') eq 'none' ); Log3 $name, 3, "XiaomiBTLESens ($name) - defined with BTMAC $hash->{BTMAC}"; + Log3 $name, 1, "XiaomiBTLESens ($name) - readings battery and batteryLevel a deprecated and will be remove in future"; $modules{XiaomiBTLESens}{defptr}{$hash->{BTMAC}} = $hash; return undef; @@ -657,6 +658,10 @@ sub XiaomiBTLESens_FlowerSensHandle0x38($$) { $readings{'batteryLevel'} = hex("0x".$dataBatFw[0]); $readings{'battery'} = (hex("0x".$dataBatFw[0]) > 15 ? "ok" : "low"); + ### neue Vereinheitlichung für Batteriereadings Forum #800017 + $readings{'batteryPercent'} = hex("0x".$dataBatFw[0]); + $readings{'batteryState'} = (hex("0x".$dataBatFw[0]) > 15 ? "ok" : "low"); + $readings{'firmware'} = ($dataBatFw[2]-30).".".($dataBatFw[4]-30).".".($dataBatFw[6]-30); $hash->{helper}{CallBattery} = 1; @@ -954,8 +959,8 @@ sub CometBlueBTLE_CmdlinePreventGrepFalsePositive($) { Readings