mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-22 08:11:44 +00:00
14_Hideki.pm 14_SD_WS.pm 14_SD_WS07.pm 14_SD_WS09.pm 41_OREGON.pm: add batteryState (Forum #87575)
git-svn-id: https://svn.fhem.de/fhem/trunk@16935 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
sidey79
parent
34a028b0dd
commit
5d916cc5eb
@ -1,5 +1,10 @@
|
||||
# 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.
|
||||
- changed: 14_Hideki: standard battery readings
|
||||
- changed: 14_SD_WS: standard battery readings
|
||||
- changed: 14_SD_WS07: standard battery readings
|
||||
- changed: 14_SD_WS09: standard battery readings
|
||||
- changed: 41_Oregon: standard battery readings
|
||||
- change: 76_SMAInverter: Internal MODEL added
|
||||
- feature: 49_SSCam: V5.3.0, new createStreamDev generic, control elements
|
||||
for runView content within fhemweb, some new CamLive-
|
||||
|
||||
@ -216,6 +216,7 @@ Hideki_Parse($$)
|
||||
readingsBeginUpdate($hash);
|
||||
readingsBulkUpdate($hash, "state", $val);
|
||||
readingsBulkUpdate($hash, "battery", $bat) if ($bat ne "");
|
||||
readingsBulkUpdate($hash, "batteryState", $bat) if ($bat ne "");
|
||||
readingsBulkUpdate($hash, "channel", $channel) if ($channel ne "");
|
||||
readingsBulkUpdate($hash, "temperature", $temp) if ($temp ne "");
|
||||
readingsBulkUpdate($hash, "package_number", $count) if ($count ne "");
|
||||
|
||||
@ -155,7 +155,7 @@ sub SD_WS_Parse($$)
|
||||
temp => sub {my (undef,$bitData) = @_; return (((SD_WS_binaryToNumber($bitData,22,25)*256 + SD_WS_binaryToNumber($bitData,18,21)*16 + SD_WS_binaryToNumber($bitData,14,17)) *10 -12200) /18)/10; }, #temp
|
||||
hum => sub {my (undef,$bitData) = @_; return (SD_WS_binaryToNumber($bitData,30,33)*16 + SD_WS_binaryToNumber($bitData,26,29)); }, #hum
|
||||
channel => sub {my (undef,$bitData) = @_; return (SD_WS_binaryToNumber($bitData,12,13)+1 ); }, #channel
|
||||
bat => sub {my (undef,$bitData) = @_; return SD_WS_binaryToNumber($bitData,34) eq "1" ? "ok" : "critical";},
|
||||
bat => sub {my (undef,$bitData) = @_; return SD_WS_binaryToNumber($bitData,34) eq "0" ? "ok" : "low";},
|
||||
# sync => sub {my (undef,$bitData) = @_; return (SD_WS_binaryToNumber($bitData,35,35) eq "1" ? "true" : "false");},
|
||||
} ,
|
||||
51 =>
|
||||
@ -169,7 +169,7 @@ sub SD_WS_Parse($$)
|
||||
temp => sub {my (undef,$bitData) = @_; return round(((SD_WS_binaryToNumber($bitData,16,27)) -1220) *5 /90.0,1); }, #temp
|
||||
hum => sub {my (undef,$bitData) = @_; return (SD_WS_binaryToNumber($bitData,28,31)*10) + (SD_WS_binaryToNumber($bitData,32,35)); }, #hum
|
||||
channel => sub {my (undef,$bitData) = @_; return (SD_WS_binaryToNumber($bitData,36,39) ); }, #channel
|
||||
bat => sub {my (undef,$bitData) = @_; return SD_WS_binaryToNumber($bitData,13) eq "1" ? "crititcal" : "ok";},
|
||||
bat => sub {my (undef,$bitData) = @_; return SD_WS_binaryToNumber($bitData,13) eq "1" ? "low" : "ok";},
|
||||
trend => sub {my (undef,$bitData) = @_; return SD_WS_binaryToNumber($bitData,15,16) eq "01" ? "rising" : SD_WS_binaryToNumber($bitData,14,15) eq "00" ? "neutral" : "rising";},
|
||||
# sync => sub {my (undef,$bitData) = @_; return (SD_WS_binaryToNumber($bitData,35,35) eq "1" ? "true" : "false");},
|
||||
} ,
|
||||
@ -219,7 +219,7 @@ sub SD_WS_Parse($$)
|
||||
}
|
||||
},
|
||||
id => sub {my (undef,$bitData) = @_; return SD_WS_binaryToNumber($bitData,8,15); }, # random id
|
||||
bat => sub {my (undef,$bitData) = @_; return SD_WS_binaryToNumber($bitData,16) eq "1" ? "crititcal" : "ok";}, # bat?
|
||||
bat => sub {my (undef,$bitData) = @_; return SD_WS_binaryToNumber($bitData,16) eq "1" ? "low" : "ok";}, # bat?
|
||||
channel => sub {my (undef,$bitData) = @_; return (SD_WS_binaryToNumber($bitData,17,19)+1 ); }, # channel
|
||||
temp => sub {my (undef,$bitData) = @_; return round((SD_WS_binaryToNumber($bitData,20,31)-720)*0.0556,1); }, # temp
|
||||
hum => sub {my (undef,$bitData) = @_; return (SD_WS_binaryToNumber($bitData,32,39)); }, # hum
|
||||
@ -505,7 +505,8 @@ sub SD_WS_Parse($$)
|
||||
$id = SD_WS_bin2dec(substr($bitData,$vorpre + 4,6));
|
||||
$id = sprintf('%03X', $id);
|
||||
$channel = 0;
|
||||
$bat = SD_WS_bin2dec(substr($bitData,$vorpre + 20,1));
|
||||
$bat = SD_WS_binaryToNumber($bitData,$vorpre + 20) eq "1" ? "low" : "ok";
|
||||
|
||||
$sign = SD_WS_bin2dec(substr($bitData,$vorpre + 12,1));
|
||||
|
||||
if ($sign == 0) {
|
||||
@ -609,6 +610,7 @@ sub SD_WS_Parse($$)
|
||||
readingsBulkUpdate($hash, "temperature", $temp) if (defined($temp)&& ($temp > -60 && $temp < 70 ));
|
||||
readingsBulkUpdate($hash, "humidity", $hum) if (defined($hum) && ($hum > 0 && $hum < 100 )) ;
|
||||
readingsBulkUpdate($hash, "battery", $bat) if (defined($bat) && length($bat) > 0) ;
|
||||
readingsBulkUpdate($hash, "batteryState", $bat) if (defined($bat) && length($bat) > 0) ;
|
||||
readingsBulkUpdate($hash, "channel", $channel) if (defined($channel)&& length($channel) > 0);
|
||||
readingsBulkUpdate($hash, "trend", $trend) if (defined($trend) && length($trend) > 0);
|
||||
|
||||
|
||||
@ -210,6 +210,8 @@ SD_WS07_Parse($$)
|
||||
#my $battery = ReadingsVal($name, "battery", "unknown");
|
||||
#if ($bat ne $battery) {
|
||||
readingsBulkUpdate($hash, "battery", $bat);
|
||||
readingsBulkUpdate($hash, "batteryState", $bat);
|
||||
|
||||
#}
|
||||
}
|
||||
readingsBulkUpdate($hash, "channel", $channel) if ($channel ne "");
|
||||
|
||||
@ -412,6 +412,8 @@
|
||||
readingsBulkUpdate($hash, "temperature", $temp) if ($temp ne"");
|
||||
readingsBulkUpdate($hash, "humidity", $hum) if ($hum ne "" && $hum != 0 );
|
||||
readingsBulkUpdate($hash, "battery", $bat) if ($bat ne "");
|
||||
readingsBulkUpdate($hash, "batteryState", $bat) if ($bat ne "");
|
||||
|
||||
#zusätzlich Daten für Wetterstation
|
||||
readingsBulkUpdate($hash, "rain", $rain );
|
||||
readingsBulkUpdate($hash, ".rainOffset", $rain_offset ); # Zwischenspeicher für den offset
|
||||
|
||||
@ -312,6 +312,12 @@ sub OREGON_simple_battery {
|
||||
type => 'battery',
|
||||
current => $battery,
|
||||
units => '%',
|
||||
},
|
||||
{
|
||||
device => $dev,
|
||||
type => 'batteryState',
|
||||
current => $battery,
|
||||
units => '',
|
||||
}
|
||||
}
|
||||
|
||||
@ -319,11 +325,14 @@ sub OREGON_percentage_battery {
|
||||
my ($bytes, $dev, $res) = @_;
|
||||
|
||||
my $battery;
|
||||
my $batteryState;
|
||||
my $battery_level = 100-10*OREGON_lo_nibble($bytes->[4]);
|
||||
if ($battery_level > 50) {
|
||||
$battery = sprintf("ok %d%%",$battery_level);
|
||||
$batteryState="ok";
|
||||
} else {
|
||||
$battery = sprintf("low %d%%",$battery_level);
|
||||
$batteryState="low";
|
||||
}
|
||||
|
||||
push @$res, {
|
||||
@ -331,7 +340,20 @@ sub OREGON_percentage_battery {
|
||||
type => 'battery',
|
||||
current => $battery,
|
||||
units => '%',
|
||||
}, {
|
||||
device => $dev,
|
||||
type => 'batteryPercent',
|
||||
current => $battery_level,
|
||||
units => '%',
|
||||
},
|
||||
{
|
||||
device => $dev,
|
||||
type => 'batteryState',
|
||||
current => $batteryState,
|
||||
units => '',
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
my @uv_str =
|
||||
@ -1012,6 +1034,8 @@ OREGON_Parse($$)
|
||||
##$def->{READINGS}{$sensor}{TIME} = $tm;
|
||||
##$def->{READINGS}{$sensor}{VAL} = $i->{current};
|
||||
##$def->{CHANGED}[$n++] = $sensor . ": " . $i->{current};;
|
||||
} elsif ($i->{type} eq "batterPercent" || $i->{type} eq "batteryState") {
|
||||
readingsBulkUpdate($def,$i->{type},$i->{current});
|
||||
}
|
||||
elsif ($i->{type} eq "pressure") {
|
||||
#printf "Luftdruck %d %s, Vorhersage=%s ; ",$i->{current},$i->{units},$i->{forecast};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user