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
Gina Häußge
363f00775b
New config options for daemonization, configfile location and basedir location
...
Using --daemon {start|stop|restart} OctoPrint can now be daemonized/controlled in daemon mode. Via --pidfile it's possible to set the pidfile to use, --configfile allows specification of the config.yaml to use, --basedir specifies the location of the basedir from which to base off the upload, timelapse and log folders. I also updated the README to include some config file settings which were previously undocumented.
2013-03-11 21:00:43 +01:00
Tom
f10e10f5b3
Converts commands uppercase
2013-03-11 10:39:03 -04: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
b23098a265
Fixed TimedTimelapse
...
Fixed access of interval attribute
2013-03-11 09:39:54 +01:00
Gina Häußge
09adb8dfda
Fixed TimedTimelapse
...
Interval parameter gets now accessed correctly
2013-03-11 09:38:36 +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
53d6ee2484
Added credits to daemon.py
2013-03-10 21:08:14 +01:00
Gina Häußge
1b1f118646
Merge branch 'richardjm-daemon' into daemon
...
Conflicts:
octoprint/server.py
2013-03-10 19:11:16 +01:00
Gina Häußge
ff1678ab30
Set shell=True in subprocess calls to allow usage of string commands (instead of lists separating command from arguments)
2013-03-10 17:17:50 +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
Richard Mitchell
07caef034b
Improve comment reason
2013-03-10 13:40:53 +00:00
Richard Mitchell
37f3f771fb
Incorrect indentation
2013-03-10 13:18:34 +00:00
Richard Mitchell
7226c1edae
Lots of work to daemonise - logging still not working
2013-03-10 13:14:37 +00: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
1d2a2c873f
Fixed settings for ffmpeg path
2013-03-09 00:29:07 +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
70f5ea3f7f
Fixed configuration of snapshot url
2013-03-08 23:24:30 +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
Gina Häußge
95d6c18183
Use contrast function for calculating text color in navbar
2013-03-08 20:36:18 +01:00
Richard Mitchell
26c6c0fb5f
Missing semi-colon causing problems
2013-03-08 06:34:31 +00: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
59ffa94cde
Playing around with less...
2013-03-06 23:38:31 +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
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
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
63888f5e2e
Merge branch 'AxTheB-devel' into devel
2013-03-02 13:29:08 +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
Gina Häußge
bd28c73bc5
Merge branch 'richard-jm/appearance' into devel
2013-03-02 12:20:24 +01:00
Richard Mitchell
260606601d
Title and limited color control via settings
2013-03-02 10:56:32 +00:00
Richard Mitchell
943d734993
That was easy enough to continue temp monitoring whilst paused
2013-03-01 22:19:58 +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
Václav 'Ax' Hůla
d667a0ff56
Fix filament measurement for relative extruders
2013-03-01 17:55:25 +01:00
Gina Häußge
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
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
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
aa2108e9c3
Change to ° required binding to html
2013-02-23 18:02:14 +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
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
Gina Häußge
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
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
0266bcd593
optimize image file size on iOS web clip icons
2013-02-16 23:32:31 -06:00
Dale Price
48f0af2e7a
Add iOS web clip icons
2013-02-16 23:28:23 -06:00
Gina Häußge
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
Gina Häußge
b64662c460
Merge remote-tracking branch 'origin/devel' into devel
2013-02-16 11:49:20 +01:00
Richard Mitchell
9127cf01a0
float buttons to left to eliminate whitespace
2013-02-13 20:04:09 +00:00
Alex Ustyantsev
9e1760fb36
Fixed bug preventing from being able to connect to printer
2013-02-13 18:19:18 +03: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
142d07be21
Equalized the size of the button with the input control
2013-02-10 09:34:53 +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
9f52e90e44
Merge branch 'ajd4096-master' into devel
2013-02-06 19:56:45 +01:00
Gina Häußge
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
Gina Häußge
3de0d1b1e5
Fixed file deletion for gcode files
2013-02-04 21:41:02 +01:00
Andrew Dalgleish
53ce8953de
Add support for M82/M83 absolute/relative extruder positions
2013-02-04 16:53:01 +11: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
a1763554e4
Remove duplicate css files
2013-02-03 12:52:27 +03:00
Alex Ustyantsev
1b70801a6b
Fixed some residual stuff after rebase
2013-02-03 12:44:41 +03:00
Alex Ustyantsev
4163d9436f
Some cleanup from initial integration: removed separate icon for viewing gcode
2013-02-03 12:05:45 +03: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
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
Alex Ustyantsev
644e5907ec
Auto-load file on connect; some refactoring
2013-02-03 12:02:41 +03:00
Alex Ustyantsev
4b69bde8bb
Initial implementation of autoupdate gcodeview on status from server
2013-02-03 12:02: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
8d90ad26ba
Fixed exception triggered on analysis abort
2013-02-01 11:01:20 +01: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
8c038a6829
Merge branch 'master' into devel
2013-01-27 12:55:23 +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
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
Gina Häußge
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
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
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
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