diff --git a/fhem/CHANGED b/fhem/CHANGED index cbf3ca1ce..ac550612c 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - change: 49_IPCAM: introduced attribute httpTimeout - change: 49_IPCAM: introduced incrementalTimeout - feature: 93_DbLog: new attributes SQLiteCacheSize, SQLiteJournalMode - bugfix: 98_Text2Speech.pm: some Improvements by Mirko diff --git a/fhem/FHEM/49_IPCAM.pm b/fhem/FHEM/49_IPCAM.pm index 0b1103e68..93da80299 100644 --- a/fhem/FHEM/49_IPCAM.pm +++ b/fhem/FHEM/49_IPCAM.pm @@ -38,7 +38,7 @@ IPCAM_Initialize($$) $hash->{GetFn} = "IPCAM::Get"; $hash->{SetFn} = "IPCAM::Set"; # $hash->{FW_detailFn} = "IPCAM::DetailFn"; - $hash->{AttrList} = "basicauth delay credentials path pathCmd pathPanTilt query snapshots storage timestamp:0,1 ". + $hash->{AttrList} = "basicauth delay credentials path pathCmd pathPanTilt query snapshots storage httpTimeout timestamp:0,1 ". "cmdPanLeft cmdPanRight cmdTiltUp cmdTiltDown cmdStep ". "cmdPos01 cmdPos02 cmdPos03 cmdPos04 cmdPos05 cmdPos06 cmdPos07 cmdPos08 ". "cmdPos09 cmdPos10 cmdPos11 cmdPos12 cmdPos13 cmdPos14 cmdPos15 cmdPosHome ". @@ -283,6 +283,8 @@ sub SendCommand { url => $camUrl, method => "GET", callback => \&IPCAM::SendCommand_Callback, + incrementalTimeout => 1, + timeout => AttrVal($name, 'httpTimeout', 4), hash => $hash }; @@ -488,6 +490,7 @@ sub RequestSnapshotWithCallback { callback => \&IPCAM::RequestSnapshot_Callback, hash => $hash, incrementalTimeout => 1, + timeout => AttrVal($name, 'httpTimeout', 4), callbackCommand => $callbackCommand }; HttpUtils_NonblockingGet($apiParam);