Commit Graph

1270 Commits (5c19166125d9581b1a8cfdf18ea3f3fcfa18db73)

Author SHA1 Message Date
Moe 5c19166125 Merge branch 'dev-fix-detector-motion-counts' into 'dev'
Fix detector motion counts being inserted into monitor object too early

See merge request Shinobi-Systems/Shinobi!207
2020-06-24 21:10:34 +00:00
dennis.cartier 212cecdc9c Fix too early of insertion of detector_motion_count before all returns have been considered 2020-06-24 16:50:53 -04:00
Moe 98bc29e8eb Merge branch 'dev-region-testing' into 'dev'
Add support for Region Name testing into detection filters

See merge request Shinobi-Systems/Shinobi!203
2020-06-24 18:26:43 +00:00
dennis.cartier 923312da38 Make the Global Drop be the default beahviour 2020-06-19 14:00:25 -04:00
Moe e81736ffd5 Merge branch 'SQL_Updates' into 'dev'
Add indexes to database tables

See merge request Shinobi-Systems/Shinobi!206
2020-06-19 16:44:34 +00:00
Moe ded730197c Fix Event Counts table (missing time column) 2020-06-18 20:22:44 -07:00
Mike Hurley 07d5d360d8 Update sql.js 2020-06-18 18:42:20 +00:00
Mike Hurley 76a4ef41fd Update sql.js 2020-06-18 16:44:13 +00:00
Mike Hurley 0e69072a80 Update sql.js 2020-06-18 16:33:47 +00:00
Mike Hurley efc1374d0d Update tables.sql 2020-06-18 16:29:40 +00:00
Mike Hurley 486c724c74 Update sql.js 2020-06-18 16:17:13 +00:00
Mike Hurley afe32e6f1b fixed mismatched cases 2020-06-18 16:12:46 +00:00
Mike Hurley 80db711d4a Updated to include Indexes for Events, Logs, and Videos tables 2020-06-18 15:23:58 +00:00
Moe b50d0a6bcc Update ONVIF version and light cleanup 2020-06-18 00:51:25 -07:00
Moe f07fe1968f JPEG Input Type capture from Camera Thread (Fix JPEG Input Stream) 2020-06-18 00:51:06 -07:00
Mike Hurley 6c7ef92a38 Update tables.sql to include indexes on Events, Logs, and Videos tables 2020-06-17 16:45:16 +00:00
dennis.cartier 91f5ff6b76 Add support to only test matrices that passed filters for the Region Test flag 2020-06-17 08:23:46 -04:00
dennis.cartier c7759063f3 Fix non-filtered matrices from being written into Events table 2020-06-16 07:45:35 -04:00
Moe f044b6bcf8 Fix missing npm module 2020-06-15 15:18:22 -07:00
Moe f5ac026520 Google Drive Upload creates appropriate folder for video 2020-06-15 08:33:57 -07:00
Moe 5547ff0b25 Allow watching uploaded videos from Google Drive in Dashboard 2020-06-15 07:53:08 -07:00
Moe 2c320635dc baisc Google Drive support for Auto Backup
- Cannot view videos or timelapse frames in the Shinobi Dashboard, must view them in Google Drive File Explorer
2020-06-15 00:54:52 -07:00
Moe 44b7868d6a Fix duplicated column in sql framework 2020-06-14 10:01:59 -07:00
dennis.cartier 9c1c3bb168 Merge branch 'dev-region-testing' of gitlab.com:dennis.cartier/Shinobi into dev-region-testing 2020-06-14 06:59:58 -04:00
dennis.cartier 57c51f17c8 Remove a conditional that no longer applies 2020-06-14 06:58:20 -04:00
dennis.cartier e86d3e03df Change the result passing for the matrix region collisions and add test to short circuit hopeless calls 2020-06-14 06:58:20 -04:00
dennis.cartier 0621ef9b35 re-write of legacy object matching to remove missed corner cases 2020-06-14 06:58:20 -04:00
dennis.cartier e732db8656 Add support for Region Nmes testing 2020-06-14 06:54:49 -04:00
Moe 537a2bb108 move PTZ Tracking options to Control section 2020-06-13 22:31:23 -07:00
Moe 773351313f Allow PTZ Tracking any Object Tag 2020-06-13 22:17:54 -07:00
Moe df720fcab2 remove PTZ Tracking debug comments 2020-06-13 11:56:54 -07:00
Moe 57a876e28d minor cleanup for PTZ handling 2020-06-13 11:46:20 -07:00
Moe fc082daf8c ptz command display direction in log row 2020-06-13 11:35:09 -07:00
Moe 866cb8d538 Refactor PTZ Control code+++ 2020-06-13 11:30:04 -07:00
Moe c004275fa8 put logger inside s.cameraControl callback 2020-06-13 11:27:46 -07:00
Moe beccde6fdc Refactor PTZ Control code++ 2020-06-13 11:27:03 -07:00
Moe ab8971ad28 Refactor PTZ Control code+ 2020-06-13 11:04:38 -07:00
Moe bbc1dc533f Refactor PTZ Control code, move ptz and onvif code to separate libs 2020-06-13 00:28:50 -07:00
Moe ba32e44e2c Merge branch 'dev-confidence-testing' into 'dev'
Add confidence testing into switch statement

See merge request Shinobi-Systems/Shinobi!202
2020-06-10 20:57:25 +00:00
dennis.cartier 1d9e01b8b1 Remove a conditional that no longer applies 2020-06-10 15:13:14 -04:00
dennis.cartier c8338b1250 Change the result passing for the matrix region collisions and add test to short circuit hopeless calls 2020-06-10 14:44:27 -04:00
dennis.cartier 297d9951a0 re-write of legacy object matching to remove missed corner cases 2020-06-09 21:28:40 -04:00
dennis.cartier f8060ef1f3 Add support for Region Nmes testing 2020-06-08 06:06:50 -04:00
dennis.cartier 20e4a89e04 Add support to test confidence property in object detection 2020-06-08 05:40:51 -04:00
Moe 3781ea5f35 PTZ Tracking : Auto-Up require object height larger than 80% of img height 2020-06-07 23:44:45 -07:00
Moe 47aa4fd55b PTZ Tracking : Fix Auto-Up 2020-06-07 23:08:04 -07:00
Moe 3d3ca32bc3 PTZ Tracking : if person too low on screen then lower tilt 2020-06-07 22:52:26 -07:00
Moe 2566d52b3e PTZ Tracking : Now does both X and Y axis following on larget person object found
- if person object Y value is less than 30 then camera will automatically move upward. In future this will be configurable.
2020-06-07 22:45:55 -07:00
Moe b93abc1589 Basic PTZ Follow : detecting position on X axis works, y axis does not 😭 2020-06-07 11:48:39 -07:00
Moe 2c7fd09c94 Basic PTZ Follow now only follows largest "person" object found
- will think of better name later
2020-06-07 10:32:44 -07:00