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

1196 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
25802ddb66 Fixed wrong indentation that caused a rather funny behaviour... 2013-06-09 19:30:42 +02:00
Gina Häußge
d0035c3f3a Removed reference to remove feedratemodifier 2013-06-09 19:05:37 +02:00
Gina Häußge
8917d2e607 strip, not trim 2013-06-09 18:58:03 +02:00
Gina Häußge
b099bb443b Trim sd filenames 2013-06-09 18:53:23 +02:00
Gina Häußge
97bdc41370 Merge branch 'master' into devel 2013-06-09 18:42:41 +02:00
Gina Häußge
4371fa500c Adjusted README 2013-06-09 18:42:32 +02:00
Gina Häußge
ac4a0f772d Fixed whitespace 2013-06-09 18:29:28 +02:00
Gina Häußge
8be1329a71 Merge branch 'devel' into gcodestreaming 
Conflicts:
	octoprint/printer.py
	octoprint/static/js/ui.js
	octoprint/templates/index.jinja2
	octoprint/util/comm.py
 2013-06-09 18:28:40 +02:00
Gina Häußge
edff311351 Merge branch 'master' into devel 2013-06-09 18:18:57 +02:00
Gina Häußge
9963c523c0 Do not display -1mm when printing from sd 2013-06-09 18:13:12 +02:00
Gina Häußge
4509eab816 Enable sd support by default 2013-06-09 18:04:25 +02:00
Gina Häußge
d5a620f476 Introduced new function matchesGcode to properly test if a line contains a specific gcode 2013-06-09 18:03:41 +02:00
Gina Häußge
7257714a8e Merge branch 'master' into devel 2013-06-09 17:53:10 +02:00
Gina Häußge
c36e39909e Always reset heatingUp flag when receiving an ok 2013-06-09 17:44:06 +02:00
Gina Häußge
5b15d42881 Only send M105/M27 during sd printing when not currently heating up 2013-06-09 17:08:12 +02:00
Gina Häußge
90a1edbbcf Testing out a space between the N-prefix and the command 2013-06-09 16:33:59 +02:00
Gina Häußge
30a57e21f4 Fixed line count incrementation for gcode streaming 2013-06-09 15:55:55 +02:00
Gina Häußge
003109d59e Made gcode viewer capable of handling progress information 
GCode viewer now updates its visualization (during printing) based on the current progress percentage, not based on the current line (which will not be available any more as part of the progress tuple with gcode streaming)
 2013-06-09 14:00:15 +02:00
Gina Häußge
3f405323c8 Merge pull request #144 from daprice/master 
Check for localStorage support before using it
 2013-06-06 13:49:06 -07:00
Dale Price
57932ff78c Check for localStorage with Modernizr before attempting to use it. Solves foosel/OctoPrint#91 2013-06-06 00:23:30 -05:00
Gina Häußge
8d4f7e2ba7 M20 on startup (2nd try) 2013-06-03 22:37:08 +02:00
Gina Häußge
480f0aef6f M20 on startup 2013-06-03 22:32:23 +02:00
Gina Häußge
1441a7dbd8 Added missing image resource 2013-06-03 22:25:23 +02:00
Gina Häußge
107ff01b29 Merge branch 'gcodestreaming' into devel 2013-06-03 22:18:00 +02:00
Gina Häußge
9f975426a7 Added requirements for BeagleBone Black 
Difference to regular dependencies is to not fetch pyserial and numpy via pip but instead install those from the available packages.
(cherry picked from commit 41aa633)
 2013-06-02 13:41:36 +02:00
Gina Häußge
41aa633f38 Added requirements for BeagleBone Black 
Difference to regular dependencies is to not fetch pyserial and numpy via pip but instead install those from the available packages.
 2013-06-02 13:41:03 +02:00
Gina Häußge
b0891b4d16 Added resource for retrieving a JSON representation of the current printer state (basically most of what's available on socket.io) 
Endpoint is <baseurl>/ajax/state
 2013-05-31 23:24:21 +02:00
Gina Häußge
56cb1c294c Changed to GCODE streaming instead of loading it all into memory -- no more loading times. Also better file handling. 2013-05-31 22:41:53 +02:00
Gina Häußge
8d53f313fe Removed debug log output 2013-05-27 19:48:17 +02:00
Gina Häußge
b645073f1d Added SD state evaluation and SD commands 2013-05-26 18:53:43 +02:00
Gina Häußge
16f5e54bd7 Merge branch 'devel' into sdcard 
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/static/js/ui.js
	octoprint/util/comm.py
 2013-05-23 22:53:34 +02:00
Gina Häußge
08229598e6 Merge branch 'repetier' into devel 2013-05-23 22:45:21 +02:00
Gina Häußge
5b72be31ba Minor cleanup 2013-05-23 22:45:00 +02:00
Gina Häußge
da90b2d738 Try to remove timing issues when preparing next line to send 2013-05-23 22:37:02 +02:00
Gina Häußge
622e1f2ee7 Do not display the filename that was just streamed to SD, suggests that it is already selected for printing 2013-05-22 23:27:51 +02:00
Gina Häußge
fa584d59c5 Made progress calculation more resilient, do not hit printer with commands like a freight train during warm up 2013-05-22 18:56:02 +02:00
Gina Häußge
6ce7fed96d Removed cause of NPE 2013-05-22 18:32:19 +02:00
Gina Häußge
75f53b8ab9 Properly parse Marlin's "opened file x" message 2013-05-22 18:25:26 +02:00
Gina Häußge
33bcf284a9 Always send all lower case filenames to the printer for sd card commands 2013-05-22 18:20:21 +02:00
Gina Häußge
bb954c50d2 Properly switch between file and sd printing 2013-05-21 23:41:18 +02:00
Gina Häußge
45fef79e3d Use M26 to reset SD position to 0 when cancelling and restarting a print, preprocess gcode before sending to printer 2013-05-21 23:30:29 +02:00
Gina Häußge
eeddf0ae1a Reset SD file data when disconnecting or when losing/regaining connection to the backend 2013-05-21 23:08:34 +02:00
Gina Häußge
b048cc390b Proper uploading incl. drag-n-drop for both local storage and SD card 2013-05-20 23:31:17 +02:00
Gina Häußge
783b3b8166 Merge branch 'master' into devel 2013-05-20 20:19:26 +02:00
Gina Häußge
039a17d923 First try at SD card support 2013-05-20 19:18:03 +02:00
Gina Häußge
427fa61ac6 Merge pull request #128 from marwue/patch-1 
jQuery over SSL and GoogleCDN
 2013-05-16 06:48:56 -07:00
Marlon Wünnemann
b61db6dc0f jQuery over SSL and GoogleCDN 
Issue #127
 2013-05-16 16:43:09 +03:00
Gina Häußge
0f546f0053 Merge pull request #122 from norpchen/master 
GCode files with unknown commands
 2013-05-09 08:16:36 -07:00
Lars Norpchen
957213321e Print 'unknown G/M code' warnings to console once 2013-05-09 08:07:33 -07:00
Gina Häußge
fc56744705 Fixed URL for setting timelapse configuration. 
Closes #110
 2013-05-01 20:17:30 +02:00