* Change descriptions of MQTT topics to match Web UI (#1637)
* Allow MQTT to start/stop the "timelapse" service (#1637)
* Add manual switch for Night Mode to the sidebar (#1637)
* Add friendly names to the current list of services (#1637)
This adds a list of more user-friendly names to the services page. If a
new service is added in the future this list should be updated, or the
display name will default to the filename just as it did before.
I was trying to access the videos/photos from the motion option but it wasn't opening, so i found that the link was wrong. I corrected on mine, sending the PR :)
* New binaries:
- lighttpd
- openssl
- busybox
- v4l2rtspserver-master
latest live libs included
bug correction for motion detection at startup
MJPG is back (there is still an issue with the OSD: it is
flickering)
* Manage FPS for MJPG
* Dropbear new version (#1348)
* Dropbear new bin
* New version of Dropbear (v2019.78)
* New version of dropbear
- Use v2019.78 from https://secure.ucc.asn.au/hg/dropbear
- Change default path to "/usr/bin:/bin:/system/bin:/system/sdcard/bin/"
* Merge dropbearmulti
* New version of server:
According to PR: https://github.com/Dafang-Hacks/Main/pull/54
- Reduce video buffers per channel to two
- And enable poolsize fix by default
* Add mod_alias to lighttpd
* New binaries:
- lighttpd
- openssl
- busybox
- v4l2rtspserver-master
latest live libs included
bug correction for motion detection at startup
MJPG is back (there is still an issue with the OSD: it is
flickering)
* Manage FPS for MJPG
* Dropbear new version (#1348)
* Dropbear new bin
* New version of Dropbear (v2019.78)
* New version of dropbear
- Use v2019.78 from https://secure.ucc.asn.au/hg/dropbear
- Change default path to "/usr/bin:/bin:/system/bin:/system/sdcard/bin/"
* New version of server:
According to PR: https://github.com/Dafang-Hacks/Main/pull/54
- Reduce video buffers per channel to two
- And enable poolsize fix by default
* Add mod_alias to lighttpd
* Add directory listing of DCIM directory via lighttpd mod_alias, needs lighttpd.conf reset.
* Motion detection was not working if reduce pool was activated
* Update openRTSP according to last version of Live555 libs (#1383)
* Add night mode on/off options for the Telegram bot (#1386)
Co-authored-by: Jelle Posthuma <jelle@beyonit.nl>
* Bump bulma 0.8.2
* Merge stuff into beta that should have went there all along (#1393)
* PTZpresets.sh should not use inverted logic for motor control. (#1366)
* Allow example userscripts, with calibratePTZ example script. (#1371)
* PTZpresets.sh should not use inverted logic for motor control.
* Allow example userscripts, calibrate at boot example.
This commit changes run.sh to only execute files in /system/sdcard/config/userscripts/startup/
if they do not end with .dist. This allows example scripts to be included in the repository.
This commit also includes an example script calibratPTZ.sh.dist that will perform a PTZ calibration at boot
and if a /system/sdcard/config/cameraposition file exists it will also move the camera to the position it defines.
To enable the calibratePTZ.sh.dist demo, or any other script, copy or rename it to NOT end in .dist.
Example:
cp /system/sdcard/config/userscripts/startup/calibratePTZ.sh.dist /system/sdcard/config/userscripts/startup/calibratePTZ.sh
* enable zram by default as per the original firmware (#1323)
* enable zram by default as per the original firmware
this prevents crashes due to memory exhaustion on xiaofeng and other
64mb models
* Keep old swap variable names for backwards compatability
* Use zram swap with higher priority than sd-card swapfile
* Add configuration option for zram size
Co-authored-by: jmtatsch <jmtatsch@users.noreply.github.com>
* Update README.md
mention pull request should be against beta branch
* Add documentation about ram (#1375)
* Autoupgrade (#1374)
* New menu organisation
* Improve upgrade process by creation a VERSION file
* Add commit info in status overview
* Improve update process with VERSION file
* Typo fixies
* Fix typo in status_overview.cgi (#1388)
Latest commit leads to blank content on Overview page under the Information tab. Based on below, I think it is a typo.
/var/log/lighttpd-cgi-stderr.log
/system/sdcard/www/cgi-bin/status_overview.cgi: line 59: syntax error: unexpected "else" (expecting ")")
* remove no original f/w note from Neos SmartCam (#1389)
2 versions are available
* Minor changes / correcting labeling (#1391)
* Minor changes / correcting labeling
run.sh: blue_led also off by default
common_functions.sh: fix typo
api.cgi, system_led.cgi, index.html: Correct display of cut_ir to IR Filter
sw_night.css: make some text easier to read
index.html.js: remove blank line
Co-authored-by: Steven McCombie <smccombie@fugnet.servegame.com>
* PTZ Presets - go home (#1387)
* Complete rewrite of PTZpresets.sh
Rewrite PTZpresets.sh to have better PID handling and full posix compatibility.
* left and right ptz presets where flipped
* Fix creation of PID file
Overly aggressive search and replace error, switch out logger to echo so PID is written to fille.
* Use full path to jq
Use full path to jq so that it still works when called from action.cgi and api.cgi
* Create Xiaomi.pm
Updated Xiaomi.pm that includes basic PTZ presets support.
* Update zoneminder.md
Co-authored-by: Solomon S <slm4996@users.noreply.github.com>
Co-authored-by: Yannik Sembritzki <yannik@sembritzki.me>
Co-authored-by: Yannik Sembritzki <yannik.sembritzki@gmail.com>
Co-authored-by: Gysmo <frederic@leroux.im>
Co-authored-by: fhl206 <fhl206@gmail.com>
Co-authored-by: Combie81 <classified_one@hotmail.com>
Co-authored-by: Steven McCombie <smccombie@fugnet.servegame.com>
* Hide dpad if camera have no PTZ
* Add topic update to start update from mqtt (#1399)
Co-authored-by: gysmo38 <frederic@leroux.im>
* Viewer (#1401)
* Add html page to show files in Recording directory
* more generic code and add timelapse files
* Rebased on latest version on https://github.com/mpromonet/v4l2rtspserver
- No more memory leak (hopefully)
- latest version of live555
* Add test for update process (#1405)
* Add test for update process
* Update action.cgi
* Bug fix for Fimware commit on status overview page (#1406)
Co-authored-by: root <nicolas.ebele@gmail.com>
Co-authored-by: nik0 <1867654+nik0@users.noreply.github.com>
Co-authored-by: J Posthuma <jposthuma25@gmail.com>
Co-authored-by: Jelle Posthuma <jelle@beyonit.nl>
Co-authored-by: gysmo38 <frederic@leroux.im>
Co-authored-by: Solomon S <slm4996@users.noreply.github.com>
Co-authored-by: Yannik Sembritzki <yannik@sembritzki.me>
Co-authored-by: Yannik Sembritzki <yannik.sembritzki@gmail.com>
Co-authored-by: fhl206 <fhl206@gmail.com>
Co-authored-by: Combie81 <classified_one@hotmail.com>
Co-authored-by: Steven McCombie <smccombie@fugnet.servegame.com>
* New binaries:
- lighttpd
- openssl
- busybox
- v4l2rtspserver-master
latest live libs included
bug correction for motion detection at startup
MJPG is back (there is still an issue with the OSD: it is
flickering)
* Manage FPS for MJPG
* Dropbear new version (#1348)
* Dropbear new bin
* New version of Dropbear (v2019.78)
* New version of dropbear
- Use v2019.78 from https://secure.ucc.asn.au/hg/dropbear
- Change default path to "/usr/bin:/bin:/system/bin:/system/sdcard/bin/"
* Merge dropbearmulti
* New version of server:
According to PR: https://github.com/Dafang-Hacks/Main/pull/54
- Reduce video buffers per channel to two
- And enable poolsize fix by default
* Add mod_alias to lighttpd
* New binaries:
- lighttpd
- openssl
- busybox
- v4l2rtspserver-master
latest live libs included
bug correction for motion detection at startup
MJPG is back (there is still an issue with the OSD: it is
flickering)
* Manage FPS for MJPG
* Dropbear new version (#1348)
* Dropbear new bin
* New version of Dropbear (v2019.78)
* New version of dropbear
- Use v2019.78 from https://secure.ucc.asn.au/hg/dropbear
- Change default path to "/usr/bin:/bin:/system/bin:/system/sdcard/bin/"
* New version of server:
According to PR: https://github.com/Dafang-Hacks/Main/pull/54
- Reduce video buffers per channel to two
- And enable poolsize fix by default
* Add mod_alias to lighttpd
* Add directory listing of DCIM directory via lighttpd mod_alias, needs lighttpd.conf reset.
* Motion detection was not working if reduce pool was activated
* Update openRTSP according to last version of Live555 libs (#1383)
* Add night mode on/off options for the Telegram bot (#1386)
Co-authored-by: Jelle Posthuma <jelle@beyonit.nl>
* Bump bulma 0.8.2
* Merge stuff into beta that should have went there all along (#1393)
* PTZpresets.sh should not use inverted logic for motor control. (#1366)
* Allow example userscripts, with calibratePTZ example script. (#1371)
* PTZpresets.sh should not use inverted logic for motor control.
* Allow example userscripts, calibrate at boot example.
This commit changes run.sh to only execute files in /system/sdcard/config/userscripts/startup/
if they do not end with .dist. This allows example scripts to be included in the repository.
This commit also includes an example script calibratPTZ.sh.dist that will perform a PTZ calibration at boot
and if a /system/sdcard/config/cameraposition file exists it will also move the camera to the position it defines.
To enable the calibratePTZ.sh.dist demo, or any other script, copy or rename it to NOT end in .dist.
Example:
cp /system/sdcard/config/userscripts/startup/calibratePTZ.sh.dist /system/sdcard/config/userscripts/startup/calibratePTZ.sh
* enable zram by default as per the original firmware (#1323)
* enable zram by default as per the original firmware
this prevents crashes due to memory exhaustion on xiaofeng and other
64mb models
* Keep old swap variable names for backwards compatability
* Use zram swap with higher priority than sd-card swapfile
* Add configuration option for zram size
Co-authored-by: jmtatsch <jmtatsch@users.noreply.github.com>
* Update README.md
mention pull request should be against beta branch
* Add documentation about ram (#1375)
* Autoupgrade (#1374)
* New menu organisation
* Improve upgrade process by creation a VERSION file
* Add commit info in status overview
* Improve update process with VERSION file
* Typo fixies
* Fix typo in status_overview.cgi (#1388)
Latest commit leads to blank content on Overview page under the Information tab. Based on below, I think it is a typo.
/var/log/lighttpd-cgi-stderr.log
/system/sdcard/www/cgi-bin/status_overview.cgi: line 59: syntax error: unexpected "else" (expecting ")")
* remove no original f/w note from Neos SmartCam (#1389)
2 versions are available
* Minor changes / correcting labeling (#1391)
* Minor changes / correcting labeling
run.sh: blue_led also off by default
common_functions.sh: fix typo
api.cgi, system_led.cgi, index.html: Correct display of cut_ir to IR Filter
sw_night.css: make some text easier to read
index.html.js: remove blank line
Co-authored-by: Steven McCombie <smccombie@fugnet.servegame.com>
* PTZ Presets - go home (#1387)
* Complete rewrite of PTZpresets.sh
Rewrite PTZpresets.sh to have better PID handling and full posix compatibility.
* left and right ptz presets where flipped
* Fix creation of PID file
Overly aggressive search and replace error, switch out logger to echo so PID is written to fille.
* Use full path to jq
Use full path to jq so that it still works when called from action.cgi and api.cgi
* Create Xiaomi.pm
Updated Xiaomi.pm that includes basic PTZ presets support.
* Update zoneminder.md
Co-authored-by: Solomon S <slm4996@users.noreply.github.com>
Co-authored-by: Yannik Sembritzki <yannik@sembritzki.me>
Co-authored-by: Yannik Sembritzki <yannik.sembritzki@gmail.com>
Co-authored-by: Gysmo <frederic@leroux.im>
Co-authored-by: fhl206 <fhl206@gmail.com>
Co-authored-by: Combie81 <classified_one@hotmail.com>
Co-authored-by: Steven McCombie <smccombie@fugnet.servegame.com>
* Hide dpad if camera have no PTZ
* Add topic update to start update from mqtt (#1399)
Co-authored-by: gysmo38 <frederic@leroux.im>
* Viewer (#1401)
* Add html page to show files in Recording directory
* more generic code and add timelapse files
* Rebased on latest version on https://github.com/mpromonet/v4l2rtspserver
- No more memory leak (hopefully)
- latest version of live555
* Add test for update process (#1405)
* Add test for update process
* Update action.cgi
* Bug fix for Fimware commit on status overview page (#1406)
Co-authored-by: root <nicolas.ebele@gmail.com>
Co-authored-by: nik0 <1867654+nik0@users.noreply.github.com>
Co-authored-by: J Posthuma <jposthuma25@gmail.com>
Co-authored-by: Jelle Posthuma <jelle@beyonit.nl>
Co-authored-by: gysmo38 <frederic@leroux.im>
Co-authored-by: Solomon S <slm4996@users.noreply.github.com>
Co-authored-by: Yannik Sembritzki <yannik@sembritzki.me>
Co-authored-by: Yannik Sembritzki <yannik.sembritzki@gmail.com>
Co-authored-by: fhl206 <fhl206@gmail.com>
Co-authored-by: Combie81 <classified_one@hotmail.com>
Co-authored-by: Steven McCombie <smccombie@fugnet.servegame.com>
* Minor changes / correcting labeling
run.sh: blue_led also off by default
common_functions.sh: fix typo
api.cgi, system_led.cgi, index.html: Correct display of cut_ir to IR Filter
sw_night.css: make some text easier to read
index.html.js: remove blank line
Co-authored-by: Steven McCombie <smccombie@fugnet.servegame.com>
* add smoothie.js to local
updated to v1.36 from v1.34
* fix script links to local
change smoothie.js and bulma.0.6.2.min.css links to local so it can works without internet connection
* Fix typo css and change bulma to 0.7.2
- fix type from css/bulma.min.css (should be css/bulmaswatch.min.css)
- update bulma reference to 0.7.2 (from 0.6.2)
* add required css for theme file
bulmaswatch.min.css is required (based on 0.7.2 - slate theme)
* update bulma.min.css to 0.7.2
* add bulma css 0.7.2
update the css files version from 0.6.2
* delete old files
replaced by version 0.7.2
* add smoothie.js to local
updated to v1.36 from v1.34
* fix script links to local
change smoothie.js and bulma.0.6.2.min.css links to local so it can works without internet connection
Currently, publish_mqtt_message is used to decide whether we send a
notification about motion. save_snapshot is used to save the image
locally. And if both are set, the image is also sent to mqtt
This PR decouples the mqtt image send from the snapshot saving. There
are now three parameters:
publish_mqtt_message -- send notification that there was motion
publish_mqtt_snapshot -- send notification containing the motion.
save_snapshot -- saves to disk, doesn't necessarily notify
No MQTT topics are changed; this is purely configuration bookkeeping.
* Integrating sw_night_configure.html to main index.html
Adding GUI option to select SW/HW mode for autonight in setting page
Adding capability to read current configuation and save the new configuation back to the sdcard in sw_night_configure
* Removing autonight.conf.sw Instead we now only add or remove -S to autonight.conf
* Audio and framerate settings
- Enable audio AES filter
- Now can choose more audio in/out bitrate
Please note the constraints:
* Filtering AES, NS is available with in bitrate under or egal 16000
* When select OPUS out birate is 48000
* When select PCM or PCMU in bitrate shall be egal to out bitrate
- Can now control video FPS
* I noticed that some configuration freeze the video (for example 1/1)
* Delete webrtc_profile.ini
* Update status.cgi
* Update rtspserver.conf.dist
* Update update.html
* New autoupdate page
- Autoupdate with progress bar (approximative as based on files already on card)
- associated log tab
- version in settings
* New autoupdate page
- Autoupdate with progress bar (approximative as based on files already on card)
- associated log tab
- version in settings
Change summary:
- Incorporate the Bulma CSS framework
- Changed many of the functions in action.cgi scripts.cgi status.cgi getMotionInfo.cgi to return json so that we can have more elegant ajax-y UI flows
- Changed the "live" view to only refresh statuses on demand (when Camera Controls menu is hovered/clicked) instead of a constant interval refresh. I did not like the constant refresh in the current implementation because it was sometimes locking up the UI in the background.
- Changed the "live" view image to reload only after previous image is loaded instead of a constant refresh interval (uses image "onload" to trigger)
- Fixed up some bugs in configMotion.html and also made the UI work responsively
- Added a "shutdown" command (calls /sbin/halt) so that I can gracefully shutdown the camera instead of pulling the plug
- Add option to choose a dark UI theme
* PEP8 for python scripts
* Format HTML
* Cleanup scripts using shellcheck. Whitespace. Removed unused variables and a "dead cat"
* Cleanup script using shellcheck. Whitespace. Refactored a fragile for loop and removed a "dead cat"
* Cleanup scripts using shellcheck. Whitespace. Refactored a chain of grep commands in mqtt-control.sh.
* Cleanup scripts using shellcheck. Whitespace. Removed unused commented code and dead cats.
* Format changes for consistency
