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

105 commits

Author SHA1 Message Date
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
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
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
1441a7dbd8 Added missing image resource 2013-06-03 22:25:23 +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
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
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
039a17d923 First try at SD card support 2013-05-20 19:18:03 +02:00
Gina Häußge
fc56744705 Fixed URL for setting timelapse configuration. 
Closes #110
 2013-05-01 20:17:30 +02:00
Gina Häußge
d721e5edc2 Merge branch 'devel' into repetier 
Conflicts:
	octoprint/util/comm.py
 2013-04-16 15:14:18 +02:00
Gina Häußge
628ffb5600 Do not convert command to send to upper case after checksum was calculated 
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"

Should fix #103
 2013-04-16 14:45:25 +02:00
Gina Häußge
552048efbe Fixed Modernizr queries by gcode renderer 2013-04-14 13:42:30 +02:00
Gina Häußge
7e82214d75 Added missing files 2013-04-14 13:15:54 +02:00
Gina Häußge
f7334ef65f Fixed some merge bugs 2013-04-13 22:26:23 +02:00
Gina Häußge
19dc238f06 User management now working 
Also reorganized javascripts a bit (as preparation for some refactoring coming up) and renamed templates from ".html" to ".jinja2".
 2013-04-13 22:21:53 +02:00
Gina Häußge
244ff25e2f Fixed settings for gcode file list 2013-04-13 22:20:41 +02:00
Gina Häußge
3e5a6d3679 Furhter work on user management 2013-04-13 22:20:41 +02:00
Gina Häußge
1febcd671a "Writing" backend methods now protected (need logged in user (or dummy user if access control is disabled) to perform action), most "writing" frontend controls disabled if no logged in (or dummy) user returned from backend. 2013-04-13 22:19:17 +02:00
Gina Häußge
874a7421e9 Login and logout working for the first time 2013-04-13 21:45:20 +02:00
Gina Häußge
150d6cb53d First work on login and user management 2013-04-13 21:42:53 +02:00
Gina Häußge
34a860efda Added confirmation dialog and different logo for print job restart 
Closes #98
 2013-04-10 16:37:12 +02:00
Gina Häußge
3174559072 Moved webcam view to Control tab 2013-04-07 22:15:04 +02:00
Gina Häußge
e70071f6c1 Removed waitForWait again (that didn't make much sense to begin with...) 2013-04-01 17:31:02 +02:00
Gina Häußge
9618407aed Merge branch 'devel' into repetier 
Conflicts:
	octoprint/server.py
 2013-04-01 17:25:08 +02:00
Gina Häußge
c01b49fbc7 Forgot to commit Font Awesome 2013-03-30 18:29:13 +01:00
Gina Häußge
cfdfad1c06 Changed color and font-size of footer 2013-03-30 18:28:24 +01:00
Gina Häußge
b5b023a29c Merge remote-tracking branch 'splitbrain/footer' into devel 2013-03-30 18:22:33 +01:00
Gina Häußge
f70649b0d2 Removed a couple of redundancies for loadAndPrint button, actions are now disabled if they don't make sense 2013-03-30 18:21:49 +01:00
Gina Häußge
f050567a1c User thread lock instead of boolean to ensure only one concurrent sending thread, introduced wait flag for repetier printers 2013-03-29 22:17:44 +01:00
Dale Price
021f413c12 add "Load and Print" button which automatically starts printing when a gcode file is done loading. 
Solves foosel/OctoPrint#91
 2013-03-26 00:09:36 -05:00
Andreas Gohr
9314e83665 added footer 
makes it faster, to refer to the OctoPrint site when problems occur.
 2013-03-24 16:11:54 +01:00
Gina Häußge
d6a83d174f Overhauled resend handling to also work with alwaysSendChecksum feature. Also introduced new feature flag resetLineNumbersWithPrefixedN to make M110 commands send the target line number as part of their N prefix (Repetier), not as a separate N parameter (Marlin & co) 2013-03-16 18:25:39 +01:00
Gina Häußge
8ef580cfd9 Two changes to try to achieve repetier firmware compatibility 
- Read a "wait" as an empty line in order to send keep alive temperature updates
- Added option to add a checksum to all commands. Needed to add current line tracking for this, let's hope that we'll never get out of synch here...
 2013-03-16 01:57:05 +01:00
Gina Häußge
e08783c8bf Merge remote-tracking branch 'daprice/master' into devel 2013-03-16 00:28:37 +01:00
Dale Price
088253e564 work around a bug in iOS 6 where ajax requests get cached and only work once 2013-03-14 20:55:02 -05:00
Dale Price
d564176c9c fix localStorage bug by not trying (and failing) to make it a multidimensional array; use JSON to store array of filters in localStorage 2013-03-13 03:01:18 -05:00
Gina Häußge
4b8260b933 Fixed some indentation 2013-03-11 21:46:05 +01:00
Gina Häußge
e2798de727 Merge branch 'daftscience-master' into devel 2013-03-11 21:15:27 +01:00
Tom
2904bd62d7 Enter key sends command 
Sending a command also clears the field.
 2013-03-11 10:38:41 -04:00
Gina Häußge
eb3832b028 Implemented support for customizable system actions/commands, e.g. for shutting down/rebooting the system OctoPrint's running on from within the UI. 2013-03-10 17:04:05 +01:00
Gina Häußge
07d4a8fd4f Added (optional!) watermark addition to generated timelapse movies. 2013-03-09 00:23:52 +01:00
Gina Häußge
3b50fdcf3f Switched column sizes for gcode and timelapse file tables to pixel values. 2013-03-08 23:25:04 +01:00
Gina Häußge
133831e08e Fixed buggy column styles for gcode and timelapse file tables 2013-03-08 21:47:51 +01:00
Gina Häußge
f1dc0a629a Fixed state information for gcode file upload. Now offers some status text that gives feedback whether file is still uploading to the server or being saved to disk on the server. 2013-03-08 21:05:53 +01:00