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

1617 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
e0a064a0fa Updated README to fit new installation procedure etc. 2014-08-08 17:00:39 +02:00
Gina Häußge
568fcbf547 Don't close serial port before switching to state "closed serial port" 
Depending on what was happening in the monitoring thread this could lead to an attempt to write to the already closed port, logging an error and killing the interface in the process. Also fixed a timing issue in the state reporting towards the frontend, state updates and readings for clients are now wrapped in a mutex

Closes #492
(cherry picked from commit 11fb18f)
 2014-08-08 16:58:38 +02:00
Gina Häußge
7028bbfbfd GCODE viewer now interprets inverted axes for printer control and mirrors print bed accordingly. 
Should enable people to set their axes origin so that the viewer matches what they see on their printer.

Should close #431
(cherry picked from commit 030ffe6)
 2014-08-08 16:55:05 +02:00
Gina Häußge
c552e9e9be Fixed a couple of issue with the gcode viewer 
Most notably the interfering options tracked in #398, but also made "Center viewport on model" and "Zoom in on model" automatically deselect and de-apply if viewport gets manipulated by user, therefore properly allowing the re-select by the user to work to.

Closes #398
(cherry picked from commit f195af0)
 2014-08-08 16:52:28 +02:00
Gina Häußge
f8e8914f7d Merge branch 'master' into staging 
Conflicts:
	setup.py
	src/octoprint/server/ajax/control.py
 2014-08-08 16:37:25 +02:00
Gina Häußge
772ebd198a Fixed setup.py to correctly work with versioneer 
(cherry picked from commit de7808d)
 2014-06-23 10:36:30 +02:00
Gina Häußge
603f667f93 Removed left overs from old VERSION tracking 2014-06-22 01:15:31 +02:00
Gina Häußge
18162cf110 Versioning by versioneer: https://github.com/warner/python-versioneer/ 
(cherry picked from commit 285f464)
 2014-06-22 01:12:06 +02:00
Gina Häußge
f693f26ffc Insert src folder at first position of sys.path 
(cherry picked from commit fa564c6)
 2014-06-22 01:09:22 +02:00
Gina Häußge
4cc1dc405f v1.1.0-rc1 2014-06-22 01:06:39 +02:00
Gina Häußge
f9a9a405cd About time to declare this as a stable version, should have done this ages 
ago...
 2014-06-22 00:42:03 +02:00
Gina Häußge
fa564c6029 Insert src folder at first position of sys.path 2014-06-21 20:16:53 +02:00
Gina Häußge
36d1522f01 Merge pull request #475 from Salandora/master 
Bug fix for Emergency Stop
 2014-05-22 21:53:06 +02:00
Salandora
536e17eac4 Bug fix for Emergency Stop 2014-05-22 17:56:50 +02:00
Gina Häußge
887ec45b6b Create CONTRIBUTING.md 2014-05-19 22:48:41 +02:00
Gina Häußge
deb38f8455 Fixed an embarrassing merge error from waaay back. Didn't disrupt operation but caused funny error messages in the log. 
Thanks to @nophead for reporting this.

Closes #433
 2014-04-18 14:28:52 +02: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