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

1505 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
48dc27e106 Update CONTRIBUTING.md 2014-08-01 14:23:11 +02:00
Gina Häußge
32a38af4f7 Update CONTRIBUTING.md 2014-07-27 16:18:30 +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
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
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
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
e068012cfb Fixed a regex matcher 
(cherry picked from commit 8fbb304)
 2014-03-10 13:04:47 +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
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
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
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
bba625a68f Also recognize --iknowwhatimdoing when running as daemon 
Fixes #337
(cherry picked from commit 417487e)
 2014-01-09 20:07:27 +01:00
Gina Häußge
b282a18f6b Also recognize --iknowwhatimdoing when running as daemon 
Fixes #337
 2014-01-09 20:06:07 +01:00
Gina Häußge
0fd9b3354a Changed version... 2013-12-21 16:01:13 +01:00
Gina Häußge
765b941472 Merge branch 'master' into toMerge 
Conflicts:
	octoprint/server.py
	setup.py
	src/octoprint/printer.py
	src/octoprint/static/js/app/main.js
	src/octoprint/util/__init__.py
 2013-12-21 15:55:41 +01:00
Gina Häußge
64084bb628 A couple of manual merges... 2013-12-21 15:51:32 +01:00
Gina Häußge
df269eb4f7 More intelligent handling of disabling and re-enabling the webcam stream. 
See #314
(cherry picked from commit 1dd0aba)
 2013-12-21 14:52:06 +01:00
Gina Häußge
722b03dca8 Disable webcam stream when control tab is not in focus. 
Fixes #316
(cherry picked from commit 1b4a7c7)
 2013-12-21 14:51:53 +01:00
Gina Häußge
3ddfc93c1b Use G28 for homing (G1 was a copy-paste-error) 
Fixes #314
(cherry picked from commit 5b8126a)
 2013-12-21 14:51:43 +01:00
Gina Häußge
5eb70fa57d Properly calculate time deltas (forgot the days) 
(cherry picked from commit 84012d1)
 2013-12-21 14:50:46 +01:00
Gina Häußge
2f3c3c0c20 Properly calculate time deltas (forgot the days) 
Fixes #313
 2013-11-20 20:22:03 +01:00
Gina Häußge
ae3e474c92 Fix relative path to git root 2013-11-18 13:35:40 +01:00
Gina Häußge
297d101f5f Only apply the temperature offset if the temperature being set from the GCODE isn't 0 ("heaters off") 2013-11-18 11:35:38 +01:00
Gina Häußge
4d2213544e Made metadata saving for gcode files more error resilient (hopefully that is) 2013-11-15 20:54:13 +01:00
Gina Häußge
895d077d85 Refactored parts of comm.py to reduce length of _monitor 2013-11-11 22:03:15 +01:00
Gina Häußge
35b010b059 Better fitting error message when opening a known serial port fails (e.g. due to permission problems), auto detection errors now got their own message 
Fixes #294
 2013-11-10 20:29:37 +01:00
Gina Häußge
204128e1ca Fixed #296 
(cherry picked from commit fdfa433)
 2013-11-10 18:57:44 +01:00
Gina Häußge
fdfa433243 Fixed #296 2013-11-10 18:55:36 +01:00
Gina Häußge
aa69d181bf Fixed load API 2013-11-10 17:31:55 +01:00
Gina Häußge
e9f218208d Merge remote-tracking branch 'origin/devel' into devel 2013-11-09 20:30:04 +01:00
Gina Häußge
8ca3baee04 Fixed a couple of things with the new blueprints, should work now 2013-11-09 20:26:18 +01:00
Gina Häußge
3c68353c57 Merge pull request #293 from tonnerre/sane-ulimit 
Don't give everyone write access to octoprint data.
 2013-11-04 09:22:32 -08:00
Gina Häußge
fe37ab3cd8 Refactored server.py into submodules, extracted ajax and rest api into their own blueprints, and while doing all this also took care of #291 2013-10-28 22:08:36 +01:00
Gina Häußge
f2b0bfb7dc Merge pull request #292 from tonnerre/devel 
Remove the version name from the minified less.js version.
 2013-10-27 10:58:52 -07:00
Tonnerre LOMBARD
f7f8c09a77 Actually, umask 002 is what we want here. 2013-10-27 02:39:29 +02:00
Tonnerre LOMBARD
37c949e83b Currently, octoprint gives write access to all files in its data 
directory to everybody.

This was probably considered appropriate for the case of octoprint
running on a single-user device, but given that Unix has groups
support, it is not necessary, and can be very harmful.
 2013-10-27 02:32:14 +02:00
Tonnerre LOMBARD
b35258fad6 Remove the version name from the minified less.js version. 2013-10-26 23:28:38 +02:00
Gina Häußge
1a6030c737 Added missing docstring 2013-10-21 10:29:59 +02:00
Gina Häußge
9008a2fb7f Moved axes inverting to printer settings, changed naming and data format a bit 2013-10-20 22:22:58 +02:00
Gina Häußge
47f8ab24d9 Introduced event queue to properly decouple event processing from firing 2013-10-20 22:21:42 +02:00
Gina Häußge
4b41a47f93 Merge branch 'CapnBry-invertany' into devel 
Conflicts:
	src/octoprint/templates/settings.jinja2
 2013-10-20 15:28:18 +02:00
Gina Häußge
5d69ee8abc Added installation section to README with links to the setup guides in the Wiki and OctoPi 2013-10-20 15:24:13 +02:00
Gina Häußge
edd801aa7b Only process gcode files during backlog processing (compare #268) 2013-10-20 15:05:22 +02:00
Gina Häußge
ef8787acf9 Removed obsolete GcodeLoader in printer module 
(cherry picked from commit a7eb5f6493)
 2013-10-20 15:03:14 +02:00