pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1604 commits 20 branches 22 tags 141 MiB
Commit graph

1604 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
b266dc24d7 Merge pull request #419 from C-o-r-E/devel 
Fix error where API state is requested and printer is offline
 2014-03-22 20:35:03 +01:00
C-o-r-E
619fe9a0e7 Fix error where API state is requested and printer is offline 2014-03-17 23:04:57 -04:00
Gina Häußge
50cf776e70 Upped version 2014-03-15 20:37:17 +01:00
Gina Häußge
64dacc7c70 Merge remote-tracking branch 'origin/devel' into devel 2014-03-15 20:36:56 +01:00
Gina Häußge
f7c75442e7 Merge branch 'master' into devel 
Conflicts:
	src/octoprint/server/api/settings.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/util/comm.py
 2014-03-15 20:36:35 +01:00
Gina Häußge
293611287e New setting for repetier to always assume SD card is present (since firmware does not report whether initialization succeeded via explicit message) 
Fixes #289
 2014-03-15 16:30:29 +01:00
Gina Häußge
6a2a1da5f9 Merge branch 'master' into devel 2014-03-15 10:20:37 +01:00
Gina Häußge
7ebbf5911c Removed the scary start up message when called via run. I'll just keep that script around for sake of simplicity of running stand alone installations out of the pull dir, so why scare people... 2014-03-15 10:20:19 +01:00
Gina Häußge
254c3814d5 Merge pull request #415 from nullie/fix-temperature-table-size 
Revert "Add box-sizing: border-box to temperature table th. Should fix #...
 2014-03-14 16:50:39 +01:00
Gina Häußge
44c1920d9b Merge pull request #414 from nullie/fix-actual-column-style 
Fix style attribute for Actual column header, should fix #412
 2014-03-14 16:17:07 +01:00
Ilya Novoselov
109372d10b Fix style attribute for Actual column header, should fix #412 2014-03-14 21:01:04 +06:00
Ilya Novoselov
94847b846b Revert "Add box-sizing: border-box to temperature table th. Should fix #412" 
This reverts commit 54b01d30da.
 2014-03-14 20:47:56 +06:00
Gina Häußge
3746332eb5 Merge pull request #413 from nullie/fix-temperature-table-size 
Add box-sizing: border-box to temperature table th. Should fix #412
 2014-03-14 14:36:37 +01:00
Ilya Novoselov
54b01d30da Add box-sizing: border-box to temperature table th. Should fix #412 2014-03-14 16:52:07 +06:00
Gina Häußge
0509eb3f0a Merge branch 'master' into devel 
Conflicts:
	setup.py
	src/octoprint/gcodefiles.py
	src/octoprint/printer.py
	src/octoprint/server/ajax/control.py
	src/octoprint/server/ajax/gcodefiles.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/main.js
	src/octoprint/util/comm.py
 2014-03-13 20:25:33 +01:00
Gina Häußge
d7e37cf658 origin is "sd" for files from the SD card, not "sdcard". 
Fixes #411
 2014-03-13 20:15:29 +01:00
Gina Häußge
bdade99837 Operate on current transformation matrix when zooming 
Closes #398
 2014-03-10 18:54:18 +01:00
Gina Häußge
29be139803 Do not overwrite possibly existing target temp if only a single hotend is present 
See #360
 2014-03-10 14:40:01 +01:00
Gina Häußge
ca8779676c Added configurable timeout settings for temperature and sd status query, made communication timeout reset everytime a non-empty line is received from the printer 2014-03-10 13:52:09 +01:00
Gina Häußge
ee03d62997 Fixed M110 and sd status reporting on virtual printer 2014-03-10 13:13:03 +01:00
Gina Häußge
e068012cfb Fixed a regex matcher 
(cherry picked from commit 8fbb304)
 2014-03-10 13:04:47 +01:00
Gina Häußge
8fbb30437c Fixed a regex matcher 2014-03-10 13:04:12 +01:00
Gina Häußge
9396ed765c Virtual printer now supports "repetier style" target temperature reporting 2014-03-10 11:26:29 +01:00
Gina Häußge
d7f2075b1d Only list those SD files that have a ASCII filename 
According to the RepRap protocol we should actually not ever get anything other than those anyways, as the protocol is defined as ASCII-only. In the future there might be a way to somehow handle such files too, for the time being this fixes issues though where non-ascii files on the SD made the whole SD file handling not work.

 Closes #381
(cherry picked from commit b115b6f)
 2014-03-09 13:53:39 +01:00
Gina Häußge
e5ac94a16f Merge branch 'master' into staging 
Conflicts:
	run
	src/octoprint/util/comm.py
 2014-03-09 13:47:49 +01:00
Gina Häußge
2be05d4f9a Do not try to send bed temp on API if not available 2014-03-09 13:43:59 +01:00
Gina Häußge
f3ee2d2bfd Fix for saved timelapse configs vs. new post roll setting 
See #384
 2014-03-05 21:57:27 +01:00
Gina Häußge
f580acaf70 Added post roll to timelapse 
You can now define an amount of seconds that should be added to the rendered timelapse (so, since the current fps setting is 25 frames per seconds, 25 * the configured amount of post roll seconds images will need to be captured).

Timed timelapses add this to the actual run time of the timelapse capturing process (so if you configure 1s post roll, a timed timelapse will run 25s longer than the print)

Z-triggered timelapses just create one last capture from the webcam and use this image again and again (so 25 times for a post roll of 1s).

Implements #384
 2014-03-05 20:52:25 +01:00
Gina Häußge
27322a971f Also support repetier target temperature output 
Should fix #360
 2014-03-03 23:04:36 +01:00
Gina Häußge
8b5d6c9367 Changed handling of bed temperatures 
Will now be left unset if not detected (instead of dying a horrible death), modified frontend to not display bed settings in such cases. While at it also (hopefully) fixed "Target: off" for bed issue.

TODO: Support repetier's "TargetBed:", "TargetExtr%n" syntax

Fixes #399, partially solves #360
 2014-03-03 22:34:09 +01:00
Gina Häußge
f09d44d8a0 Hopefully fixed a race condition that could occur when pressing "Print" (file not opened yet, but comm layer tries to fetch next command) 
Possible fix for #400
 2014-03-03 16:58:15 +01:00
Gina Häußge
9b031ff9d3 Hopefully fixed a race condition that could occur when pressing "Print" (file not opened yet, but comm layer tries to fetch next command) 2014-03-03 15:25:42 +01:00
Gina Häußge
de59e8aa56 Fixed temperature graph again after changes from last night 2014-03-03 09:53:34 +01:00
Gina Häußge
850aa5b797 Renamed compiled regexes to match the new naming scheme 2014-03-03 09:35:43 +01:00
Gina Häußge
9107fd839b Extracted all used regexes in the comm layer and precompiled them 
Possible improvement of #390

(cherry picked from commit 89cae22b91)

Conflicts:
	src/octoprint/util/comm.py
 2014-03-03 09:20:59 +01:00
Gina Häußge
89cae22b91 Extracted all used regexes in the comm layer and precompiled them 
Possible improvement of #390
 2014-03-03 09:10:10 +01:00
Gina Häußge
82ee48b166 Settings for bed dimension (PR) and extruder offsets 
Changed the bed dimension PR slightly to use a computed property instead of two separate values and only a computed reader, added options for extruder offsets.
 2014-03-02 22:15:19 +01:00
Gina Häußge
17f3c5777e Merge branch 'devel' into Salandora-settings 2014-03-02 22:13:03 +01:00
Salandora
2cb787f816 remove unused Variables 2014-02-28 16:49:07 +01:00
Salandora
feba135cac Bed Dimensions in Printer Settings 2014-02-28 16:48:07 +01:00
Gina Häußge
45c9e75e4e Slight refactoring of a PR 
Corrected indentation, removed jumpy cursor, fixed off-by-one errors on history limits, limited history to a maximum of 300 entries ("300 items of command history should really be enough for anybody!")
 2014-02-24 21:57:02 +01:00
Gina Häußge
586a7a85e3 Merge branch 'devel' into chriskoz-terminalHistorySupport 2014-02-24 19:11:33 +01:00
Gina Häußge
f844bd99c7 Properly authenticate log file downloads on Tornado as well 
Only allow for users with role admin.
 2014-02-24 14:13:55 +01:00
Gina Häußge
0747336c0f Bugfix: Do not run gcode analyzer when a print is ongoing 
Evaluate active flag on gcode analyzer AFTER fetching an item from the work queue, otherwise it will always start working once it finds something if the active flag was true once but then switched to false while the queue was still empty.  Thanks to @Salandora for spotting this.

Fixes #357

(manually cherry-picked from 592f3dc)
 2014-02-24 10:00:11 +01:00
Gina Häußge
ace102e1c1 Added API documentation, adjusted API and returned data model slightly to be consistent with other parts of the API, made log file management restricted to admins. 
TODO: Make downloading of logs also restricted to admins
 2014-02-24 09:57:51 +01:00
Chris Kosmakos
b976461c29 minor cleanup on command history. removing unneeded var. 2014-02-23 19:02:00 -08:00
Gina Häußge
ad7243844e Merge branch 'devel' into Salandora-logDownload 2014-02-23 13:33:31 +01:00
Gina Häußge
4a6a458cdd Removed unused parts from backend code, moved formatting to frontend, added date column, switched to modification date (might be more interesting in case of the log files) 2014-02-23 12:25:46 +01:00
Gina Häußge
197d46b511 Fixed indentation 2014-02-23 11:17:29 +01:00
Salandora
cf25d3d7be Moved Log tab to Settings 2014-02-20 18:08:21 +01:00