pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3875 commits 20 branches 22 tags 141 MiB
Commit graph

60 commits

Author SHA1 Message Date
Gina Häußge
aae01fe81b Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	docs/api/fileops.rst
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/api/files.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/sidebar/state.jinja2
	src/octoprint/util/comm.py
 2016-07-28 15:00:23 +02:00
Gina Häußge
f9cb29ac91 A bunch of documentation fixes and updates 2016-07-28 09:43:41 +02:00
Gina Häußge
0fec3aeca9 Merge branch 'patch-1' of https://github.com/cvignac/OctoPrint into maintenance 2016-07-12 11:52:27 +02:00
cvignac
12fcfda481 Typo correction in slicing.rst 
In 'Retrieve all slicing profiles' :
'GET /api/slicing/profiles' -> 'GET /api/slicing'
 2016-07-10 15:40:24 +03:00
Gina Häußge
294203ffd5 Add absolute jog mode to printer API 2016-07-01 17:54:26 +02:00
Gina Häußge
52d272bd24 More work on the docs 2016-07-01 17:52:40 +02:00
Gina Häußge
72bc30eae5 Merge branch 'devel' into dev/jsclientdocs 
Conflicts:
	src/octoprint/static/js/app/viewmodels/printerstate.js
 2016-06-30 13:04:57 +02:00
Gina Häußge
2971c29f10 Merge branch 'improve/pauseApiCommand' into devel 
Conflicts:
	src/octoprint/static/js/app/viewmodels/printerstate.js
 2016-06-30 13:01:13 +02:00
Gina Häußge
73a85646c5 Added only pause/resume sub commands to job API 
Implements #1393
 2016-06-30 12:56:18 +02:00
Gina Häußge
cec2f7d917 WIP: More work on the documentation of the js client lib 2016-06-30 12:06:08 +02:00
Gina Häußge
7207421051 Docs for new typePath property in file model 2016-06-28 13:02:23 +02:00
Doug Calobrisi
ebb93d9d2f Corrects example URL in Slicing API Doc 
This fixes a simple typo in the API doc for fetching slicing profiles. The previous example had /profiles appended to it, whereas it should just be /api/slicing to fetch a list of all slicers and profiles.
 2016-05-20 10:28:44 -04:00
Gina Häußge
780794c466 Merge branch 'development' of https://github.com/bwgan/OctoPrint into pr/bwgan/development 
Conflicts:
	src/octoprint/daemon.py
 2016-01-29 09:04:58 +01:00
bwgan
f8c0df4e78 Typo and spelling fixes 
Fixes various spelling issues and typos.
 2016-01-28 18:59:38 +00:00
Gina Häußge
36ae6dd6b9 Added adaptive rate limiting to client 
The client now tries to detect if it's fast enough to process the
state updates usually send every 500ms, and if not notifies the
server to throttle the rate (e.g. to 1/1s, 1/1.5s etc).

Additionally, since the terminal tab of the client turned out to
be quite CPU intense when line number calculation, filtering etc
is enabled, the terminal tab now also falls back into a bit less
fancy mode if it detects its being processed too slow and optionally
even disables logging completely during printing (where a lot
of log messages need to be processed in a minimum amount of
time).

That way the UI should stay responsive even on very low powered
clients (e.g. chromium on a Pi), while printing.
 2016-01-27 12:04:17 +01:00
Gina Häußge
93bbedae86 Only process bed temps & commands if printer profile has heated bed 
Solves #1125
 2015-11-30 11:11:35 +01:00
Andres
37730616c1 Fixed wrong urls 
(cherry picked from commit 119f3ba)
 2015-10-29 09:41:17 +01:00
Gina Häußge
9ff5c36370 Fixed a documentation bug 2015-09-28 13:08:35 +02:00
Gina Häußge
9e12a8353b Small update for API docs, more necessary 2015-06-19 23:46:17 +02:00
Gina Häußge
fb5aaffdc1 Added a "fake ack" button to terminal tab, as counter measure for lost "ok"s 
In case an ok gets lost on the line, this allows to have the communication between
OctoPrint and the printer take up again.
 2015-04-27 18:13:39 +02:00
Gina Häußge
023b6f9d81 Small fixes prior to merge of #849 
* Renamed userjson to userdata, removed original userdata (developers will live if they need to ensure their supplied userdata is valid JSON)
   * Input validation for userdata parameter - a HTTP 400 response will be generated if userdata can't be parsed as JSON
   * Adjusted documentation accordingly
 2015-04-16 16:05:23 +02:00
Jack Minardi
fb99c56985 document new optional form parameters 2015-04-06 16:45:29 -04:00
Gina Häußge
05f6425a53 Fixed some documentation and implementation details on the slicing API 2015-03-19 21:03:28 +01:00
Gina Häußge
aecc7a4734 Added triggering GCODE scripts to the REST API and custom controls 2015-03-06 16:04:43 +01:00
Gina Häußge
18b2b7dfe8 Fixed warnings in documentation build 2015-03-02 16:03:37 +01:00
Gina Häußge
4abcf1054b Added controls for changing feed and flow rate factors to Controls tab 
Closes #362
 2015-02-22 21:20:56 +01:00
Gina Häußge
762ec228da More work on the documentation 2015-01-16 17:11:31 +01:00
Gina Häußge
c9c4066331 Fixed a bunch of doc issues, updated /api/printer/command to have more meaningful error messages 2014-12-31 15:47:12 +01:00
Gina Häußge
835b973bdc Merge branch 'patch-1' of https://github.com/bortek/OctoPrint into devel 
Conflicts:
	docs/api/printer.rst
 2014-12-31 15:19:18 +01:00
bortek
2b7885c3f8 Update printer.rst 2014-12-30 12:18:39 +01:00
Gina Häußge
5784ab82ef WIP: Adding option to start printing directly after slicing 2014-12-04 15:31:00 +01:00
Gina Häußge
636e79672a The API now allows to specify where on the print bed to put the sliced model's center 2014-12-04 12:52:33 +01:00
Gina Häußge
a149cdc4f5 Added the nozzle diameter to the printer profile (needed for slicing, cura plugin uses it too) 2014-12-02 12:41:25 +01:00
Gina Häußge
fc777e69e2 API Documentation updated for printer profiles (still a WIP though) 2014-12-02 11:57:03 +01:00
Gina Häußge
9d66aea843 Documentation and changelog entries updated 2014-11-17 13:49:46 +01:00
Gina Häußge
90618723d4 Parse slicing progress from Cura and provide it on sock.js socket 
UI for now displays it in the "Slicing" progress bar text.
 2014-10-20 18:58:04 +02:00
Gina Häußge
44109f9d8f Automatically cancel running slicing jobs targeting the same output file if a new slicing request is received 
This way there won't be two concurrent jobs trying to slice to the same file, which would practically render the cpu cycles from any slicing jobs than the final one wasted. Also adds a new event "SlicingCancelled" that will be sent in these cases.
 2014-10-20 13:40:04 +02:00
Gina Häußge
cd973adedf Improved slicing and file management 
- File management is prepared to support folders (UI still lacking support)
- STL files are now first class citizens
  - can be managed via the file list (and filtered from it)
  - can be sliced on demand
- Slicing now happens via plugins
- Added Cura plugin
  - uses CuraEngine directly instead of full Cura installation
  - Cura profile importer for importing profiles from regular Cura installs via settings dialog
  - TODO: UI for editing profiles
- API for slicing and slicing profile management
 2014-10-06 17:34:07 +02:00
Gina Häußge
e4cc84b771 Merge branch 'master' into devel 
Conflicts:
	docs/index.rst
	setup.py
	src/octoprint/server/__init__.py
	src/octoprint/server/api/__init__.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/gcodeviewer/js/renderer.js
	src/octoprint/static/js/app/viewmodels/printerstate.js
	src/octoprint/static/less/octoprint.less
	src/octoprint/templates/index.jinja2
 2014-08-31 15:28:07 +02:00
Gina Häußge
9b3569be50 Added release notes for 1.1.0 and documentation of OctoPrint's events and the version resource 2014-08-31 15:17:32 +02:00
Gina Häußge
f9d1086062 UI now displays last print time as approx. total print time if available, otherwise uses estimated print time if available 
Closes #523
 2014-07-31 18:16:53 +02:00
Gina Häußge
d8f1387703 Renamed a file 2014-06-08 16:54:17 +02:00
Gina Häußge
522eb40808 Documented SockJS interface, deprecated /api/state 2014-06-08 16:52:28 +02:00
Gina Häußge
f7e1b39af9 Added checkbox to the settings dialog for CORS, also slight changes in the documentation 2014-06-07 13:21:54 +02:00
Jon Nordby
33005ea243 API: Add documentation for newly added cross-origin config option 2014-06-07 01:27:07 +02:00
Gina Häußge
9ab4fa608a Corrected typo for print bed command "offset", expected parameter is called "offset" not "offsets" 
Compare #444
 2014-04-18 14:03:38 +02:00
Gina Häußge
e373cde4f7 Some more work on the REST API documentation & set Location header on file upload response 2014-03-24 22:50:56 +01:00
Gina Häußge
072079df05 Further work on the REST API, documented most of /api/printer and while at it also fixed #365 2014-03-24 18:27:43 +01:00
Gina Häußge
ace102e1c1 Added API documentation, adjusted API and returned data model slightly to be consistent with other parts of the API, made log file management restricted to admins. 
TODO: Make downloading of logs also restricted to admins
 2014-02-24 09:57:51 +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