ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev' 

Logic fix for object detection and motion. Allows for motion first to work with yes and no.

See merge request Shinobi-Systems/Shinobi!336
cron-addstorage-fix
Moe 2021-10-28 19:42:36 +00:00
parent 80132ec495 1578300225
commit 2c4bbeb5b7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/monitor.js
View File

@ -950,11 +950,15 @@ module.exports = function(s,config,lang){
console.log(err)
}
})
if(e.details.detector_use_detect_object === '1'){
if(e.details.detector_use_detect_object === '1' && e.details.detector_use_motion === '1' ){
s.group[e.ke].activeMonitors[e.id].spawn.stdio[4].on('data',function(data){
onDetectorJpegOutputSecondary(e,data)
})
}
}else{
s.group[e.ke].activeMonitors[e.id].spawn.stdio[4].on('data',function(data){
onDetectorJpegOutputAlone(e,data)
})
}
}else if(e.details.detector_use_detect_object === '1' && e.details.detector_send_frames !== '1'){
s.group[e.ke].activeMonitors[e.id].spawn.stdio[4].on('data',function(data){
onDetectorJpegOutputSecondary(e,data)