diff options
| author | Guy Sheffer <guysoft@gmail.com> | 2018-03-20 16:42:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 16:42:03 +0300 |
| commit | ea3701df35429b7d0e1b846d287ca808e198ac98 (patch) | |
| tree | 67fec265435624ce8f023baabb8a2f9b5c7f561b | |
| parent | fa33eecc8d2ba3eaeee40d13d18f7b482724d1c7 (diff) | |
| parent | 36b10d93994e77005960921194fab07a91a981c7 (diff) | |
Merge pull request #506 from foosel/fix/support-links
Point the support links on the error pages to the forum
| -rw-r--r-- | src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-octoprint.http | 9 | ||||
| -rw-r--r-- | src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-webcam.http | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-octoprint.http b/src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-octoprint.http index 2250e58..0f50657 100644 --- a/src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-octoprint.http +++ b/src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-octoprint.http @@ -96,12 +96,9 @@ pi 1441 1 6 11:12 ? 00:00:15 /home/pi/oprint/bin/python <br> <p> If all that doesn't help to trouble shoot the issue, you can seek - support on the - <a href="https://groups.google.com/group/octoprint">OctoPrint Mailinglist</a> - or in the <a href="https://plus.google.com/communities/102771308349328485741">OctoPrint G+ Community</a>. - Please provide your OctoPi <strong>and</strong> OctoPrint versions, your <code>octoprint.log</code> - (in form of a <a href="http://pastebin.com/" target="_blank">pastebin link</a>) and explain what you - already tried and observed as detailed as possible. + support on the <a href="https://discourse.octoprint.org">OctoPrint Community Forum</a>. + Please provide your OctoPi <strong>and</strong> OctoPrint versions as well as your <code>octoprint.log</code> + and explain what you already tried and observed as detailed as possible. </p> </div> </body> diff --git a/src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-webcam.http b/src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-webcam.http index a5c4cca..699a835 100644 --- a/src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-webcam.http +++ b/src/modules/octopi/filesystem/root/etc/haproxy/errors/503-no-webcam.http @@ -84,7 +84,7 @@ Content-Type: text/html </li> <li> If you have a USB camera, it might be that it does not support MJPG (Motion JPEG) natively and needs the - <code>-y</code> parameter to work. Try <a href="https://github.com/foosel/OctoPrint/wiki/FAQ#how-can-i-change-the-webcam-resolution-on-octopi" target="_blank">editing <code>octopi.txt</code></a>, + <code>-y</code> parameter to work. Try <a href="https://discourse.octoprint.org/t/how-can-i-change-mjpg-streamer-parameters-on-octopi/203" target="_blank">editing <code>octopi.txt</code></a>, add <code>-y</code> to <code>camera_usb_options</code> and make sure to remove the leading <code>#</code>, e.g.: <pre>camera_usb_options="-r 640x480 -f 10 -y"</pre> Reboot your Raspberry Pi with the camera attached and see if that makes it work.<br> @@ -101,11 +101,8 @@ Content-Type: text/html <p> If all that doesn't help to trouble shoot the issue, you can seek - support on the - <a href="https://groups.google.com/group/octoprint">OctoPrint Mailinglist</a> - or in the <a href="https://plus.google.com/communities/102771308349328485741">OctoPrint G+ Community</a>. - Please provide your camera model, <code>lsusb</code> output and <code>/var/log/webcamd.log</code> (as a - <a href="http://pastebin.com/" target="_blank">pastebin link</a>) and explain what you + support on the <a href="https://discourse.octoprint.org">OctoPrint Community Forum</a>. + Please provide your camera model, <code>lsusb</code> output and <code>/var/log/webcamd.log</code> and explain what you already tried and observed as detailed as possible. </p> </div> |