Commit Graph

56 Commits (9254dbe535272c0ac3fb2f89f084e2be4e8d7afa)

Author SHA1 Message Date
Gina Häußge a7eb5f6493 Removed obsolete GcodeLoader in printer module 2013-10-20 14:37:10 +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 5631a45006 Check if self._comm is None before trying to select a file... 2013-08-18 18:41:20 +02: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
Bryan Mayland 48408910b5 Remove superfluous selectedFile setting as setJobData does that 2013-07-14 11:31:55 -04:00
Bryan Mayland 8f6d536b8f Update job metadata when the gcodemanager signals a change 2013-07-14 11:26:14 -04: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
Bryan Mayland 7d51b32476 Fix initial temperatureHistory load not containing any data 2013-07-09 14:54:32 -04: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 9227bb5fd0 Removed peakZ again, doesn't work this way
Slicers might raise the print head first for a "nose dive" onto the print platform, leading to a high peakZ already dialed in, with no way to get it down again. This way events won't be fired until the print reaches the height of the initial starting point. As a z-change is a z-change if z changes, we'll just fire the event now (if oldZ != newZ). Event consumers will have to think of a way to filter out the noise.
2013-06-30 19:15:16 +02:00
Gina Häußge 83a864d3d8 Reset peakZ on new print 2013-06-30 00:03:34 +02:00
Gina Häußge 81464d65b7 Some more cleanups 2013-06-29 23:48: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
Bryan Mayland 905923cc4c Switch ringbuffer lists for deques. 6% performance boost (4.5% vs baseline) 2013-06-28 14:19:33 -04:00
Gina Häußge ce9557798b Fixing #166 showed a deeper rooted issue with line number handling introduced with repetier/sdcard/gcodestreaming
Something like three wrongs led to one right. Core issue (not starting with line 0 but line 1 and not using the current line but the current line from the gcode file being sent, regardless of reset by M110) should now be rooted out.
2013-06-24 22:09:40 +02:00
Gina Häußge 79f2cd0e31 Merge branch 'devel' into events
Conflicts:
	octoprint/util/comm.py
2013-06-22 15:08:53 +02:00
Gina Häußge f041c6b4f3 First work on custom controls with printer feedback evaluation and presentation in the UI 2013-06-21 20:50:57 +02:00
Gina Häußge 0e56952913 Finalized decoupling of timelapse from printer module, made sure timelapse is properly unregistered from eventbus on change 2013-06-16 22:42:18 +02:00
Gina Häußge 236e26979f Switched Timelapses to using Eventbus instead of direct connection 2013-06-16 21:50:50 +02:00
Gina Häußge ed9e93f379 Merge branch 'devel' into events
Conflicts:
	octoprint/printer.py
	octoprint/server.py
	octoprint/util/comm.py
2013-06-16 11:50: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 107ff01b29 Merge branch 'gcodestreaming' into devel 2013-06-03 22:18:00 +02:00
Gina Häußge b0891b4d16 Added resource for retrieving a JSON representation of the current printer state (basically most of what's available on socket.io)
Endpoint is <baseurl>/ajax/state
2013-05-31 23:24:21 +02:00
Gina Häußge 56cb1c294c Changed to GCODE streaming instead of loading it all into memory -- no more loading times. Also better file handling. 2013-05-31 22:41:53 +02:00
Gina Häußge d571aa588a Merge branch 'sdcard' into events
Conflicts:
	octoprint/printer.py
	octoprint/server.py
	octoprint/util/comm.py
2013-05-27 01:33:54 +02:00
Gina Häußge be99930021 Refactoring of event management 2013-05-27 00:56:57 +02:00
Gina Häußge c836c79179 Merge branch 'norpchen-master' into events
Conflicts:
	octoprint/printer.py
2013-05-26 20:24:51 +02:00
Gina Häußge b645073f1d Added SD state evaluation and SD commands 2013-05-26 18:53:43 +02:00
Gina Häußge 16f5e54bd7 Merge branch 'devel' into sdcard
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/static/js/ui.js
	octoprint/util/comm.py
2013-05-23 22:53:34 +02:00
Lars Norpchen 535de9f12e redundant start event trigger removed 2013-05-22 21:41:37 -06:00
Gina Häußge 622e1f2ee7 Do not display the filename that was just streamed to SD, suggests that it is already selected for printing 2013-05-22 23:27:51 +02:00
Gina Häußge fa584d59c5 Made progress calculation more resilient, do not hit printer with commands like a freight train during warm up 2013-05-22 18:56:02 +02:00
Gina Häußge 6ce7fed96d Removed cause of NPE 2013-05-22 18:32:19 +02:00
Lars Norpchen 3f98e0c687 Bug Fixes for Event Manager 2013-05-21 19:48:38 -07:00
Gina Häußge bb954c50d2 Properly switch between file and sd printing 2013-05-21 23:41:18 +02:00
Gina Häußge 45fef79e3d Use M26 to reset SD position to 0 when cancelling and restarting a print, preprocess gcode before sending to printer 2013-05-21 23:30:29 +02:00
Gina Häußge 38ec0b96b2 Started refactoring to match coding style and simplify things a bit. 2013-05-21 22:59:13 +02:00
Lars Norpchen 525d73a20b Event Manager
Added event manager to trigger system and gcode commands.
2013-05-20 20:04:21 -07:00
Gina Häußge 039a17d923 First try at SD card support 2013-05-20 19:18:03 +02:00
Lars Norpchen c6363ea046 External commands on events
These changes address issues 87 and 22 by adding the ability to trigger
external commands on print start, done, cancel and z-height change.
2013-05-09 14:31:54 -07:00
Lars Norpchen b609123d8a Revert "Added external system commands support for events"
This reverts commit 3b66f63ff2.
2013-05-09 14:22:40 -07:00
Lars Norpchen 3b66f63ff2 Added external system commands support for events
Print start, print end, print cancel, and Z  height change can now
trigger external system commands.  These are set in config.yaml and take
_FILE_, _PERCENT_, _LINES_ and _ZHEIGHT_  tokens to be passed to
external commands.

system_commands:
  cancelled: echo cancelled _FILE_ at _PROGRESS_
percent done.
  print_done: echo done with _FILE_
  print_started: echo
starting _FILE_
  z_change: echo _LINE_ _PROGRESS_ _ZHEIGHT_
2013-05-09 14:05:48 -07:00
Gina Häußge 9618407aed Merge branch 'devel' into repetier
Conflicts:
	octoprint/server.py
2013-04-01 17:25:08 +02:00
Gina Häußge f70649b0d2 Removed a couple of redundancies for loadAndPrint button, actions are now disabled if they don't make sense 2013-03-30 18:21:49 +01:00
Dale Price 021f413c12 add "Load and Print" button which automatically starts printing when a gcode file is done loading.
Solves foosel/OctoPrint#91
2013-03-26 00:09:36 -05:00
Gina Häußge d6a83d174f Overhauled resend handling to also work with alwaysSendChecksum feature. Also introduced new feature flag resetLineNumbersWithPrefixedN to make M110 commands send the target line number as part of their N prefix (Repetier), not as a separate N parameter (Marlin & co) 2013-03-16 18:25:39 +01:00
Gina Häußge 98a7c3d8b8 New option to sort gcode files by size, reverted former utc "fix" (doesn't work anymore, works without the fix, I have no idea...), added adjusted modernizr, delete metadata from old gcode file version when adding a new one 2013-03-03 19:37:52 +01:00
Gina Häußge f03056c1b2 Made settings module more flexible regarding variable path lengths to needed values, made speed for printer movement configurable 2013-02-16 20:28:09 +01:00