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

74 commits

Author SHA1 Message Date
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
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
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
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
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
1fbb73e448 Refactored pagination/sorting/filtering of gcode files into own configurable listHelper now used to provide pagination etc to both gcode and timelapse file list. 2013-03-06 23:27:16 +01:00
Gina Häußge
dae1c0367a Merge branch 'daprice-sorting_persistence' into devel 
Conflicts:
	octoprint/static/js/ui.js
 2013-03-03 19:38:26 +01:00
Gina Häußge
98a7c3d8b8 New option to sort gcode files by size, reverted former utc "fix" (doesn't work anymore, works without the fix, I have no idea...), added adjusted modernizr, delete metadata from old gcode file version when adding a new one 2013-03-03 19:37:52 +01:00
Gina Häußge
9b3fc0c65e Set default instance name to empty string 2013-03-03 16:57:35 +01:00
Dale Price
eecb19ecf6 store file sorting options in the browser's LocalStorage 2013-03-02 22:56:58 -06:00
Gina Häußge
766e9f0e7f Show custom title first in head in case of small tabs 2013-03-02 13:38:30 +01:00
Gina Häußge
e0b405054a Fixed some whitespace and reworked custom title to always include an "OctoPrint" prefix (gotta protect the "brand" here ;)) 2013-03-02 12:42:35 +01:00
Richard Mitchell
260606601d Title and limited color control via settings 2013-03-02 10:56:32 +00:00
Richard Mitchell
b2408c92a5 Didn't add the restart button after all 2013-03-01 21:57:13 +00:00
Richard Mitchell
324601dfed Did clever stuff at first for restart but replacing the appearance of start is all that is needed I believe 2013-03-01 21:52:15 +00:00
Gina Häußge
899d618efe Couple of fixes while merging... 2013-02-23 22:46:29 +01:00
Richard Mitchell
0e6fd2bde2 Merge remote-tracking branch 'upstream/devel' into devel 2013-02-23 18:40:28 +00:00
Richard Mitchell
e79aede3f4 Bug in bootstrap forcing use of knockout click binding - actually works better 2013-02-23 18:38:18 +00:00
Richard Mitchell
8a3df3d4e7 Easier than I thought to add/remove temperature profiles 2013-02-23 17:59:27 +00:00
Richard Mitchell
9ba88a7d1a New temperature profile settings and hooked into ui. WIP: add and remove profiles 2013-02-23 17:47:01 +00:00
Gina Häußge
2e766a7eca Added custom controls with multiple commands 
Closes #48
 2013-02-23 18:08:59 +01:00