Gina Häußge
fcbd5ba042
Merge branch 'devel' into repetier
...
Conflicts:
octoprint/settings.py
2013-08-27 22:14:09 +02:00
Gina Häußge
4ab3e5424e
Properly initialize timelapse when started during a paused print, better error resilience in event handler
2013-08-27 22:13:39 +02:00
Gina Häußge
54679e663e
Disable drop area if not a logged in user
...
Closes #212
2013-08-27 21:40:20 +02:00
Gina Häußge
46500cea7c
Implemented configurable terminal filters
2013-08-27 21:31:12 +02:00
Gina Häußge
757294d2e2
Merge branch 'devel' into customTerminalFilters
2013-08-26 17:46:36 +02:00
Gina Häußge
dd19b69441
Replaced socket.io with SockJS
2013-08-26 17:37:13 +02:00
Gina Häußge
d12da2548f
New option "swallowOkAfterResend" for Repetier, changed initial linenumber for serial comm to 1
2013-08-26 14:44:31 +02:00
Gina Häußge
d16b96056b
Properly handle failed uploads: display message, reset upload status
...
(cherry picked from commit ce7ccc1
2013-08-25 15:10:32 +02:00
Gina Häußge
ce7ccc136b
Properly handle failed uploads: display message, reset upload status
2013-08-25 15:03:27 +02:00
Gina Häußge
30c837fa13
Added .gco to supported extensions
...
(cherry picked from commit d51aa65
2013-08-25 14:06:40 +02:00
Gina Häußge
d51aa65cd2
Added .gco to supported extensions
2013-08-25 14:05:52 +02:00
Gina Häußge
3e0abf1b20
New custom control type "feedback"
...
Like "feedback_command", but without the button
2013-08-21 20:33:55 +02:00
Gina Häußge
6ab8b76859
Allow more than one local network to be defined
2013-08-18 22:50:52 +02:00
Gina Häußge
481a750cf6
Check if self._comm is None before trying to select a file...
...
(cherry picked from commit 5631a45
2013-08-18 18:46:01 +02:00
Gina Häußge
456eb8cb47
Only match "rs"/"resend" on the start of a line, otherwise the wrong lines might be interpreted as resend requests
...
(cherry picked from commit ae09a50
2013-08-18 18:45:50 +02:00
Gina Häußge
38c4738909
Properly enable serial logging on startup if configured
...
(cherry picked from commit 2261ddf
2013-08-18 18:45:32 +02:00
Gina Häußge
03c9c684bf
custom terminal filter WIP
2013-08-18 18:42:09 +02:00
Gina Häußge
5631a45006
Check if self._comm is None before trying to select a file...
2013-08-18 18:41:20 +02:00
Gina Häußge
ae09a50fe5
Only match "rs"/"resend" on the start of a line, otherwise the wrong lines might be interpreted as resend requests
2013-08-18 18:40:52 +02:00
Gina Häußge
2261ddf41f
Properly enable serial logging on startup if configured
2013-08-18 18:40:08 +02:00
Gina Häußge
54175d2146
First throw at autologin capabilities
2013-08-18 18:33:21 +02:00
Ross Hendrickson
2421824535
Outputing ini file parameters to the subprocess
2013-08-18 01:19:55 -05:00
Ross Hendrickson
8e500b78aa
Add logic to parser to handle multi line path. Create tests for new functionality
2013-08-17 00:26:47 -05:00
Ross Hendrickson
70b2325de0
Merge branch 'cura-integration' of https://github.com/hendricksonrw/OctoPrint into cura-integration
2013-08-15 22:49:55 -05:00
Ross Hendrickson
58cbad1828
Start config parser work
2013-08-15 22:48:26 -05:00
Gina Häußge
94b8d6601d
Allow sending temperature updates with enter
...
Also some refactoring.
Closes #208 .
2013-08-11 22:25:47 +02:00
Gina Häußge
84ff4b6416
Refactored ui.js into single files, cleaned up js folder
...
TODO: minimizer for merging all files belonging to the actual app into one
2013-08-11 19:15:37 +02:00
Gina Häußge
ec9c7adf70
Merge branch 'CapnBry-gcodeinterpreter-upstream' into devel
2013-08-11 17:39:53 +02:00
Gina Häußge
c7501ded47
Removed commented out and unused code
2013-08-11 17:39:45 +02:00
Gina Häußge
f622e1e181
And a robots.txt for good measure...
2013-08-11 16:57:39 +02:00
Gina Häußge
b168ef7e74
Only enable "Keep Enabled" button if data entered into form is valid. Also changed the wording a bit here and there.
2013-08-10 23:39:07 +02:00
Gina Häußge
4cf041aaad
Enforces a new first-run setup wizard for access control to be run and forbids running OctoPrint as root unless a special command option is supplied
...
The dialog also informs about the risk of unauthorized strangers (mis)using the printer if an unsecured OctoPrint installation is made available on the internet.
2013-08-10 21:59:05 +02:00
Bryan Mayland
27bc7d3d03
Increase progress callback to every 1000 lines.
...
The processor handles 2500 lines per second on a 700MHz pi so as a baseline
that's still 2.5 updates per second.
2013-08-07 11:23:40 -04:00
Bryan Mayland
821c0c9abb
Don't store layers or path points to save memory
2013-08-07 11:08:08 -04:00
Bryan Mayland
1726e85a68
Merge gcodeInterpreter optimizations from daid/Cura
2013-08-07 11:01:48 -04:00
Gina Häußge
3b3bb36377
Fixed typo (flip{X|Y} => flip{H|V})
...
Thanks to @spapadim for the heads-up
2013-08-05 17:42:56 +02:00
Ross Hendrickson
aef0322617
SD card slice and write functional. Added remove STL on delete of Gcode
2013-08-04 05:22:31 +00:00
Ross Hendrickson
d4bb75a2ee
Work on SD file refresh
2013-08-04 04:40:45 +00:00
Ross Hendrickson
43cd85b8e4
Slicing STL and sending to gcode to SD card in place
2013-08-03 04:07:38 +00:00
Ross Hendrickson
f574267746
Fix to server.py
2013-08-02 19:50:57 -06:00
Ross Hendrickson
b2d715f041
Merge fix
2013-08-02 19:26:45 -06:00
Ross Hendrickson
2831ab0727
Remove merge error related lines
2013-08-02 19:24:11 -06:00
Ross Hendrickson
1f3160571c
Remove Orig files
2013-08-02 19:21:12 -06:00
Ross Hendrickson
4c1fc14ac5
Fix Merge conflicts with Devel
2013-08-02 19:13:51 -06:00
Ross Hendrickson
6d703d236a
Minor improvement to getFileData
2013-07-21 19:07:57 -06:00
Ross Hendrickson
de635ae25f
Spacing
2013-07-21 19:03:52 -06:00
Ross Hendrickson
8dff6d6750
Cura enabled will change if an STL is sliced or not
2013-07-21 19:02:30 -06:00
Ross Hendrickson
1e1e72c9c2
Remove empty test server file. Spacing clean up
2013-07-21 18:54:16 -06:00
Ross Hendrickson
f51f4ad5cd
STL file no longer appears after slicing or reloading. First steps for slicing an moving file to SD card.
2013-07-21 18:43:57 -06:00
Bryan Mayland
e7f5384427
Refresh gcode visualization if the selected file is modified
...
This passes the file modification time to the javascript side and if
they don't match then the file is re-downloaded and parsed. The mtime
is also used in the AJAX request as it prevents the browser from serving
the new request from cache.
2013-07-21 06:48:06 -04:00
