q3k/OctoPrint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1218 commits 1 branch 0 tags 18 MiB
Commit graph

1218 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bryan Mayland
c8875fd0f1 Resend correct gcode line when resend is requested 2013-06-20 11:41:10 -04:00
Gina Häußge
f9beb28b1d Merge branch 'master' into devel 2013-06-19 20:38:38 +02:00
Gina Häußge
c24a66c361 Fixed signature for user view model. Closes #157 2013-06-19 20:36:50 +02:00
Gina Häußge
cc77507368 Updated module versions 
(cherry picked from commit e90c1d9)
 2013-06-18 21:41:39 +02:00
Gina Häußge
e90c1d9b28 Updated module versions 2013-06-18 21:41:12 +02:00
Gina Häußge
a4aacf6108 Merge branch 'CapnBry-extrudevol' into devel 2013-06-18 21:28:13 +02:00
Gina Häußge
7c85013389 Added filament diameter retrieval from gcode generated by Cura, fixed Slic3r version 2013-06-18 21:28:05 +02:00
Gina Häußge
e96765bc39 Merge branch 'master' into devel 
Conflicts:
	octoprint/static/css/octoprint.less
 2013-06-17 22:12:45 +02:00
Gina Häußge
bcf8d54ff3 Merge remote-tracking branch 'origin/master' 2013-06-17 22:10:48 +02:00
Gina Häußge
6876438783 Fix for #153 backported from events branch 2013-06-17 22:10:14 +02:00
Bryan Mayland
e32afe147a Add extrusion volume calculation for Slic3r gcode files 2013-06-17 14:39:52 +00:00
Gina Häußge
33731464e5 Merge pull request #145 from daprice/master 
Improve nav bar appearance when custom colors are used
 2013-06-17 04:56:10 -07:00
Gina Häußge
1af69c9790 Merge pull request #151 from algspd/master 
Added jquery.min.js locally to avoid depending on internet connection on clients which may be locally and offline
 2013-06-17 04:55:01 -07:00
algspd
d9fb3bb8f6 Added jquery.min.js locally to avoid depending on 
internet connection on clients which may be
locally and offline
 2013-06-17 00:11:17 +02:00
Gina Häußge
4994d488cf Use span instead of button for upload buttons, otherwise FF and IE hiccup... 
(cherry picked from commit ee3bc84)
 2013-06-16 11:39:20 +02:00
Gina Häußge
ee3bc84242 Use span instead of button for upload buttons, otherwise FF and IE hiccup... 2013-06-16 11:38:52 +02:00
Gina Häußge
b1ba513e32 Hotfix for recent Flask/Werkzeug versions breaking Flask-Login module 
(cherry picked from commit 84caaeb)
 2013-06-15 16:58:41 +02:00
Gina Häußge
84caaeb119 Hotfix for recent Flask/Werkzeug versions breaking Flask-Login module 2013-06-15 16:58:18 +02:00
Gina Häußge
d6ad8dca00 Indentation still wrong, caused another funny behaviour 2013-06-11 18:45:57 +02:00
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
Dale Price
add073a6cb Add black color setting 2013-06-08 19:05:09 -05:00
Dale Price
719c4fab57 Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings 2013-06-08 18:43:17 -05:00
Dale Price
7662023223 Improve appearance of text-shadow when dark navbar colors are used; adjust color of carets in navbar menus according to the navbar color 2013-06-06 20:11:35 -05: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