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

113 commits

Author SHA1 Message Date
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
46173bc35e Merge branch 'webcamMove' into devel 2013-04-07 22:15:15 +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
d20aae6474 Added homepage to footer 2013-04-01 17:23:56 +02:00
Gina Häußge
edea3789b2 Made Webcam omnipresent 2013-04-01 17:20:25 +02: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
Dale Price
71f3dbbdcc add tooltips to file controls 2013-03-25 23:55:53 -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
1ebc0c0ce9 Temporary workaround for the gcode viewer options not cooperating until those are integrated a bit more. 
Targets #35.
 2013-03-10 22:06:08 +01: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
a261896186 Fixed using wrong item collection for timelapse files, lead to always displaying all files, not just the ones of the current page. 2013-03-09 12:58:15 +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
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
Gina Häußge
6eb8991035 Migrated ui.css to LESS (just some small touch ups compared to plain css version, nothing fancy) 2013-03-07 22:19:33 +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
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
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
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
c015a67a70 Fixed some whitespace 2013-02-23 23:55:26 +01:00
Gina Häußge
899d618efe Couple of fixes while merging... 2013-02-23 22:46:29 +01:00
Richard Mitchell
e828d4e7b7 New settings split off 2013-02-23 19:37:38 +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
aa2108e9c3 Change to ° required binding to html 2013-02-23 18:02:14 +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
Richard Mitchell
42838f8b58 Fixed the navigate to top of page on e.g. Set ABS issue 
Also replaced to HTML ° for degrees symobol
 2013-02-23 10:11:42 +00:00
Richard Mitchell
4c35adb347 Separated settings into separate template to improve ease of maintenance. 
Reduced word witdth and added add-ons for units.
 2013-02-23 10:01:52 +00:00
Richard Mitchell
9e351339a4 Added features for quick setting of temperatures for PLA and ABS - configured via new settings. 
Not perfect, I'd like to show temperature to be set in UI.
On clicking it always moves to the top of the page.
The overflow and temp layout changes are to allow the drop down to display outside of the tab.

Is it worth having more temp boxes e.g. Nylon? - array like similar to move speeds?
 2013-02-23 01:09:30 +00:00
Gina Häußge
1c9854b6c1 Merge branch 'master' into devel 2013-02-17 22:31:11 +01:00
Gina Häußge
1c4203b708 Added settings dialog for configuring OctoPrint 
Warning: Many settings will need a restart of OctoPrint to take effect, adding corresponding notes is still a TODO. There's also no proper validation and error handling yet, so use at your own risk.
 2013-02-17 22:30:34 +01:00
Dale Price
e4f06ba0d0 Revert "Add tooltips to explain some icon-only controls" 
This reverts commit 96fb0c2ce1.
 2013-02-17 00:18:30 -06:00
Dale Price
96fb0c2ce1 Add tooltips to explain some icon-only controls 2013-02-17 00:08:16 -06:00
Dale Price
48f0af2e7a Add iOS web clip icons 2013-02-16 23:28:23 -06:00
Richard Mitchell
9127cf01a0 float buttons to left to eliminate whitespace 2013-02-13 20:04:09 +00:00
Richard Mitchell
22e5f656fe Sort out the spacing and alignment on jog controls 2013-02-10 21:12:38 +00:00
Gina Häußge
bd68e0ae54 Added sorting and filtering options for gcode files. 
Closes #21
 2013-02-10 21:48:24 +01:00
Richard Mitchell
4035ebcec5 Various control for jogging, speed reduced 2013-02-10 16:00:47 +00:00
Richard Mitchell
e07043bf36 Realised I wanted to use the fan control during printing 2013-02-10 09:07:50 +00:00
Gina Häußge
8c9c2ecfee Added extrusion controls, kept motor and fan controls in general control area as suggested (recurring demand suggests that they definitely aren't something to be added by anyone individually via custom controls), made custom controls always position themselves below the general stuff. 2013-02-10 00:40:06 +01:00
Gina Häußge
f09d57bef9 Started work on adding extrusion control 2013-02-09 23:20:41 +01:00
Richard Mitchell
7fb354a256 Added controls I want (motors off, fans on/off) - they perhaps should be custom 2013-02-09 12:07:31 +00:00
Richard Mitchell
878bee784a Modified the appearance of the jogging controls with a view to adding finer control 2013-02-09 11:22:09 +00:00
Gina Häußge
0bcbd20213 Removed stripes from gcode table, fixed a tiny bug 2013-02-03 22:34:52 +01:00
Gina Häußge
959feba9ca First version with gcode viewer integration. 
Did some minor changes: renamed gcode tab, renamed gcode file download endpoint, added some margin for gcode viewer accordion. Not sure yet what to do about the gcode viewer controls/settings, until I figure this out they'll stay where they are now ,)
 2013-02-03 22:01:11 +01:00
Gina Häußge
ea52bbfb14 Merge branch 'gcodeViewer' into devel 
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/static/js/ui.js
 2013-02-03 21:38:00 +01:00
Gina Häußge
6fd0646128 Revamped gcode analysis. 
Now UI and backend take data from saved metadata (if available). Metadata gets written after file upload and also on startup (for files that have not been added yet). Gcode analysis is interrupted if a printjob is started and resumed when it ends. Frontend is notified when new metadata comes available and UI triggers reload of gcode file list.  Also started on implementing proper logging.
 2013-02-03 21:14:22 +01:00
Alex Ustyantsev
e49669430b gCodeVisualizer can be enabled as a feature in config now (enabled by 
default)
 2013-02-03 12:04:41 +03:00
Alex Ustyantsev
7c00dd5594 Initial gCodeViewer (http://github.com/hudbrog/gCodeViewer) integration 2013-02-03 12:01:01 +03:00
Gina Häußge
49cd1ffbd6 Gcode filemanagement now lives in its own module. Upload triggers gcode analysis, result is stored into metadata file. Print jobs triggered and their results are saved as well. Adjusted UI to display gcode analysis result and last print date and (color coded) result if available. Also adjusted gcode file list to color code entries according to last print result. 2013-01-30 20:56:17 +01:00
Gina Häußge
84c9403e65 parametrized_command => parametric_command 2013-01-27 18:52:25 +01:00
Gina Häußge
ee7a1f9615 Added custom controls via configuration file. 
Closes #13
 2013-01-27 18:28:11 +01:00
Gina Häußge
0552d43b16 Further work on custom controls and custom bitrate for timelapses 2013-01-27 11:12:28 +01:00
Gina Häußge
ca3c973bfc Added checkbox to enable autoscroll in the terminal tab. 2013-01-20 14:34:44 +01:00
Gina Häußge
1e77467a41 Added pagination for gcode files. 2013-01-20 13:43:29 +01:00
Gina Häußge
720f3b3eb6 Renamed from Printer WebUI to OctoPrint 
The location of the config folder has changed. OctoPrint will try to migrate the configuration from its old location (~/.printerwebui, ...) to its new one (~/.octoprint, ...). For this to work the following conditions must be met: 1) the old config folder exists and is a directory 2) the new config folder does not exist at all. The migration functionality will be in the future.
 2013-01-18 23:44:11 +01:00