diff --git a/fhem/CHANGED b/fhem/CHANGED
index 8ad3cfed0..884d3cf57 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,6 +1,7 @@
# 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.
- SVN
+ - added: new module 51_BBB_WATCHDOG.pm (betateilchen)
- bugfix: SYSMON: Fix: uninitialized variable
- feature: new modul 73_MPD added (Wzut)
- bugfix: SYSMON: Fix: root fs with /dev/mapper
diff --git a/fhem/FHEM/51_BBB_WATCHDOG.pm b/fhem/FHEM/51_BBB_WATCHDOG.pm
new file mode 100644
index 000000000..5c49638b8
--- /dev/null
+++ b/fhem/FHEM/51_BBB_WATCHDOG.pm
@@ -0,0 +1,106 @@
+# $Id:
+
+package main;
+
+use strict;
+use warnings;
+use Time::HiRes qw(gettimeofday);
+
+sub BBB_WATCHDOG_Initialize($){
+ my ($hash) = @_;
+ require "$attr{global}{modpath}/FHEM/DevIo.pm";
+ $hash->{DefFn} = "BBB_WATCHDOG_Define";
+ $hash->{UndefFn} = "BBB_WATCHDOG_Undefine";
+ $hash->{ShutdownFn} = "BBB_WATCHDOG_Shutdown";
+ $hash->{AttrList} = $readingFnAttributes;
+}
+
+sub BBB_WATCHDOG_Define($$){
+ my ($hash, $def) = @_;
+ my $name = $hash->{NAME};
+ my @a = split("[ \t][ \t]*", $def);
+ my $dev = '/dev/watchdog@directio';
+
+ DevIo_CloseDev($hash);
+ $hash->{PARTIAL} = "";
+ $hash->{DeviceName} = $dev;
+ my $ret = DevIo_OpenDev($hash, 0, undef);
+ triggerWD($hash);
+ return $ret;
+}
+
+sub BBB_WATCHDOG_Undefine($$){
+ my($hash, $name) = @_;
+ DevIo_CloseDev($hash);
+ RemoveInternalTimer($hash);
+ return;
+}
+
+sub BBB_WATCHDOG_Shutdown($) {
+ my ($hash) = @_;
+ my $name = $hash->{NAME};
+ Log3 ($name,4,"BBB_WATCHDOG $name: shutdown requested");
+ DevIo_CloseDev($hash);
+ return undef;
+}
+
+sub triggerWD($) {
+ my ($hash) = @_;
+ Log3(undef, 4, "triggered");
+ DevIo_SimpleWrite($hash, "X", undef);
+ InternalTimer(gettimeofday()+40, "triggerWD", $hash, 0);
+}
+
+1;
+
+=pod
+not to be translated
+=begin html
+
+
+
BBB_WATCHDOG
+
+
+ Prerequesits
+
+ - Module was developed for use with Beaglebone Black.
+ - To use this module, you have to create an udev-Rule for accessing /dev/watchdog
+ SUBSYSTEM=="misc" ACTION=="add" DRIVER=="" KERNEL=="watchdog" MODE=="666"
+
+
+
+ Define
+
+ define <name> BBB_WATCHDOG
+ This module provides a heartbeat signal to BBB internal watchdog device
+ If this signal fails for more than 60 seconds, the BBB will perform a reboot.
+
+
+
+ Set-Commands
+ No set commands implemented.
+
+
+ Get-Commands
+ No get commands implemented.
+
+
+ Attributes
+
+
+ Author's notes
+
+
+
+
+=end html
+=begin html_DE
+
+
+BBB_BMP180
+
+Sorry, keine deutsche Dokumentation vorhanden.
+Die englische Doku gibt es hier: BBB_BMP180
+
+=end html_DE
+=cut
diff --git a/fhem/FHEM/98_PID.pm b/fhem/FHEM/98_PID.pm
index a2cfec7fc..334dea79e 100644
--- a/fhem/FHEM/98_PID.pm
+++ b/fhem/FHEM/98_PID.pm
@@ -45,7 +45,7 @@ PID_Define($$$)
$pid->{sensor} = $sensor;
if(!$regexp) {
my $t = $defs{$sensor}{TYPE};
- if($t eq "HMS" || $t eq "CUL_WS") {
+ if($t eq "HMS" || $t eq "CUL_WS" || $t eq "CUL_HM" ) {
$reading = "temperature";
$regexp = '([\\d\\.]*)';
} else {
diff --git a/fhem/MAINTAINER.txt b/fhem/MAINTAINER.txt
index 3ffdf0398..71974a8fc 100644
--- a/fhem/MAINTAINER.txt
+++ b/fhem/MAINTAINER.txt
@@ -112,8 +112,9 @@ FHEM/46_TRX_SECURITY.pm wherzig http://forum.fhem.de RFXTRX
FHEM/46_TRX_WEATHER.pm wherzig http://forum.fhem.de RFXTRX
FHEM/49_IPCAM.pm mfr69bs http://forum.fhem.de Sonstiges
FHEM/50_WS300.pm Dirk http://forum.fhem.de SlowRF
-FHEM/51_BBB_BMP180.pm betateilchen http://forum.fhem.de Raspberry Pi
-FHEM/51_I2C_BMP180.pm Dirk http://forum.fhem.de Raspberry Pi
+FHEM/51_BBB_BMP180.pm betateilchen http://forum.fhem.de Einplatinencomputer
+FHEM/51_BBB_WATCHDOG.pm betateilchen http://forum.fhem.de Einplatinencomputer
+FHEM/51_I2C_BMP180.pm Dirk http://forum.fhem.de Einplatinencomputer
FHEM/51_RPI_GPIO.pm klausw http://forum.fhem.de Einplatinencomputer
FHEM/55_GDS.pm betateilchen http://forum.fhem.de Unterstuetzende Dienste
FHEM/55_PIFACE.pm klaus.schauer http://forum.fhem.de Einplatinencomputer