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

3102 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Gina Häußge
8d53f313fe Removed debug log output 2013-05-27 19:48:17 +02:00
Gina Häußge
16befc84d2 Brought up to date with sdcard branch 2013-05-27 01:45:52 +02:00
Gina Häußge
d571aa588a Merge branch 'sdcard' into events 
Conflicts:
	octoprint/printer.py
	octoprint/server.py
	octoprint/util/comm.py
 2013-05-27 01:33:54 +02:00
Gina Häußge
3130c0c30b Fixed jobData key 2013-05-27 01:20:45 +02:00
Gina Häußge
624630ac63 Updated documentation of events 2013-05-27 01:03:53 +02:00
Gina Häußge
be99930021 Refactoring of event management 2013-05-27 00:56:57 +02:00
Gina Häußge
c836c79179 Merge branch 'norpchen-master' into events 
Conflicts:
	octoprint/printer.py
 2013-05-26 20:24:51 +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
Lars Norpchen
535de9f12e redundant start event trigger removed 2013-05-22 21:41:37 -06: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
Lars Norpchen
3f98e0c687 Bug Fixes for Event Manager 2013-05-21 19:48:38 -07: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
38ec0b96b2 Started refactoring to match coding style and simplify things a bit. 2013-05-21 22:59:13 +02:00
Gina Häußge
96adc0dc85 Merge branch 'norpchen-master' into events 
Conflicts:
	octoprint/server.py
	octoprint/settings.py
 2013-05-21 22:38:56 +02:00
Lars Norpchen
f6108b5422 Update README.md 
Back out previous changes
 2013-05-20 21:14:00 -06:00
Lars Norpchen
525d73a20b Event Manager 
Added event manager to trigger system and gcode commands.
 2013-05-20 20:04:21 -07: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
Richard Mitchell
8c8101bf62 Forgot to simplify the success after testing 2013-05-18 18:21:33 +00:00
Richard Mitchell
e831ced2da simple change so the url loads from http or https whichever is in use 2013-05-18 18:13:17 +00:00
Richard Mitchell
c1760c9940 A very simple API endpoint for loading and printing files direct. This is by default turned off and it "allowed" via the settings 
From within Slic3r adding a post-processing script .bat containing

c:\curl\curl "http://192.168.0.7:5000/api/load?apikey=D96FA6A216CB44F78705D4506689D0EC&print=true" -F file=@%*
 2013-05-18 17:47:31 +00:00
Richard Mitchell
3f79faf55b Merge remote-tracking branch 'upstream/master' into devel 2013-05-18 06:32:04 +00: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
Lars Norpchen
7b214d3f16 Update README.md 2013-05-09 15:39:57 -06:00
Lars Norpchen
905c3dbea6 Update README.md 2013-05-09 15:38:03 -06:00