Commit Graph

1000 Commits (4035ebcec5295d2e26de86311cf5976624abfc9b)

Author SHA1 Message Date
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 95c6d9a9fc Merge branch 'devel-richardjm' 2013-02-10 00:40:17 +01: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 eeb2036bab Merged devel to master, adjusted README a bit. 2013-02-09 23:28:00 +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 d7fd43f9d9 Merge branch 'master' into devel 2013-02-06 19:59:57 +01:00
Gina Häußge 5df3f248b5 Merge pull request #36 from ajd4096/master
Add support for M82/M83 absolute/relative extruder positions
2013-02-06 10:59:26 -08: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 7d4dc54bdf Added gcode viewer setting to the README 2013-02-03 22:02:57 +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 ebc7352a42 config.ini is now config.yaml 2013-01-27 18:30:07 +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 357514ca0e Added instructions on what to do after the rename 2013-01-27 11:23:55 +01:00
Gina Häußge 1482292b33 Added instructions on what to do after the rename 2013-01-27 11:23:01 +01:00
Gina Häußge 05c5a679f2 Merge remote-tracking branch 'origin/master' 2013-01-27 11:14:50 +01:00
Gina Häußge df443f335c Updated README after repository rename 2013-01-27 11:14:42 +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 ac907cf942 Update README.md
Added dependency on subversion package for compiling mjpg-streamer
2013-01-21 18:38:31 +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 072205ee82 Added forgotton sudo to pip command, thanks Andreas Gohr for spotting this. 2013-01-19 13:31:46 +01:00
Gina Häußge e54f1e683d Name explanation 2013-01-19 00:06:41 +01:00
Gina Häußge 56e211f5ec Updated README for merge of socketio branch. 2013-01-18 23:44:12 +01:00
Gina Häußge c77df98980 Changed instructions to use run shellscript 2013-01-18 23:44:12 +01:00
Gina Häußge cff0274c0c Fixed startup script 2013-01-18 23:44:11 +01:00