Commit Graph

133 Commits (9254dbe535272c0ac3fb2f89f084e2be4e8d7afa)

Author SHA1 Message Date
Gina Häußge 204128e1ca Fixed #296
(cherry picked from commit fdfa433)
2013-11-10 18:57:44 +01:00
Gina Häußge 48f5a44bc5 SwallowOkAfterResend isn't repetier only anymore 2013-10-20 14:36:40 +02:00
Gina Häußge 717ec0419f Changed SD filename generation, made SD handling more reliable as a whole 2013-09-23 17:59:22 +02:00
Gina Häußge 8ad20a0168 Allow definition of temperature offsets for extruder and bed
Session based temperature offsets that are only applied to temperature definitions in GCODE files being printed, in order to quickly experiment with temperature settings.

Closes #97
2013-09-08 17:49:01 +02:00
Gina Häußge b2587579ba Only enable temperature "Set" buttons if a value is entered 2013-09-08 16:11:07 +02:00
Gina Häußge 0471f1155e Timelapse configuration may now be saved
Persisted configuration will automatically be loaded upon startup. May be overridden by custom settings. Current timelapse configuration is visible in State box.

Closes #116
2013-09-08 15:41:26 +02:00
Gina Häußge 715dea7eb3 Merge branch 'repetier' into devel 2013-09-02 17:35:52 +02:00
Gina Häußge 55cb991c44 Allow disabling of the temperature graph and gcode visualizer without any side effects
Also introduced feature parameter for the temperature graph

See #215
2013-08-29 21:16:35 +02:00
Gina Häußge 7155661259 Allow switching off the heaters via the profiles again
Closes #240
(cherry picked from commit f6173e7)
2013-08-29 20:26:02 +02:00
Gina Häußge f6173e7dc8 Allow switching off the heaters via the profiles again
Closes #240
2013-08-29 20:25:32 +02:00
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 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 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 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 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 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
Gina Häußge 31d86cd0a2 Added left space on filesystem holding the uploads folder to the gcode files list
Closes #186
2013-07-20 16:01:17 +02:00
Gina Häußge 22ea55746c Overall better gcode file handling
See #182 and https://groups.google.com/forum/#!topic/octoprint/YnOzyToxfkI
2013-07-13 16:30:41 +02:00
Gina Häußge c6a749c684 Properly disable connection configuration when connected 2013-07-13 10:44:09 +02:00
Gina Häußge d6553a29c6 First throw at clustering of settings 2013-07-09 21:41:26 +02:00
Gina Häußge 8dcbb620bb Highlight currently selected file, disable deletion and load/loadAndPrint for it
Fixed #182
2013-07-07 23:27:22 +02:00
Gina Häußge 6d3e3221b8 Added timeout settings for serial communiction, initial connection and baudrate detection
Closes #126
2013-07-04 21:26:53 +02:00
Gina Häußge 44f1f01001 Allow enabling of serial logging at runtime 2013-06-30 22:18:29 +02:00
Gina Häußge 119ee338f1 Client side filtering of M105 request/response and M27 request/response
Since it's client side, if you leave these on when not printing, the log will go completely blank over time due to filling up with M105s. Re-enabling M105s will immediately restore the whole log (although it won't hold much information value).
2013-06-30 21:10:09 +02:00
Gina Häußge 0ed8f0f28d Fixed typo, better error handling. 2013-06-29 20:39:49 +02:00
Gina Häußge 8231e70b44 Added tab in settings for serial connection options 2013-06-29 20:20:27 +02:00
Gina Häußge b0518a71a3 Also provide access to the auto-connect setting in the connection and the settings dialog 2013-06-29 19:57:46 +02:00
Gina Häußge 1caba2d634 Added git information to website 2013-06-29 13:41:39 +02:00
Gina Häußge 09ae8fcdc2 Always send M110 with the new line number (default 0)
Previously it worked since the first command of every print was forced to be an M110 and the line number at the beginning of each print was always forced back to 0 as well. Now it just uses the actual line number (increased on each sent of a checksumed/numbered line) and resets that when an M110 is encountered. What was missing was forcing the line number of the actual M110 command to the desired line number as well. Should be "more correct" than before now, and work.
2013-06-25 20:05:31 +02:00
Gina Häußge bd61d45e27 Missed the settings when changing api -> allow to api -> enabled 2013-06-24 17:48:13 +02:00
Gina Häußge c6e15a7d32 Merge branch 'richardjm-devel' into devel
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/templates/index.jinja2
2013-06-23 16:09:31 +02:00
Gina Häußge 31045b4c25 Merge branch 'peteruithoven-master' into devel
Conflicts:
	octoprint/timelapse.py
2013-06-23 14:58:58 +02:00
Bryan Mayland 329656837a Renamed flipX, flipY to flipH, flipV, made update upon change instant, also made timelapse video reflect flipped webcam 2013-06-23 14:57:48 +02:00
Bryan Mayland 6600eea1a2 Feedback commands now work 2013-06-21 23:19:15 +02:00
peteruithoven ecfdb37f93 Adding classes according to flipX, flipY settings and flipping using css 2013-06-19 02:39:49 +02:00
peteruithoven e8913e3141 Adding settings for webcam flipX and flipY 2013-06-19 00:42:43 +02:00
Gina Häußge e96765bc39 Merge branch 'master' into devel
Conflicts:
	octoprint/static/css/octoprint.less
2013-06-17 22:12:45 +02:00
Gina Häußge bcf8d54ff3 Merge remote-tracking branch 'origin/master' 2013-06-17 22:10:48 +02:00
Gina Häußge 6876438783 Fix for #153 backported from events branch 2013-06-17 22:10:14 +02:00
Gina Häußge 33731464e5 Merge pull request #145 from daprice/master
Improve nav bar appearance when custom colors are used
2013-06-17 04:56:10 -07:00
algspd d9fb3bb8f6 Added jquery.min.js locally to avoid depending on
internet connection on clients which may be
locally and offline
2013-06-17 00:11:17 +02:00
Gina Häußge 4994d488cf Use span instead of button for upload buttons, otherwise FF and IE hiccup...
(cherry picked from commit ee3bc84)
2013-06-16 11:39:20 +02:00
Gina Häußge ee3bc84242 Use span instead of button for upload buttons, otherwise FF and IE hiccup... 2013-06-16 11:38:52 +02:00
Gina Häußge 8be1329a71 Merge branch 'devel' into gcodestreaming
Conflicts:
	octoprint/printer.py
	octoprint/static/js/ui.js
	octoprint/templates/index.jinja2
	octoprint/util/comm.py
2013-06-09 18:28:40 +02:00
Gina Häußge 9963c523c0 Do not display -1mm when printing from sd 2013-06-09 18:13:12 +02:00
Gina Häußge 003109d59e Made gcode viewer capable of handling progress information
GCode viewer now updates its visualization (during printing) based on the current progress percentage, not based on the current line (which will not be available any more as part of the progress tuple with gcode streaming)
2013-06-09 14:00:15 +02:00