Remove no original f/w note from Neos SmartCam #1389
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 versions are available
jmtatsch
added a commit
that referenced
this pull request
Apr 30, 2020
* 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>
jmtatsch
added a commit
that referenced
this pull request
May 8, 2020
* 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: Dafang-Hacks/Main#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: Dafang-Hacks/Main#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>
jmtatsch
added a commit
that referenced
this pull request
Jul 16, 2020
* 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: Dafang-Hacks/Main#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: Dafang-Hacks/Main#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>
jmtatsch
added a commit
that referenced
this pull request
Jul 16, 2020
* 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
2 versions are available