zii/JustMotion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v3.0.t9

Browse Source 
-removed the delay after motion was detected. it was not having
 the desired effect and after more thought event overlap would
 be impossible anyway.

-the test cameras are still picking up motion during the post
 command. adjusted the after command delay to see if that
 helps.

-reduced the DetectLoop heartbeat from 3 to 2 to better match
 the record loop's cadence.
This commit is contained in:
Zii 2023-05-29 20:06:19 -04:00
parent de24a94bd4
commit 732a604c24
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/camera.cpp
View File

@ -363,10 +363,10 @@ bool EventLoop::wrOutVod(const QString &name, const QStringList &vids)
DetectLoop::DetectLoop(shared_t *sharedRes, QThread *thr, QObject *parent) : Loop(sharedRes, thr, parent) DetectLoop::DetectLoop(shared_t *sharedRes, QThread *thr, QObject *parent) : Loop(sharedRes, thr, parent)
{ {
pcTimer = 0; pcTimer = 0;
heartBeat = 3; heartBeat = 2;
delayCycles = 4; // this will be used to delay the delayCycles = 4; // this will be used to delay the
// actual start of DetectLoop by // actual start of DetectLoop by
// 12secs. // 8secs.
} }
void DetectLoop::init() void DetectLoop::init()
@ -398,8 +398,8 @@ void DetectLoop::pcBreak()
} }
else else
{ {
if (delayCycles == 0) delayCycles = 1; if (delayCycles == 0) delayCycles = 5;
else delayCycles += 1; else delayCycles += 5;
detLog("no motion detected, running post command: " + shared->postCmd, shared); detLog("no motion detected, running post command: " + shared->postCmd, shared);
system(shared->postCmd.toUtf8().data()); system(shared->postCmd.toUtf8().data());
@ -420,7 +420,7 @@ bool DetectLoop::exec()
else else
{ {
auto curDT = QDateTime::currentDateTime(); auto curDT = QDateTime::currentDateTime();
auto images = backwardFacingFiles("img", ".bmp", curDT, 5); auto images = backwardFacingFiles("img", ".bmp", curDT, 6);
if (images.size() < 2) if (images.size() < 2)
{ {
@ -458,8 +458,6 @@ bool DetectLoop::exec()
event.timeStamp = curDT; event.timeStamp = curDT;
event.imgPath = images[pos]; event.imgPath = images[pos];
delayCycles = shared->evMaxSecs / heartBeat;
shared->recList.append(event); mod = true; shared->recList.append(event); mod = true;
} }
} }

3
src/common.h
View File

@ -28,7 +28,7 @@
using namespace std; using namespace std;
#define APP_VER "3.0.t8" #define APP_VER "3.0.t9"
#define APP_NAME "Motion Watch" #define APP_NAME "Motion Watch"
#define APP_BIN "mow" #define APP_BIN "mow"
#define REC_LOG_NAME "rec_log_lines.html" #define REC_LOG_NAME "rec_log_lines.html"
@ -50,7 +50,6 @@ struct shared_t
QString conf; QString conf;
QString recLog; QString recLog;
QString detLog; QString detLog;
QString upkLog;
QString recordUrl; QString recordUrl;
QString outDir; QString outDir;
QString postCmd; QString postCmd;