Commit graph

1545 commits

Author SHA1 Message Date
Chris Kosmakos
b976461c29 minor cleanup on command history. removing unneeded var. 2014-02-23 19:02:00 -08:00
Chris Kosmakos
036e0af960 added basic terminal command history
use up/down keys to navigate through command history.
2014-02-20 10:46:22 +00:00
Gina Häußge
b115b6f66c Only list those SD files that have a ASCII filename
According to the RepRap protocol we should actually not ever get anything other than those anyways, as the protocol is defined as ASCII-only. In the future there might be a way to somehow handle such files too, for the time being this fixes issues though where non-ascii files on the SD made the whole SD file handling not work.

 Closes #381
2014-02-17 10:25:40 +01:00
Gina Häußge
592f3dce9a Bugfix: Do not run gcode analyzer when a print is ongoing
Evaluate active flag on gcode analyzer AFTER fetching an item from the work queue, otherwise it will always start working once it finds something if the active flag was true once but then switched to false while the queue was still empty.

Thanks to @Salandora for spotting this.

Fixes #357
2014-02-15 10:26:39 +01:00
Gina Häußge
bcef0dd2c5 Merge remote-tracking branch 'origin/devel' into devel 2014-02-15 10:02:05 +01:00
Gina Häußge
3f86272913 There's now a different mechanism in place to prevent mobile browsers from crashing on large gcode files being visualized 2014-02-15 10:00:14 +01:00
Gina Häußge
322834b762 Moved "Less scary error message" patch to new location 2014-02-15 09:58:52 +01:00
Gina Häußge
04ddf30167 Merge branch 'devel' into jamesgao-devel
Conflicts:
	src/octoprint/server.py
2014-02-15 09:58:11 +01:00
Gina Häußge
1935cc4841 Merge pull request #378 from MissionSt/fix-time-crash
fix crash when getStartTime() returns None
2014-02-15 09:37:17 +01:00
Gina Häußge
bd96571d8a Merge pull request #377 from MissionSt/api-doc-fix
Fix urls in connection API examples
2014-02-15 09:36:26 +01:00
Gina Häußge
aa253bf53e Merge pull request #379 from MissionSt/api-doc-fix-connect
API Doc: Fix response status code for connection POST success
2014-02-15 09:35:25 +01:00
Gabe Rosenhouse
b8a59097c2 correct response code for connection success 2014-02-14 22:51:27 -08:00
Gabe Rosenhouse
a630b74fa8 fix crash when getStartTime() returns None 2014-02-14 21:04:23 -08:00
Gabe Rosenhouse
3f7b222b92 fix up urls in API example requests 2014-02-14 11:33:53 -08:00
Gina Häußge
858873dfa0 Also provide the filename (basename without the path) in print events 2014-01-20 15:33:08 +01:00
Gina Häußge
7231acc236 Couple of multi extruder related fixes
- also recognize such temperature reports that do not contain a "T:" but a "T0:" (should help with parts of #345)
- properly parse temperature commands to track target temp during slow heatup
- for the former point, also keep track of the currently selected tool
- simulate heatup and replies without "T:" in virtual printer (to test all this)
- also auto-caps T commands in terminal
2014-01-11 15:15:46 +01:00
Gina Häußge
adea84e123 Teenytiny update to the API docs to indicate current state of temperature APIs (hint: still highly unstable and heavily being worked on conceptually) 2014-01-09 21:14:25 +01:00
Gina Häußge
565757580b TransferDone and SlicingDone events should also carry the seconds of elapsed time as a float instead of a (rounded) string 2014-01-09 21:06:03 +01:00
Gina Häußge
620d7de02f Added time needed for printing file to PrintDone event's payload
Fixes #333
2014-01-09 20:59:40 +01:00
Gina Häußge
417487e195 Also recognize --iknowwhatimdoing when running as daemon
Fixes #337
2014-01-09 20:04:08 +01:00
Gina Häußge
fba48b1d90 Do not reset extrusion amount in UI
Fixes #340
2014-01-09 19:59:21 +01:00
Gina Häußge
78f62847a3 Changed payload format of error event 2014-01-09 19:58:10 +01:00
Gina Häußge
3bfaa33c58 Don't prefix tool number for temperature command when only one extruder is present
Temporary workaround for #341
2014-01-08 19:32:04 +01:00
Gina Häußge
d0cb119bb0 A bit more error resilience for handling data received from the backend
See #339
2014-01-06 18:00:14 +01:00
Gina Häußge
3fc6b1e8cf If no tool offset is defined for the current extruder, just assume 0 instead of dying
Hopefully this fixes #339
2014-01-06 17:52:05 +01:00
Gina Häußge
ae06af9bc5 Make sure we always have color to draw lines with 2014-01-06 15:16:15 +01:00
Gina Häußge
260a378e8c Don't disable gcode viewer upon reset of connection 2014-01-06 11:16:10 +01:00
Gina Häußge
94e052af83 Set all heaters to off upon cancel of print job 2014-01-06 11:11:59 +01:00
Gina Häußge
d56ab9b79b Forgot a file... again 2014-01-06 00:17:09 +01:00
Gina Häußge
ad556e7413 More work on the GCode viewer
- confirmation dialog when trying to visualize large files (different threshold for mobile and "regular" devices, configurable of course, although only via config file right now) - should also help a bit with issues leading to #215
 - proper clearing of the viewer area when reconnecting to the backend (e.g. after server restart)

 Also all of this plus previous commits closes #35
2014-01-06 00:16:33 +01:00
Gina Häußge
b9f49a83e0 Refetch file list when deleting a file
See #338
2014-01-05 21:01:58 +01:00
Gina Häußge
ebec2c95c0 Some small fixes. 2014-01-05 14:42:01 +01:00
Gina Häußge
d62627c8a5 Made zooming on model work too 2014-01-05 13:22:42 +01:00
Gina Häußge
96d2c7fad9 Lots of changes:
- GCODE viewer now supports multiple extruders and configurable bed sizes
- GCODE viewer also now based on callbacks and config injection instead of dependence on elements in the embedding website
- Switched GCODE viewer to bootstrap-slider for the layer/command sliders, patched bootstrap-slider a bit up (TODO: PR to upstream)
- GCODE interpreter in backend also calculates filament usage for all extruders
- More consequent use of LESS, switched bootstrap to LESS source to have access to variables and mixins, introduced config setting to switch between usage of compiled CSS (checked in as well) or LESS, defaults to CSS
2014-01-05 11:23:44 +01:00
Gina Häußge
3aac75f5b5 Added pusher.color.js 2014-01-01 02:40:17 +01:00
Gina Häußge
908d39ad39 Refining temperature control REST API, also added support for multi extrusion while at it 2014-01-01 02:39:35 +01:00
Gina Häußge
084ffb0dc1 Multi extruder support for GCODE viewer
Filament usage calculation per layer is still buggy though
2014-01-01 02:37:44 +01:00
Gina Häußge
cec2bdb805 Send completion percentage as float (incl. available decimals) 2013-12-25 23:39:51 +01:00
Gina Häußge
a0374cb4ea Hopefully fixed the issue where the /printer/... part of the api wouldn't be loaded
I'm still not happy with that circular import stuff I'm currently doing... there must be a better way to better split stuff built with flask? To investigate...
2013-12-22 18:29:12 +01:00
Gina Häußge
538338abfe More work on the API + documentation
Changed some endpoints again (removed "/control" path element) and made API spit out only raw data (e.g. seconds, millimeters, unix timestamps etc) instead of formatted versions. Modified frontend to take care of formatting this data itself.
2013-12-22 02:01:48 +01:00
Gina Häußge
097e398efc Fixed test (did not yet match new return value format) 2013-12-21 16:15:22 +01:00
Gina Häußge
eccc9d6fbd WARNING: A lot of changes to the existing API and the event system.
This WILL break existing API clients and probably some event handlers too. I'm sorry for the disruptive changes, but I needed to rectify some decisions before they went too far utilized elsewhere to still be corrected.

 Basically this change completely removes the old API and switches it (same endpoint) with the new one, that's basically the existing AJAX API that the client uses, but way more RESTful and based on JSON (exception being the file upload).

 The event system has been revamped to carry more payload data (and in an extensible form as dictionary, to allow for later addition of attributes to single events), with the existing event listeners adjusted to also allow users to make use of this data in their consumers.

 Documentation has been greatly enhanced for the REST API (and is still being added to), the events will be documented here as well.
2013-12-21 14:46:20 +01:00
Gina Häußge
049ed723a7 Merge branch 'revampedEvents' into devel 2013-12-21 13:01:29 +01:00
Gina Häußge
b6cdc5803b More documentation 2013-12-21 13:01:18 +01:00
Gina Häußge
792299537d Some more documentation 2013-12-16 02:11:40 +01:00
Gina Häußge
7b01e72a9b Deleting a file of course work via DELETE, not POST 2013-12-16 01:49:17 +01:00
Gina Häußge
755549a745 Some further API documentation 2013-12-16 01:47:06 +01:00
Gina Häußge
1c39555255 Added a very small intro to the docs 2013-12-15 18:56:16 +01:00
Gina Häußge
ff5aba9a51 Forgot to commit images 2013-12-15 18:52:05 +01:00
Gina Häußge
467d012bce Added sphinx dependencies to requirements 2013-12-15 18:48:52 +01:00