9b3fc0c65e
Set default instance name to empty string
2013-03-03 16:57:35 +01:00
eecb19ecf6
store file sorting options in the browser's LocalStorage
2013-03-02 22:56:58 -06:00
c1f2866a94
Moved totalExtrusion calculation into existing branches, added calculation of currentE for relative extruders (in case GCODE switches back to absolute)
2013-03-02 13:39:44 +01:00
766e9f0e7f
Show custom title first in head in case of small tabs
2013-03-02 13:38:30 +01:00
63888f5e2e
Merge branch 'AxTheB-devel' into devel
2013-03-02 13:29:08 +01:00
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
bd28c73bc5
Merge branch 'richard-jm/appearance' into devel
2013-03-02 12:20:24 +01:00
260606601d
Title and limited color control via settings
2013-03-02 10:56:32 +00:00
943d734993
That was easy enough to continue temp monitoring whilst paused
2013-03-01 22:19:58 +00:00
b2408c92a5
Didn't add the restart button after all
2013-03-01 21:57:13 +00:00
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
d667a0ff56
Fix filament measurement for relative extruders
2013-03-01 17:55:25 +01:00
727b4659cb
Bugfix: added getter for interval attribute on TimedTimelapse, went missing since a refactoring a couple of weeks back.
2013-02-28 09:46:26 +01:00
c015a67a70
Fixed some whitespace
2013-02-23 23:55:26 +01:00
899d618efe
Couple of fixes while merging...
2013-02-23 22:46:29 +01:00
e828d4e7b7
New settings split off
2013-02-23 19:37:38 +00:00
0e6fd2bde2
Merge remote-tracking branch 'upstream/devel' into devel
2013-02-23 18:40:28 +00:00
e79aede3f4
Bug in bootstrap forcing use of knockout click binding - actually works better
2013-02-23 18:38:18 +00:00
aa2108e9c3
Change to ° required binding to html
2013-02-23 18:02:14 +00:00
8a3df3d4e7
Easier than I thought to add/remove temperature profiles
2013-02-23 17:59:27 +00:00
9ba88a7d1a
New temperature profile settings and hooked into ui. WIP: add and remove profiles
2013-02-23 17:47:01 +00:00
2e766a7eca
Added custom controls with multiple commands
...
Closes #48
2013-02-23 18:08:59 +01:00
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
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
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
1c9854b6c1
Merge branch 'master' into devel
2013-02-17 22:31:11 +01:00
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
cbae792dbe
Added logging to file on top of to stdout, temperature parsing now can cope with negative temperature (shouldn't normally occur but seems to happen with buggy firmware), added option to wait for "start" response from printer firmware before switching to state "operational" (defaults to previous behaviour)
2013-02-17 17:47:06 +01:00
e4f06ba0d0
Revert "Add tooltips to explain some icon-only controls"
...
This reverts commit 96fb0c2ce1
2013-02-17 00:18:30 -06:00
96fb0c2ce1
Add tooltips to explain some icon-only controls
2013-02-17 00:08:16 -06:00
0266bcd593
optimize image file size on iOS web clip icons
2013-02-16 23:32:31 -06:00
48f0af2e7a
Add iOS web clip icons
2013-02-16 23:28:23 -06:00
f03056c1b2
Made settings module more flexible regarding variable path lengths to needed values, made speed for printer movement configurable
2013-02-16 20:28:09 +01:00
b64662c460
Merge remote-tracking branch 'origin/devel' into devel
2013-02-16 11:49:20 +01:00
9127cf01a0
float buttons to left to eliminate whitespace
2013-02-13 20:04:09 +00:00
9e1760fb36
Fixed bug preventing from being able to connect to printer
2013-02-13 18:19:18 +03:00
22e5f656fe
Sort out the spacing and alignment on jog controls
2013-02-10 21:12:38 +00:00
bd68e0ae54
Added sorting and filtering options for gcode files.
...
Closes #21
2013-02-10 21:48:24 +01:00
4035ebcec5
Various control for jogging, speed reduced
2013-02-10 16:00:47 +00:00
142d07be21
Equalized the size of the button with the input control
2013-02-10 09:34:53 +00:00
e07043bf36
Realised I wanted to use the fan control during printing
2013-02-10 09:07:50 +00:00
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
f09d57bef9
Started work on adding extrusion control
2013-02-09 23:20:41 +01:00
7fb354a256
Added controls I want (motors off, fans on/off) - they perhaps should be custom
2013-02-09 12:07:31 +00:00
878bee784a
Modified the appearance of the jogging controls with a view to adding finer control
2013-02-09 11:22:09 +00:00
9f52e90e44
Merge branch 'ajd4096-master' into devel
2013-02-06 19:56:45 +01:00
5f55ebd90a
GCode file list now automatically switches to page with newly uploaded file as soon as upload request comes back from backend as finished. Progress bar also gets emptied again then. Careful: might take a bit after the upload progress reaches 100% since the file still has to be written to disk in the backend (have to look into how to get this done in a streaming way), metadata analysis gets triggered after returning a response.
...
Different sorting options are still on my mental todo list ;)
Closes #34 .
2013-02-04 22:24:32 +01:00
3de0d1b1e5
Fixed file deletion for gcode files
2013-02-04 21:41:02 +01:00
53ce8953de
Add support for M82/M83 absolute/relative extruder positions
2013-02-04 16:53:01 +11:00
0bcbd20213
Removed stripes from gcode table, fixed a tiny bug
2013-02-03 22:34:52 +01:00
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
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
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
a1763554e4
Remove duplicate css files
2013-02-03 12:52:27 +03:00
1b70801a6b
Fixed some residual stuff after rebase
2013-02-03 12:44:41 +03:00
4163d9436f
Some cleanup from initial integration: removed separate icon for viewing gcode
2013-02-03 12:05:45 +03:00
e49669430b
gCodeVisualizer can be enabled as a feature in config now (enabled by
...
default)
2013-02-03 12:04:41 +03:00
a5518f7877
Bug: octoprint deleted all commented lines, now gcodevisualizer deletes them too so the line numbers match
2013-02-03 12:02:41 +03:00
644e5907ec
Auto-load file on connect; some refactoring
2013-02-03 12:02:41 +03:00
4b69bde8bb
Initial implementation of autoupdate gcodeview on status from server
2013-02-03 12:02:41 +03:00
7c00dd5594
Initial gCodeViewer ( http://github.com/hudbrog/gCodeViewer ) integration
2013-02-03 12:01:01 +03:00
8d90ad26ba
Fixed exception triggered on analysis abort
2013-02-01 11:01:20 +01:00
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
84c9403e65
parametrized_command => parametric_command
2013-01-27 18:52:25 +01:00
ee7a1f9615
Added custom controls via configuration file.
...
Closes #13
2013-01-27 18:28:11 +01:00
8c038a6829
Merge branch 'master' into devel
2013-01-27 12:55:23 +01:00
0552d43b16
Further work on custom controls and custom bitrate for timelapses
2013-01-27 11:12:28 +01:00
9e964ea393
Switched config format from ini to yaml to allow more complex configuration options (in this case for custom controls)
2013-01-22 21:32:14 +01:00
01ffd88a37
Use UTC timestamps only for the temperature graph. Should get rid of weird timestamps in case server and client are in a different timezone.
...
Also fixed the "display minutes since the epoch when not connected to a freshly started server" issue ;)
2013-01-22 17:44:20 +01:00
ca3c973bfc
Added checkbox to enable autoscroll in the terminal tab.
2013-01-20 14:34:44 +01:00
1e77467a41
Added pagination for gcode files.
2013-01-20 13:43:29 +01:00
126ca22f99
Moved LICENSE file to root directory to make it more visible. Added hint to README.md that OctoPrint is released under AGPL
2013-01-20 00:29:48 +01:00
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
Gina Häußge