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

235 commits

Author SHA1 Message Date
Gina Häußge
76a04cbe9d Merge branch 'dev/python3B' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3B 2016-07-15 11:28:55 +02:00
MirceaDan
c33a9f9aa2 from __future__ import absolute_import, division, print_function 
changed the behavior to import division and print to be consistent
across all app and similar with python 3.x
 2016-07-15 00:16:58 -07:00
Gina Häußge
42e54f0fbc Fix missing path attribute for sd files on API 2016-07-08 15:44:37 +02:00
Gina Häußge
5bf5e336ec Extend payload in various events 
Added name and path various event print job events and
the upload event, deprecated the file property.

Had to move event triggering of the print job events to
the printer implementation, since the file manager
is not available in the comm layer. Added new callbacks
to the PrinterInterface to allow for that to be possible.
 2016-07-08 12:54:58 +02:00
Gina Häußge
2e8d104864 Fix resource URLs for files in folders 2016-07-08 10:42:50 +02:00
Gina Häußge
a2cd46899c Merge branch 'improve/intermediaryUrlsAndTimeouts' into devel 
Conflicts:
	AUTHORS.md
	src/octoprint/plugins/virtual_printer/virtual.py
 2016-07-06 13:32:03 +02:00
Mark Walker
5eefee3a4d RepRapFirmware style M23 select file 
RepRapFirmware enumerates the gcode files starting at /gcode, it will
also interpret any relative path as being relative to that folder.
However a full absolute path will actually interpret as from the real
root of the SD card :-(

(cherry-picked from ac68570)
 2016-07-06 05:17:44 +00:00
Gina Häußge
277860b831 Allow removal of folders 2016-07-04 18:59:06 +02:00
Gina Häußge
b07c352b48 Merge branch 'improve/slicingFlexibility' into devel 
Conflicts:
	src/octoprint/filemanager/__init__.py
	src/octoprint/server/api/files.py
	src/octoprint/static/js/app/viewmodels/slicing.js
 2016-07-04 10:24:43 +02:00
Gina Häußge
dbf1273e9d Use first destination extension for default target name 2016-07-02 18:10:05 +02:00
Gina Häußge
e7c21b1978 Support alternative source file types in SlicerPlugin 
Also limit list of slicers in slicer dialog to compatible slicers.

Implements #935
 2016-07-02 18:05:11 +02: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
08de33e27d Add path into file and folder entries & allow non recursive listings 2016-07-01 17:51:21 +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
c4a0b63a87 Add flag to disable model size detection & check 
Also marked feature as beta
 2016-06-28 14:47:17 +02:00
Gina Häußge
b39bb4c961 Move get_connection_options as classmethod into PrinterInterface 2016-06-27 12:19:28 +02:00
Gina Häußge
de78c14ae3 Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	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/loginstate.js
 2016-06-09 12:56:07 +02:00
Gina Häußge
5006b019af Add events for slicing profile manipulation 
Events SlicingProfile(Added|Modified|Deleted). Initially thought to be necessary
to properly refresh available profiles in slicing dialog, not needed for that after
all but still left in and documented, might be useful for someone.
 2016-06-06 18:12:32 +02:00
Gina Häußge
db66e4afea Merge branch 'maintenance' into devel 2016-06-02 12:05:08 +02:00
Gina Häußge
2833372603 Allow deletion of *.mp4 timelapse files 
That one was missing in a00faf2.

Fixes #1320
 2016-06-02 11:11:06 +02:00
Gina Häußge
7a69096a83 Merge branch 'gcodeVisualizerFileSizeThreshold' of https://github.com/philphilphil/OctoPrint into pr/philphilphil/gcodeVisualizerFileSizeThreshold 
Conflicts:
	src/octoprint/settings.py
 2016-05-09 12:47:06 +02:00
Gina Häußge
2fc393f02e Fixed settings for fahrenheit appearance option 2016-05-09 11:40:39 +02:00
Philipp Baum
9316105224 Added setting to change GCode-visualizer file size threshold to ui #1145 2016-04-11 19:57:08 +02:00
Mark Walker
bd68bbaa05 Merge branch 'maintenance' into devel 
Conflicts:
	src/octoprint/static/js/app/viewmodels/files.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
 2016-03-29 10:35:47 -07:00
Gina Häußge
d31b85b6e3 Use dict constructor instead of {} + update 
Way cleaner look and more consistent.
 2016-03-18 15:25:27 +01:00
Gina Häußge
4d12f3ece9 Merge branch 'zChangeTimelapseWithRetractionZHop' of https://github.com/Alex9779/OctoPrint into pr/Alex9779/zChangeTimelapseWithRetractionZHop 
Conflicts:
	src/octoprint/server/api/timelapse.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/viewmodels/timelapse.js
	src/octoprint/timelapse.py
 2016-03-18 15:09:38 +01:00
Gina Häußge
1a4c06d6f6 Added flag to trigger ok for resend requests 
That's necessary to keep communications going in case of a resend request
for firmwares that do not send an ok after a resend request.
 2016-03-18 14:59:13 +01:00
Gina Häußge
7bdc4418fd Merge branch 'maintenance' into devel 
Conflicts:
	CHANGELOG.md
	docs/configuration/config_yaml.rst
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/__init__.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
	src/octoprint/util/comm.py
 2016-03-16 11:24:52 +01:00
Gina Häußge
069bfdd9f8 New flag to have M29 response inject "ok" 
Adjusted virtual printer to allow marking of M29 as broken re sending
of ok.

Fixes #1273
 2016-03-10 15:58:59 +01:00
Gina Häußge
b36290a1f2 Added new serial config options to UI 
Also pushed more advanced config option into an initially hidden
"Advanced Options" section, similar to other places.
(cherry picked from commit 84b343a)
 2016-03-09 11:41:49 +01:00
Gina Häußge
892ebf3979 Fixed something missed by refactoring due to different branch... 2016-02-08 11:30:48 +01:00
Gina Häußge
0223a11923 Merge branch 'fix/betterTimelapseRendering' into devel 
Conflicts:
	src/octoprint/server/api/timelapse.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/timelapse.js
 2016-02-02 18:37:35 +01:00
Gina Häußge
4e31ccf4c5 Big overhaul of timelapse handling 
* persistent notification on ongoing timelapse render job (#485)
  * non-colliding timelapse snapshot name generation to not delete
     existing snapshots when new print starts and timelapse has not
     yet been rendered, also only delete snapshots if timelapse rendered (#318)
  * list of unrendered timelapses, with option to delete files
    or to render timelapse
 2016-02-02 18:03:56 +01:00
Gina Häußge
adb77654f6 Merge branch 'fix/optionToIgnoreFirmwareErrors' into devel 
Conflicts:
	src/octoprint/server/api/settings.py
	src/octoprint/settings.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/settings.js
	src/octoprint/templates/dialogs/settings/serialconnection.jinja2
 2016-02-01 18:07:13 +01:00
Gina Häußge
6583691e85 Added setting to only cancel ongoing print on firmware error 
Also added error popup in such a case so the error will be known even
if the terminal tab scrolled past it.
 2016-02-01 18:02:21 +01:00
Gina Häußge
0e817d43cc Added option to ignore any errors reported by the firmware 
Use this carefully. An error reported by your firmware usually hints
at something being off about your printer (e.g. thermistor troubles)
or the firmware not being fully compatible to OctoPrint since
it doesn't recognize a lot of commands.

If you print with this option enabled, it will still fail if you firmware goes
into lockdown, but now it will keep trying to send data to your printer.

That might cause issues. So best not use that option, only if you absolutely
have no other way to get some misbehaving printer to work with
OctoPrint.
 2016-02-01 16:55:13 +01:00
Gina Häußge
86b96b8d4a Don't allow empty folder names 2015-12-17 16:56:09 +01:00
Gina Häußge
9b3e4f5c2a Properly capture StorageErrors 2015-12-17 16:48:02 +01:00
Gina Häußge
7791f7751f Merge branch 'fix/aclFirstRun' into devel 
Conflicts:
	src/octoprint/server/__init__.py
	src/octoprint/server/api/__init__.py
	src/octoprint/server/views.py
	src/octoprint/static/js/app/dataupdater.js
	src/octoprint/static/js/app/viewmodels/firstrun.js
 2015-12-17 13:16:51 +01:00
Gina Häußge
b96d1b51e0 Disabled ACL is now tracked through enabled flag on UserManager 
That allows us to properly enable and disable it at runtime (during first run).
 2015-12-17 13:08:45 +01:00
Alexander Leisentritt
6962fad1ae added "Retraction Z-Hop" setting to timelapse and altered the capture function in z-change mode so not on every z change pictures are captured but only on a real layer change 2015-12-16 01:21:23 +00:00
Gina Häußge
966bec2bed Merge branch 'fix/onlyShowBedIfPrinterHasBed' into devel 2015-11-30 11:11:51 +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
Salandora
46faa286e6 Little refactorings and bugfixes 2015-10-27 13:04:47 +01:00
Salandora
bb7ab5224f Merge branch 'devel' of github.com:foosel/OctoPrint into dev/folderSupport 2015-10-27 11:54:03 +01:00
Gina Häußge
4cfc74c344 Fix: Each divider action needs a custom action id 
Closes #1084
 2015-10-19 13:24:16 +02:00
Salandora
0dacfcdf8d Fixed Slicing. 
Normal behaviour is sliced gcode will be placed in same folder as the stl.
 2015-10-09 21:50:34 +02:00
Salandora
3458f9af43 Refactorings based on Commit comments 2015-10-09 19:51:36 +02:00
Salandora
d719e3cdbf Added copy and move API commands 2015-10-09 02:38:40 +02:00