ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,700 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

19700 Commits

Author SHA1 Message Date
Isaac Connor 2912256790 Add toggle_password_visibility option for MQTT password 2021-12-29 18:25:44 -05:00
Isaac Connor b37c894ffc Add toggle_password_visibility which is used in options for MQTT password 2021-12-29 18:25:21 -05:00
Isaac Connor 43b62db186 Style m onitor edit a bit 2021-12-29 18:24:55 -05:00
Isaac Connor 5369b8e952 Add MQTT to Monitor edit. 2021-12-29 18:24:41 -05:00
Isaac Connor fa8d5ec9e3 In working state. Auth now works 2021-12-29 18:24:20 -05:00
Isaac Connor 498cb85f64 Add MQTT_Enabled. parse subscriptions, sucribe to them. Add mqtt messages for starting/ending events 2021-12-29 18:24:02 -05:00
Isaac Connor 0f8684a9b9 Must preface config entries with ZM_ because we strip it out later 2021-12-29 18:23:26 -05:00
Isaac Connor 034ca92937 Make zm_mqtt compile 2021-12-29 13:20:07 -05:00
Isaac Connor 1f0f980e38 add update file for MQTT columns 2021-12-29 13:19:50 -05:00
Isaac Connor 2efabe5c10 Put back MQTT_Enabled in Monitors 2021-12-29 13:19:20 -05:00
Isaac Connor 2d8aa0801f Add MQTT tab. Rework code that spits out options lines to be easier to read. 2021-12-29 13:15:20 -05:00
Isaac Connor fb8db3b046 Load mqtt subscriptions from db when loading monitor 2021-12-29 13:14:08 -05:00
Isaac Connor 763209ce15 Fix password config type to be password in db 2021-12-29 13:12:27 -05:00
Isaac Connor e10aa3e60e Add password as a config entry type 2021-12-29 10:04:43 -05:00
Isaac Connor c3d2d5cdf6 Add MQTT_Subscriptions to Monitors 2021-12-29 10:04:27 -05:00
Isaac Connor 76b8dd9ab2 Add MQTT_Enabled and MQTT_Subscriptions to Monitor object 2021-12-26 15:20:43 -05:00
Isaac Connor d38efc3c5f Add MQTT settings to config 2021-12-23 11:07:26 -05:00
Isaac Connor 0f581e97bd Add an mqtt object to the Monitor object 2021-12-22 16:18:42 -05:00
Isaac Connor 355a6e70c7 Add zm_mqtt.cpp etc 2021-12-22 16:18:03 -05:00
Isaac Connor 675647006a Add find routines for Mosquitto and Mosquittopp. Shamelessl ripped from https://github.com/devicehubnet/devicehub_cpp 2021-12-22 16:17:10 -05:00
Isaac Connor 3fd5e855d1 Add Mosquitto and Mosquittopp library detection 2021-12-22 16:15:48 -05:00
Isaac Connor 81048b6191 Reduce code 2021-12-17 13:29:30 -05:00
Isaac Connor 77793da70e If no max_fps set we don't care how long it takes to send frame 2021-12-17 13:29:30 -05:00
Isaac Connor edbe726e86 Implement semaphore retry. Make not getting the semaphore an error 2021-12-17 09:41:45 -05:00
Isaac Connor 1bc0e1820e fix build on older c++ 2021-12-16 17:02:20 -05:00
Isaac Connor c081637036 Fixes to specifying width and height of image due to us jquery. Implement changeRate/MaxFPS. Cleanup use of auth_hash in JSON. 2021-12-16 16:38:15 -05:00
Isaac Connor 4dd454325c use options[maxfps] instead of always specifying 30fps. 2021-12-16 16:36:38 -05:00
Isaac Connor 30e4d72c1d Implement CMD_MAXFPS 2021-12-16 16:36:12 -05:00
Isaac Connor 7101a70774 Switch to steady_clock 2021-12-16 16:35:42 -05:00
Isaac Connor 60d2186ff4 Move from SystemTimePoint to SteadyTimePoint where possible. Implement MAXFPS command. Change the logic of calculating sleep time to make more sense. Get rid of frame_mod use in favour of calculating when then next frame should get sent and just waiting till then. 2021-12-16 16:35:20 -05:00
Isaac Connor 7b7ac8fc7e Add utility functions TimePointToString and SystemTimePointToString 2021-12-16 16:30:26 -05:00
Isaac Connor 7c3ab46408 fix missing quote 2021-12-16 09:35:21 -05:00
Isaac Connor d10d5201ac log max fps 2021-12-15 16:57:27 -05:00
Isaac Connor 4edd5c1bf5 Don't alter maxfps. Just report that we are too slow. Don't use ZM_RATE_BASE in sleep time calculations it amplifies the sleep seconds by 100 times. Removing allows us to view a full framerate. 2021-12-15 16:57:17 -05:00
Isaac Connor 8215b04fb0 remove padding from container in watch view so that image can go right to edge. Add 1px padding to sidebar for better visual separation. 2021-12-15 14:49:40 -05:00
Isaac Connor f1db88510e remove debug, fix eslint 2021-12-15 09:23:21 -05:00
Isaac Connor 854d11ce9d List the connkey that isn't open, differentiate logs a bit to help debug. 2021-12-15 09:11:55 -05:00
Isaac Connor d86456b6f2 revamp, using ZoneMinder::Monitor methods to reduce code. Reduce last analysze time was zero to a debug. Fixes #3389 2021-12-15 09:11:55 -05:00
Isaac Connor 12ebdacf54 specify ZoneMinder::Database for zmSQLExecute 2021-12-15 09:11:55 -05:00
Isaac Connor fe0e4627ef Specify ZoneMinder::General for runCommand 2021-12-15 09:11:55 -05:00
Isaac Connor 28d5614da0 Fix missing ; 2021-12-15 09:11:55 -05:00
Isaac Connor f683557b0e Fix Monitor::Control to handle local cameras 2021-12-15 09:11:55 -05:00
Isaac Connor e8edeab641 parseInt prevEventId and nextEventID to be sure that our tests for != 0 work. Also don't go to previous event if prevEventId ==0.Maybe Fixes #3390 2021-12-15 09:11:55 -05:00
Isaac Connor 61fe35a32a Don't log errors when querying a monitor in NONE Function. Just report a 0 status.Fixes #3397 2021-12-15 09:11:55 -05:00
Isaac Connor f6d0274f74 Fix PrevCycle because monIdx was empty. 2021-12-14 17:05:56 -05:00
Isaac Connor 4fa804e9a2 Can only SKIP LOCKED if locking rows. Remove FOR SHARE as it isn't supported on < mysql 8 2021-12-14 13:33:00 -05:00
Isaac Connor cca7953856 include user and function error message about insufficient permissions. Will make it easier to figure out who tried what. 2021-12-14 12:26:26 -05:00
Isaac Connor fe72fd83f8 Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress. 2021-12-14 10:04:35 -05:00
Isaac Connor cfcc39defb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-12-14 09:29:03 -05:00
Isaac Connor 2f287a5050
Merge pull request #3400 from makers-mark/master 
Fix boilerplate (un)typo
 2021-12-13 22:29:52 -05:00