make-ing
|
a0e685ef1c
|
fixed reset of finished passes bug.
|
2016-03-21 12:45:50 +01:00 |
|
make-ing
|
cfacbe2610
|
Merge branch 'stable-1.2.2' into mrbeam-multipass
Conflicts:
src/octoprint/static/js/app/viewmodels/printerstate.js
src/octoprint/util/comm_acc2.py
|
2016-03-18 13:38:05 +01:00 |
|
make-ing
|
4da0c3dbe0
|
added number of passes reset on print start
|
2016-03-18 13:33:57 +01:00 |
|
make-ing
|
a1d9d2ea7b
|
moved reset override slider functionality to separate method.
(cherry picked from commit e5c600e)
|
2016-03-18 13:28:40 +01:00 |
|
make-ing
|
3201053e16
|
added multi passes support in backend
|
2016-03-18 12:24:41 +01:00 |
|
make-ing
|
e5c600e972
|
moved reset override slider functionality to separate method.
|
2016-03-17 09:59:49 +01:00 |
|
make-ing
|
d7b5fae614
|
fixed wrong feedrate and intensity slider bug. On every new print start the sliders are set back to 100%.
|
2016-03-16 14:16:15 +01:00 |
|
make-ing
|
bf4c9c2105
|
fixed bug within placeIMG where the picture was to high to fit into the workspace area.
|
2016-03-15 17:11:54 +01:00 |
|
make-ing
|
3db371fbb0
|
added feedrate and intesity reset at beginning of each laser job.
|
2016-03-14 15:15:13 +01:00 |
|
make-ing
|
9c822b7e93
|
added multipass placeholder functions
|
2016-03-02 15:48:52 +01:00 |
|
make-ing
|
064cd33455
|
merged with mrbeam branch
|
2016-02-22 12:11:34 +01:00 |
|
make-ing
|
e54364a45c
|
parenthesis bug fixed
|
2016-02-22 10:54:29 +01:00 |
|
make-ing
|
327ac869ce
|
added support for embedded images in svg via "href" and "xlink:href"
|
2016-02-22 10:37:20 +01:00 |
|
make-ing
|
60fb13faa2
|
fixed bug with embedded images in svg's
|
2016-02-17 16:17:45 +01:00 |
|
make-ing
|
94effaeda7
|
fixed wrong positioning if only x2 value was to out of bounds maybe also need to be tested for y direction
|
2016-02-16 13:54:39 +01:00 |
|
make-ing
|
17f29984e5
|
fixed image bug with missing {}
|
2016-02-16 12:53:20 +01:00 |
|
Teja
|
73749fbb19
|
added multipass ui
|
2016-01-29 18:11:59 +01:00 |
|
make-ing
|
8c218b21f8
|
changed conversion filename to fixed "temp.svg", so its doesn't use up all the space by creating a new file for every new conversion.
|
2016-01-29 15:31:54 +01:00 |
|
Teja
|
597481905b
|
bugfix. images in groups with transform attributes are transformed correct now.
|
2016-01-27 17:53:41 +01:00 |
|
make-ing
|
a5330313a4
|
Merge remote-tracking branch 'origin/mrbeam' into mrbeam
Conflicts:
src/octoprint/util/comm_acc2.py
|
2016-01-15 16:43:22 +01:00 |
|
make-ing
|
de622e5e8e
|
slider bug fix
|
2016-01-15 16:41:35 +01:00 |
|
make-ing
|
bead551353
|
Testing slider bug fix: wrong variable used
|
2016-01-15 16:19:07 +01:00 |
|
make-ing
|
6867ab99a2
|
Testing slider bug fix: removed dictionary stuff
|
2016-01-15 15:11:21 +01:00 |
|
make-ing
|
aa7a781c92
|
Testing slider bug fix
|
2016-01-15 11:53:27 +01:00 |
|
Teja
|
9a9afa3be3
|
bugfix. added default coordinates for circle / ellipse elements as corel omits them sometimes.
|
2016-01-07 11:04:12 +01:00 |
|
Teja
|
a6dc870cb5
|
bugfix. CorelDraw rectangles with no 'x' and 'y' attributes set are treated correct now.
|
2016-01-06 11:54:06 +01:00 |
|
Teja
|
be5fd41f61
|
Merge branch 'mrbeam' into stable-1.2.2
|
2015-11-16 16:01:54 +01:00 |
|
Teja
|
5c8d491fb8
|
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
|
2015-11-16 15:47:40 +01:00 |
|
Teja
|
deda1d4bc7
|
code cleanup
|
2015-11-16 15:29:19 +01:00 |
|
make-ing
|
ef9ddd2864
|
reset Arduino after alarm message (by closing and opening the serial port)
|
2015-11-16 15:06:42 +01:00 |
|
Teja
|
21f26648eb
|
bugfix. machine endstop switches are taken into account correctly when calculating the working area.
|
2015-11-15 18:23:59 +01:00 |
|
Teja
|
34ee7a2578
|
bugfix: fit to working area now uses all the space.
|
2015-11-15 18:22:29 +01:00 |
|
Teja
|
2aa68e81ea
|
Merge branch 'mrbeam' into stable-1.2.2
|
2015-11-14 16:11:20 +01:00 |
|
Teja
|
f518af6bd6
|
bugfix. override sliders are reset after job done.
|
2015-11-14 15:04:40 +01:00 |
|
Teja
|
bb72d2ddba
|
Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam
|
2015-11-14 14:15:32 +01:00 |
|
Teja
|
2059a16848
|
bugfix. fill_areas is not interfering when only gcodes are placed. slicing_in_progress flag is set correct.
|
2015-11-14 14:10:47 +01:00 |
|
make-ing
|
2ab7a6ceb7
|
added /feedrate and /intensity to help message
|
2015-11-14 13:30:35 +01:00 |
|
make-ing
|
19f2ec9824
|
fixed wrong dictionary entry bug if limits are exceeded
|
2015-11-13 19:11:13 +01:00 |
|
make-ing
|
ced9688647
|
added dictionary algorithm to speed up feedrate and intensity override
|
2015-11-13 17:11:56 +01:00 |
|
make-ing
|
1f2d9f1243
|
fixed pause bug when grbl was sending Queue state without an hardware button pressed
|
2015-11-13 17:02:04 +01:00 |
|
make-ing
|
0e041ed4a9
|
fixed array in array bug
|
2015-11-13 16:17:44 +01:00 |
|
make-ing
|
c547c714e8
|
added round() to avoid unwanted decial places in the replace function
|
2015-11-13 16:05:09 +01:00 |
|
Teja
|
e010b2c4a9
|
code cleanup
|
2015-11-13 15:41:38 +01:00 |
|
Teja
|
f5aaa627f4
|
changing slider values only at slide stop.
|
2015-11-13 15:39:43 +01:00 |
|
make-ing
|
32985cb783
|
added gcode hooks for G01, G02 and G03
|
2015-11-13 15:27:58 +01:00 |
|
make-ing
|
88476fbab8
|
fixed bug with mininmum feedrate
|
2015-11-13 15:23:45 +01:00 |
|
make-ing
|
418bebd84c
|
added filter to remove empty strings in baselist in serialList function
|
2015-11-13 15:09:52 +01:00 |
|
make-ing
|
5ac5b77eeb
|
skipping feedrate and intensity replacement if factor is 1
|
2015-11-13 14:45:09 +01:00 |
|
make-ing
|
4e7087077d
|
fixed bug with wrong photo aspectratio to fix 4/3
|
2015-11-12 17:21:19 +01:00 |
|
make-ing
|
0f946026bf
|
added feedrate and intensity override functionality
|
2015-11-09 15:39:24 +01:00 |
|