Commit graph

242 commits

Author SHA1 Message Date
Gina Häußge
d0fadb1b6f atomic_write context to save configs first to temp file, then move
Should prevent corruption of files
(cherry picked from commit c6d0290)
2015-09-14 12:17:17 +02:00
make-ing
d37ce77460 fixed position update bug after grbl flashing 2015-09-09 12:45:24 +02:00
make-ing
469f2cb3f1 removed debug messages after avrdude bug fix 2015-09-07 15:59:58 +02:00
make-ing
dabcca4297 try to fix grbl flashing problem on pi 2015-09-07 11:07:05 +02:00
make-ing
e5cc1361c6 fixed grbl version string bug; fixed grbl.hex not found flashing bug 2015-09-05 13:09:57 +02:00
Teja
c482a487f6 bugfix. path of grblVersionString was wrong. 2015-09-04 20:02:54 +02:00
Teja
4f655bf306 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-04 18:58:27 +02:00
Teja
5554fc258e bugfix. don't send eeprom writing commands during printing 2015-09-04 18:57:55 +02:00
make-ing
6f1c9ed8d9 changed grbl version regex to be non-greedy 2015-09-04 18:14:55 +02:00
make-ing
bc4e0f2e35 *try to fix grbl version bug (No such file or directory: 'src/octoprint/util/grblVersionRequirement.yml') with change in setup.py and moving of grblVersionRequirement.yml and grbl.hex into new grbl folder 2015-09-04 18:10:33 +02:00
make-ing
46347cc95b fixed grbl version regexp bug 2015-09-04 17:26:45 +02:00
make-ing
5b70cfb3e5 changed error handling of grbl flashing to only flash once and if an error
occurs the state is changed to STATE_CLOSED_WITH_ERROR
2015-09-04 11:40:22 +02:00
Teja
010e2cfa92 flashing visualization fixed. uploaded up to date grbl version. 2015-09-04 11:15:36 +02:00
Teja
11ab4509cb moved grbl binary to a non-machine-specific name 2015-08-31 18:47:24 +02:00
make-ing
0632bb5fdf -added new machine state (STATE_FLASHING)
-added required grbl hex file to flash
2015-08-27 15:10:05 +02:00
make-ing
4e76574bb9 added grbl version comparison and check to see if required version is detected.
If the right grbl version is not detected, the arduino is flashed with the right
hex file.
2015-08-25 16:46:32 +02:00
Teja
cf70b4e80a bugfix. fan must be switched on before any gcode file is streamed. 2015-08-20 15:34:20 +02:00
Teja
493612a47f connecting to a already homed grbl works. 2015-07-17 11:34:11 +02:00
Teja
cb512a257c fixed re-connection bug when grbl already has a position. 2015-07-16 10:03:54 +02:00
Teja
49fece1e14 return home after print done 2015-07-15 12:45:18 +02:00
Teja
0ae0390dcf finally working implementation of ACC in the latest comm.py 2015-07-11 15:48:53 +02:00
Teja
0725ee23f3 cancelling print working. 2015-07-11 15:44:00 +02:00
Teja
08ab894ead support for ! and ~ commands 2015-07-11 10:10:39 +02:00
Teja
fee7b32413 basic acc attached. missing ! ~ command support. 2015-07-11 00:36:35 +02:00
Teja
64c0c0d473 just a test. inject acc to upstream comm.py 2015-07-10 23:35:56 +02:00
Teja
691d8e8d85 log is ignoring filtered messages. 2015-07-09 16:42:38 +02:00
Teja
7b548763f5 way faster update of laser position. 2015-07-09 16:12:54 +02:00
Teja
3b30e25e60 pause from web ui sends ! and M5 now 2015-07-08 20:56:32 +02:00
Teja
fc4f2340fe fixed limit hit warning and reconnect after. 2015-07-07 18:44:29 +02:00
Teja
af6310f5d3 position update works again 2015-07-06 19:36:18 +02:00
Teja
867895ab81 terminal fixed 2015-07-04 17:06:46 +02:00
Teja
44671cfb40 WIP. slicing working again. 2015-07-04 16:19:56 +02:00
Teja
fa1bad7b7c wip 2015-07-03 17:08:15 +02:00
Teja
a7acc7f7f4 Merge remote-tracking branch 'upstream/maintenance' into upstream_merge
Conflicts:
	requirements.txt
	src/octoprint/filemanager/__init__.py
	src/octoprint/plugins/cura/profile.py
	src/octoprint/plugins/cura/static/js/cura.js
	src/octoprint/plugins/cura/templates/cura_settings.jinja2
	src/octoprint/plugins/svgtogcode/__init__.py
	src/octoprint/printer/__init__.py
	src/octoprint/server/__init__.py
	src/octoprint/server/api/files.py
	src/octoprint/server/api/printer.py
	src/octoprint/server/api/settings.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/appearance.js
	src/octoprint/static/js/app/viewmodels/connection.js
	src/octoprint/static/js/app/viewmodels/control.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/gcode.js
	src/octoprint/static/js/app/viewmodels/printerstate.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/static/js/app/viewmodels/terminal.js
	src/octoprint/templates/dialogs/settings.jinja2
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
	src/octoprint/templates/index.jinja2
	src/octoprint/templates/navbar/settings.jinja2
	src/octoprint/templates/stylesheets.jinja2
	src/octoprint/util/comm.py
2015-07-02 22:36:30 +02:00
Gina Häußge
d7a86a4d28 Use UTF-8 for _all_ output from sarge
Lines taking from the asynchronous processing of stdout/stderr where
left as str, leading to encoding problems when utf8 characters showed
up in the stream and were being interpreted as ascii encoding.
(cherry picked from commit 9373be3)
2015-07-02 15:27:17 +02:00
Gina Häußge
eadc9ee795 Fix: We don't need the shell for pip
(cherry picked from commit 2db3228)
2015-06-30 19:12:37 +02:00
Gina Häußge
4dc9d0a536 Fix: SD card errors shouldn't not cause disconnect
If the SD card fails to initialize with a volume.init failure, that's
not a reason to break off all diplomatic relations with the printer.
(cherry picked from commit 9caf13d)
2015-06-29 10:19:50 +02:00
Gina Häußge
0c54eaf176 Fix: Use Exception, not BaseException
Custom exception should be derived from Exception, not BaseException.

Not only is this specified in the python documentation, but also
tornado will be able to handle Exceptions in requests perfectly fine
and return an HTTP 500 for them, but crash hard (as in, server shut
down follows) for BaseExceptions.
(cherry picked from commit 29b047b)
2015-06-28 02:24:47 +02:00
Gina Häußge
fca8becb20 More informative errors when serial connection fails 2015-06-24 08:55:27 +02:00
Gina Häußge
b32f9bddd2 New util class for performing pip calls
Will lookup the correct pip command to use if not provided as constructor parameter and determine the version. Implements __lt__, __le__, __gt__ and __ge__ for "less/greater than" checks against the pip version, for dynamicalle changing call parameters provided to the execute method based on availability.

 Will allow adjusting software update and plugin manager plugins to only use --process-dependency-links for pip versions >= 1.5
2015-06-23 11:35:23 +02:00
Gina Häußge
c6cb430594 Throttle gcode analysis a bit for low prio entries
Give the Pi's CPU a bit air to breathe...
2015-06-19 22:33:26 +02:00
Teja
7c11c04234 bugfix. reset the character counter after machine reset properly. 2015-06-16 12:31:34 +02:00
Gina Häußge
b714c59004 Allow specification of known long running commands through settings
This should allow users to adjust the behaviour of the communication stack more granularly in case the regular settings which only consider G4, G28, G29, G30, G32 to be real long runners without output are not sufficient.
2015-06-03 12:34:00 +02:00
Gina Häußge
f2192ba232 Fix: Re-open detected serial port with specified baudrate
The serial port was previously kept open from the Stk500 initialization, which defaults to 115200 baud.

Closes #892
2015-05-29 11:36:36 +02:00
Gina Häußge
1a80aa854f Fix: "gcode" var was not properly parsed for queuing and queued command phases
Thanks @C-o-r-E for the heads-up
2015-05-28 20:20:51 +02:00
Gina Häußge
61af59cca1 New hooks for command processing in comm layer
Added phase specific hooks for queuing, queued, sending and sent phases of a command ("octoprint.comm.protocol.gcode.<phase>"). Removed old queuing phase hook and declared as obsolete hook in plugin manager to prevent plugins that depend on it from being enabled.

Adding those new hooks also necessitated refactoring the whole command processing, made it more modular and added phase specific handler functions that allow handling all blocking commands centrally for example.
2015-05-28 17:06:24 +02:00
Gina Häußge
046fffdd14 Fixed a deadlock in the communication layer when pausing via M0
Using reentrant locks to allow sending of additional commands
2015-05-28 16:10:48 +02:00
Gina Häußge
3ac2d5dd34 Fixed Z-Timelapse for Z changes on `G1` moves
Solves #909
2015-05-26 18:46:50 +02:00
Mark Walker
50c95e439d Only eat two characters when the error indicator is '!!' 2015-05-20 20:06:24 -07:00
Gina Häußge
6323ce56ed Fix: Properly close selected files in case of errors or intentional disconnects on the serial interface
File handle was formerly kept open. Thanks to @Salandora for the initial work on this. See also PR #883
2015-05-11 12:23:56 +02:00