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

v3.0.t14

Browse Source 
-didn't properly remove use of evhist from the last commit. it is
 truely removed now.

-added delay cycles to detectLoop is motion was detected to
 prevent some event overlap.
This commit is contained in:
Zii 2023-06-09 19:59:16 -04:00
parent 4b4c2649b8
commit baf0b86610
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/camera.cpp
View File

@ -256,11 +256,6 @@ bool Upkeep::exec()
enforceMaxImages(); enforceMaxImages();
enforceMaxVids(); enforceMaxVids();
if (shared->evtHist.size() >= MAX_EVTHIST)
{
shared->evtHist.clear();
}
genHTMLul(".", shared->camName, shared); genHTMLul(".", shared->camName, shared);
genCSS(shared); genCSS(shared);
@ -298,14 +293,6 @@ bool EventLoop::exec()
vidList.removeLast(); vidList.removeLast();
vidList.append(forwardFacingFiles("live", ".ts", event.timeStamp, maxFiles / 2)); vidList.append(forwardFacingFiles("live", ".ts", event.timeStamp, maxFiles / 2));
for (auto &&hist : shared->evtHist)
{
if (vidList.contains(hist))
{
vidList.removeAll(hist);
}
}
shared->recList.removeFirst(); shared->recList.removeFirst();
} }
@ -498,6 +485,8 @@ bool DetectLoop::exec()
event.score = score; event.score = score;
event.imgPath = images[pos]; event.imgPath = images[pos];
delayCycles = (shared->evMaxSecs / 2) - 1;
shared->recList.append(event); mod = true; shared->recList.append(event); mod = true;
} }
} }

2
src/camera.h
View File

@ -117,7 +117,7 @@ class DetectLoop : public Loop
private: private:
QTimer *pcTimer; QTimer *pcTimer;
int delayCycles; uint delayCycles;
bool mod; bool mod;
void resetTimers(); void resetTimers();

4
src/common.h
View File

@ -28,7 +28,7 @@
using namespace std; using namespace std;
#define APP_VER "3.0.t13" #define APP_VER "3.0.t14"
#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"
@ -38,7 +38,6 @@ using namespace std;
#define STRFTIME_FMT "%Y%m%d%H%M%S" #define STRFTIME_FMT "%Y%m%d%H%M%S"
#define MAX_IMAGES 1000 #define MAX_IMAGES 1000
#define MAX_VIDEOS 1000 #define MAX_VIDEOS 1000
#define MAX_EVTHIST 100
struct evt_t struct evt_t
{ {
@ -50,7 +49,6 @@ struct evt_t
struct shared_t struct shared_t
{ {
QList<evt_t> recList; QList<evt_t> recList;
QStringList evtHist;
QString conf; QString conf;
QString recLog; QString recLog;
QString detLog; QString detLog;