Commit graph

1207 commits

Author SHA1 Message Date
Ross Hendrickson
6d703d236a Minor improvement to getFileData 2013-07-21 19:07:57 -06:00
Ross Hendrickson
de635ae25f Spacing 2013-07-21 19:03:52 -06:00
Ross Hendrickson
8dff6d6750 Cura enabled will change if an STL is sliced or not 2013-07-21 19:02:30 -06:00
Ross Hendrickson
1e1e72c9c2 Remove empty test server file. Spacing clean up 2013-07-21 18:54:16 -06:00
Ross Hendrickson
f51f4ad5cd STL file no longer appears after slicing or reloading. First steps for slicing an moving file to SD card. 2013-07-21 18:43:57 -06:00
Ross Hendrickson
711d18d9ad First pass almost working. Need to not have the STL show up. 2013-07-18 00:03:07 -06:00
Ross Hendrickson
3cadbbeb85 Remove logging. Update default strings. 2013-07-10 11:39:33 -06:00
Ross Hendrickson
d7fe15d635 Address PR naming comments. Ensure save and load of cura specific settings is working. 2013-07-10 11:30:38 -06:00
Ross Hendrickson
d6b172c744 Implement basic CRUD around required first step Cura settings 2013-06-30 00:23:22 -06:00
hendricksonrw
40650f1bde Add bindings to Cura settings. 2013-06-29 19:31:44 -05:00
Ross Hendrickson
87edcc4966 Add basic cura settings UI and default settings. 2013-06-27 19:10:14 -06:00
Ross Hendrickson
09fa9bc28d Fix error in test path 2013-06-21 19:23:51 -06:00
Ross Hendrickson
280d8e8405 Change Class name. Test will slice model with included ini. 2013-06-21 19:22:13 -06:00
Ross Hendrickson
0eeca11838 Removed files 2013-06-20 22:31:22 -06:00
Ross Hendrickson
281ad0f046 First cura integration attempt 2013-06-20 21:55:41 -06: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
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
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
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
4371fa500c Adjusted README 2013-06-09 18:42:32 +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
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
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
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