Teja
b41032cc1c
Merge branch 'mrbeam' into update_merge
2015-01-21 20:50:36 +01:00
Teja
cb983a4b38
code cleanup
2015-01-21 19:09:26 +01:00
Teja
3184b0251f
bugfixes! state model works again. feature: printing of placed svg files & direct gcode.
2015-01-21 17:38:53 +01:00
Teja
5ef6600ab6
bugfix. fixed status message filter in terminal
2015-01-21 12:31:41 +01:00
Teja
f19d2deffa
bugfix. working area svg stays where it is on modal dialogs.
2015-01-21 12:26:16 +01:00
Teja
a49f2b721f
meaningful gcode names
2015-01-21 11:54:46 +01:00
Teja
aab27fa181
progress in direct lasering the working area
2015-01-20 21:55:37 +01:00
Teja
33c3bd401c
force homing cycle if machine is locked.
2015-01-19 11:59:42 +01:00
Teja
1491d995cf
slicing works again after dealing with svg namespaces.
2015-01-18 22:33:04 +01:00
Teja
0c68913e56
first preview draft
2015-01-14 15:21:02 +01:00
Teja
59368ca240
grbl state alarm treatment
2015-01-09 21:47:57 +01:00
Teja
a87131ac1f
safety glasses popups
2015-01-09 16:47:08 +01:00
Teja
209de59714
styles... laser button color and animation
2015-01-09 16:21:09 +01:00
Teja
dc7576a9ef
save button replaced with auto saving.
2015-01-09 13:11:20 +01:00
Teja
b003c5ed0a
focus tab ... first draft
2015-01-08 22:50:54 +01:00
Teja
367712520b
fixed the M110 N... timeout.
2015-01-08 21:41:48 +01:00
Teja
77a827d5b1
visual fixes for jog distance slider
2015-01-08 20:24:28 +01:00
Teja
c097815a15
slicing works again. slider for jog distance. footer links open in new tab
2015-01-08 20:16:36 +01:00
Teja
36545f4bde
svgtogcode plugin settings persistance fixed
2015-01-08 16:12:14 +01:00
Teja
93acccf522
frequent position updates
2015-01-08 13:38:30 +01:00
Teja
cf23781326
lots of visual fixes. z-axis support
2015-01-08 12:13:56 +01:00
Teja
b2e3c07e73
working area resizing dynamically, coordinate conversion accordingly.
2015-01-07 22:47:50 +01:00
Teja
719feba921
working area dynamically enlarged as much as possible
2015-01-07 20:47:46 +01:00
Teja
cc68a06ce0
removed cura plugin, machine pos, terminal, controls
2015-01-07 16:45:06 +01:00
Teja
de58b08e90
zaxis setting, settings not a popup anymore
2015-01-04 18:24:52 +01:00
Teja
6f6c07c3dc
position updates are working right now.
2015-01-03 20:06:26 +01:00
Teja
358677f42c
movement of the laser via mouseclick works
2015-01-03 14:37:25 +01:00
Teja
96223a53fe
quick fix. avoids sending M110 N0 command as it is not supported by grbl. fixes #2
2014-12-22 13:14:54 +01:00
Teja
b85ee58b4e
fixes fan on / off buttons. adds a focus disable button.
2014-12-22 12:57:29 +01:00
Teja
223227b5b8
work in progress
2014-12-19 21:58:39 +01:00
Philipp Engel
f1511c2076
bumped tornado to version 4.0.2
2014-12-16 18:45:52 +01:00
Philipp Engel
c8273e9e12
Revert "changed tornado dependency to local (RPi date fix)"
...
This reverts commit f812658714
2014-12-16 18:41:43 +01:00
Philipp Engel
08b60784ea
new try for fixed deps
2014-12-16 17:48:33 +01:00
Philipp Engel
f812658714
changed tornado dependency to local (RPi date fix)
2014-12-16 17:08:35 +01:00
Philipp Engel
cf0580a5a7
added a mechanism that allows templates to override the index.jinja2 with their own (will be replaced with override_index.jinja2 from the plugin's template folder). drawbacks:
...
* if more than one of the templates has an override_index.jinja2 file, the later one will be used (lex. order)
* the index file will replaced, so the overriding one has to take care of the logic (like including js files) itself
2014-12-09 17:12:04 +01:00
Teja
8b20f0a161
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
2014-11-24 22:08:38 +01:00
Philipp Engel
60c8838886
added unsupported statement as bad result
2014-11-24 22:07:49 +01:00
Philipp Engel
cfa6e955f5
upped communication timeout from 5 to 10 seconds
2014-11-24 22:07:33 +01:00
Teja
54052c2744
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
2014-11-24 22:04:29 +01:00
Teja
f950a56524
fixed homing gcode sequence
2014-11-24 22:03:41 +01:00
Philipp Engel
0a9c0bcf36
fixed paths
2014-11-24 21:42:21 +01:00
Philipp Engel
c60c05972c
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
...
Conflicts:
src/octoprint/templates/index.jinja2
2014-11-24 20:04:56 +01:00
Philipp Engel
fe3b05256a
hacked support for Vector File conversion into the GcodeFilesViewModel and the main javascript file. Should all be encapsulated in the svgtogcode plugin
...
TODO: figure out a way to move the code to the plugin
2014-11-24 20:01:05 +01:00
Philipp Engel
48422d7ea0
changed call to converter method
2014-11-24 20:00:45 +01:00
Philipp Engel
e071a33fae
changed default settings to fit the MrBeam hardware (for auto connection after startup)
2014-11-24 19:59:52 +01:00
Philipp Engel
0af4b3cb37
extended plugin code to use the slicing profiles and apply it to the vector graphics converter. Now supplying parameters through the frontend works.
2014-11-24 19:57:25 +01:00
Teja
af327129d2
default settings for file list: no filtering
2014-11-24 16:38:36 +01:00
Teja
81ca42cd87
ignoring nbproject
2014-11-24 16:13:00 +01:00
Teja
913172e008
label updates: print -> laser
2014-11-24 16:09:59 +01:00
Teja
a4864b8508
disabled sd support
2014-11-24 15:47:12 +01:00
