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

2863 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
2111a06ce3 Forgot a changelog entry (again) 2015-02-22 15:37:37 +01:00
Gina Häußge
32ebec3d3c Fixed problem that broke SD printing 2015-02-22 15:34:14 +01:00
Gina Häußge
89d972ff40 Always make sure to (re)set file position to the beginning when starting SD card prints 
Closes #780
(cherry picked from commit 5c35a28)
 2015-02-22 15:24:48 +01:00
Gina Häußge
5c35a288a3 Always make sure to (re)set file position to the beginning when starting SD card prints 
Closes #780
 2015-02-22 15:15:45 +01:00
Teja
7f7d1f7229 Merge branch 'mrbeam-stable' into mrbeam 2015-02-21 09:54:19 +01:00
Teja
31d010663d wording fix. 2015-02-21 09:53:54 +01:00
Gina Häußge
ad23c88347 Merge remote-tracking branch 'origin/devel' into devel 2015-02-20 19:02:00 +01:00
Gina Häußge
f60435aca4 Also allow downloading of STL files from server 2015-02-20 19:01:14 +01:00
Gina Häußge
9d3dee7bf3 Ping pong sending to fix acknowledgement errors 
Might be a good solution for people affected by #166, #470, #490 until commRefactoring branch is ready for prime time. No solution for #553 since that needs proper queueing and blocking command detection.
 2015-02-20 18:48:15 +01:00
Teja
3994ef689e disabled serial logging after start. removed console.log debug line 2015-02-20 15:04:43 +01:00
Gina Häußge
5af6f0e7cb Possible fix for the resend issue backported from commRefactoring branch 2015-02-20 14:34:05 +01:00
Gina Häußge
8711702cf5 Temperature polling fixed, virtual printer having issues with resends 
TODO:
- solve virtual printer resend issues
- document hook
 2015-02-19 23:04:47 +01:00
Gina Häußge
1e6679c40c Corrected some merge errors, got gcode scripts to work, broke temperature polling in the process 
TODO:
- Fix temperature polling
- Document new hook octoprint.comm.protocol.scripts
 2015-02-19 22:32:20 +01:00
Teja
1e53965f35 stop streaming gcode if hard/soft limit hit 2015-02-19 16:30:21 +01:00
Teja
b8dcb0c8a4 better log output 2015-02-19 15:01:41 +01:00
Teja
a123a81783 several bugfixes for the beta release 2015-02-19 14:53:38 +01:00
Gina Häußge
578f77a411 Merge pull request #775 from matobago/patch-1 
Error messages show the proper name of the objects
 2015-02-18 22:03:14 +01:00
Marcel
61c4a8b635 Error messages show the proper name of the objects 
Just try to figure out why some binding wasn't working on my version and came out with this small change
 2015-02-18 12:07:36 -08:00
Gina Häußge
654e255b68 Merge branch 'devel' into dev/gcodeScripts 
Conflicts:
	src/octoprint/server/__init__.py
	src/octoprint/server/api/settings.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/viewmodels/settings.js
 2015-02-18 17:18:22 +01:00
Gina Häußge
28738a5179 More documentation and unit tests 2015-02-18 17:16:37 +01:00
Gina Häußge
258b824ff8 self._printer in plugins now allows direct access to the transport object (serial instance in most cases) 2015-02-17 21:53:45 +01:00
Gina Häußge
7438ba1eea Merge remote-tracking branch 'origin/devel' into devel 2015-02-17 14:26:52 +01:00
Gina Häußge
3c33401b48 GCODE viewer: Only try to instantiate sliders if their elements are available 2015-02-17 13:51:34 +01:00
Gina Häußge
9aa45041f6 View models can now implement getAdditionalControls to add controls to the control tab 
Controls may now contain a new property "javascript" which may be either a javascript function to be called when the control is executed, or a string to be eval'd when the control is executed. If it is a function, it will be called with the config of the custom control as single parameter "data". If it is a string it will be eval'd within a function context providing the custom control configuration as variable data.

Additionally controls may contain a new property "enabled", which may also be either a javascript function or a string to be eval'd. The custom control config will be available to the enabled code as described above. The code is expected to return true if the component should be enabled or false if not.
 2015-02-17 13:51:05 +01:00
Gina Häußge
56bce984fa Merge pull request #673 from fjriosp/reconnect_fix 
BugFix to Reconnect on Debian
 2015-02-17 09:42:42 +01:00
Teja
ccb2614deb visual fix. file list fills screen height now 2015-02-14 20:41:24 +01:00
Teja
a2b892c96b improved visual difference between gcode and svg files in the working area 2015-02-14 20:33:42 +01:00
Teja
42fc268449 switch off focus after 30 seconds 2015-02-14 19:07:17 +01:00
Gina Häußge
6cdd8de248 docs: Fixed a wrong reference 2015-02-13 15:50:09 +01:00
Gina Häußge
197ed7b912 More documentation 2015-02-13 12:50:02 +01:00
Gina Häußge
7de90e16f6 And of course I forgot a file again and overlooked a typo... 2015-02-12 13:34:57 +01:00
Gina Häußge
cad4e2f6dc Update some line numbers 2015-02-12 13:31:12 +01:00
Gina Häußge
4d5443ed6b Finalized plugin tutorial (for now) 2015-02-12 13:29:00 +01:00
Gina Häußge
00760ef1b3 If plugins only provide LESS or CSS files, they should still be properly included in the page regardless of stylesheet mode 
Up until now OctoPrint would not include anything for plugins which didn't provide LESS files but CSS files when in LESS mode (and vice versa). This is not rectified to make development a bit easier and less restrictive - if a plugin author doesn't want to use LESS but just plain CSS, that's now fine too.
 2015-02-12 13:28:37 +01:00
Teja
a9fd363f45 switch on the fan in focus mode as well. 2015-02-11 18:17:41 +01:00
Teja
6cc9d33b44 bugfix. system menu was shown twice 2015-02-11 17:57:12 +01:00
Teja
07918b9f0d better drop behaviour 2015-02-11 14:05:48 +01:00
Teja
72b8a09ccd little explanation. 2015-02-11 13:14:38 +01:00
Teja
9496a29af7 fixed logfile view 2015-02-11 13:09:26 +01:00
Teja
9c0e2b29ea fixed authentication 2015-02-11 13:02:30 +01:00
Teja
8f7b92f33b added safety labels to the safety popup 2015-02-11 12:30:41 +01:00
Gina Häußge
65557f670a Fixed copy paste error from way back 2015-02-11 12:26:18 +01:00
Gina Häußge
9cdb273cbc Tooltips for the serial connection settings 2015-02-11 12:22:41 +01:00
Teja
37f90fbb0f code cleanucode cleanupp 2015-02-11 12:17:27 +01:00
Teja
3598a14dc6 fixed drag n drop of files 2015-02-11 11:28:06 +01:00
Teja
f9fdf9ebb2 bugfix. updated to new sarge 0.1.4 behaviour 2015-02-11 11:12:27 +01:00
Gina Häußge
e57bf99d11 Fixed an issue causing slicing not to work due to a change in how the used sarge library works 
Starting commands asynchronously now necessitates a call to Pipeline.wait_events in order to be able to access the started Command instances. Not waiting causes the list of commands to be not fully populated and hence issues with code depending on that stuff being present.

Conflicts:
	src/octoprint/plugins/cura/__init__.py
 2015-02-11 10:01:41 +01:00
Gina Häußge
8744f436d3 We now depend on sarge >= 0.1.4 2015-02-11 09:58:52 +01:00
Gina Häußge
4fede5a9c6 Merge remote-tracking branch 'origin/master' 2015-02-10 18:41:24 +01:00
Gina Häußge
7971bc91b2 Always send commands with checksum when printing 
(cherry picked from commit 3ee745d)
 2015-02-10 18:40:41 +01:00