Commit Graph

124 Commits (b2587579baa876a1ba0bd5e81e7a698d31503c6e)

Author SHA1 Message Date
Gina Häußge 93db51ecb9 Allow definition of additional glob patterns for serial ports
Configuration happens via config.yaml, just add additional patterns by listing them under serial > additionalPorts, e.g.

    serial:
        additionalPorts:
        - /dev/myCustomPort
        - /dev/myOtherCustomPort
2013-09-08 16:00:47 +02:00
Gina Häußge accf70ee6c Reset start time when (re)starting a print job
Closes #245
2013-09-08 15:47:47 +02:00
Gina Häußge 715dea7eb3 Merge branch 'repetier' into devel 2013-09-02 17:35:52 +02:00
Gina Häußge e7eb9707fc Minor optimizations in gcode interpreter 2013-09-01 19:27:57 +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 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 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 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 54175d2146 First throw at autologin capabilities 2013-08-18 18:33:21 +02:00
Gina Häußge c7501ded47 Removed commented out and unused code 2013-08-11 17:39:45 +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 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 c33c32410b Added configurable pause triggers to be able to react to custom firmware messages with pausing/unpausing/pause toggling 2013-07-08 18:01:10 +02:00
Gina Häußge c9e261df32 Use absolute values for self._serial.timeout, not relative ones
Thanks to @spapadim for spotting this
2013-07-05 16:58:00 +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 98d4317e6f More error resilience 2013-06-30 21:01:35 +02:00
Gina Häußge 81464d65b7 Some more cleanups 2013-06-29 23:48:27 +02:00
Gina Häußge 0ed8f0f28d Fixed typo, better error handling. 2013-06-29 20:39:49 +02:00
Gina Häußge 9607de7d17 Removed matchesGcode again since it's not needed anymore 2013-06-29 19:09:55 +02:00
Gina Häußge a9c35e5cf9 Changed gcode regex slightly to be on the safe side (we don't want to accidentally capture comments etc) 2013-06-29 19:06:14 +02:00
Gina Häußge 5b976b5300 Merge branch 'devel' into CapnBry-sendperf
Conflicts:
	octoprint/util/__init__.py
2013-06-29 18:38:23 +02:00
Gina Häußge 530cdcd26a Some refactoring (grouping methods, extracting classes, etc) 2013-06-29 18:37:47 +02:00
Gina Häußge 1caba2d634 Added git information to website 2013-06-29 13:41:39 +02:00
Bryan Mayland eb565645eb Remove profiling code 2013-06-28 14:19:35 -04:00
Bryan Mayland b9144c2edc Microoptimization to not build the same string twice 2013-06-28 14:19:34 -04:00
Bryan Mayland cb30d1fdd0 Refactor send command gcode handlers into individual functions. Very little gain if any. 2013-06-28 14:19:34 -04:00
Bryan Mayland b1c5c58f02 Rename gfunc -> gcode 2013-06-28 14:19:34 -04:00
Bryan Mayland 715eb142f8 gcodeToEvent can only fire one event per gcode function anyway. <1% performance increase. 2013-06-28 14:19:33 -04:00
Bryan Mayland b5661c6f5e Remove unused comm logQueue. 18% performance increase (12% vs baseline) 2013-06-28 14:19:33 -04:00
Bryan Mayland 905923cc4c Switch ringbuffer lists for deques. 6% performance boost (4.5% vs baseline) 2013-06-28 14:19:33 -04:00
Bryan Mayland 9dd754fdae Remove matchesGcode and instead just parse the code once. 29% performance increase 2013-06-28 14:19:32 -04:00
Gina Häußge 1b45d15430 Merge branch 'master' into devel
Conflicts:
octoprint/util/comm.py
2013-06-27 21:51:09 +02:00
Gina Häußge dd3e9030fa Yet another fix for the M999 resend issue
Should hopefully now be also fixed in case of a newly established connection with the printer, which was a regression due to the fix of the resending code.
2013-06-27 21:12:06 +02:00
Gina Häußge 8b384ef530 Small rewording 2013-06-25 22:00:52 +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 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 e5389d0f0f Reverted bbad030a92
Correct in devel branch, wrong in master branch (different counting).

Closes #166
2013-06-24 18:24:45 +02:00
Bryan Mayland a9ec4336de More errors == more error events 2013-06-22 15:13:44 +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
Bryan Mayland 50914df07a Made communication mode more error resilient 2013-06-22 15:03:01 +02:00
Bryan Mayland 66ddf77be8 Be able to cope with M999 causing a Resend: 1
(cherry picked from commit 8b702db)
2013-06-22 09:39:13 +02:00
Bryan Mayland 8b702db0d0 Be able to cope with M999 causing a Resend: 1 2013-06-22 09:36:21 +02:00
Gina Häußge 40b4bfad85 Merge branch 'feedbackCommands' into devel 2013-06-21 23:19:25 +02:00
Bryan Mayland 6600eea1a2 Feedback commands now work 2013-06-21 23:19:15 +02:00
Bryan Mayland bbad030a92 Resend correct gcode line when resend is requested
(manually cherry picked from commit c8875fd)
2013-06-21 21:09:39 +02:00
Gina Häußge 94316fbcc1 Merge remote-tracking branch 'CapnBry/resendfix' into devel 2013-06-21 21:03:59 +02:00