Commit graph

3053 commits

Author SHA1 Message Date
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
Teja
239aee0c80 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-11-09 12:16:15 +01:00
Teja
aaea7a408f feedrate and intensity overrides are sending now /... commands 2015-11-09 12:15:47 +01:00
make-ing
56e32f83a0 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-11-09 11:19:35 +01:00
make-ing
9362544067 added changing intensity in G1, G2 and G3 sending hooks 2015-11-09 11:19:29 +01:00
Teja
87054b7eb4 ui for feedrate and intensity override. 2015-11-08 09:51:58 +01:00
make-ing
34394e65d6 added sending hook for G1,G2 and G3 commando for changing feedrate 2015-11-08 09:45:09 +01:00
Teja
1c4a782618 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-11-02 09:47:38 +01:00
Teja
587c727bda disables the convert button during composition generation 2015-11-02 09:47:07 +01:00
make-ing
39a8e46000 added pause delay also for setPause(False) 2015-11-02 09:39:06 +01:00
Teja
577ed9591a setting max x,y travel on grbl takes origin offsets into account. 2015-10-31 19:02:05 +01:00
Teja
099c5dc33c Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-10-31 18:21:32 +01:00
Teja
59802eaa7e bugfix. svg files are transformable when additional gcode is placed. 2015-10-31 18:20:30 +01:00
Teja
212f066998 bugfix for Snapsvg.io bug 390 until they release a new version. 2015-10-31 18:20:19 +01:00
make-ing
262f8d2dc8 implemented unselectFile method; fixed return to pause bug with a delay 2015-10-30 18:33:09 +01:00
make-ing
208d377a75 changed wait to 1 sec 2015-10-28 15:21:47 +01:00
make-ing
4cd0409972 fixed a few bugs 2015-10-28 11:18:28 +01:00
make-ing
fbe9b37f94 commented metric stuff 2015-10-27 16:07:36 +01:00
make-ing
74e8ebb4ac changed back to comm_acc2 2015-10-27 15:48:26 +01:00
make-ing
7c22e07fb3 changed back from wait to sleep 2015-10-27 15:25:01 +01:00
make-ing
38c0f64a2a changed from sleep() to wait() 2015-10-27 14:28:16 +01:00
make-ing
be699ba55c changed back to comm_acc 2015-10-27 13:39:03 +01:00
make-ing
5d3ae61e5c added metric stuff, and fixed ?\n bug 2015-10-27 13:33:39 +01:00
make-ing
5dc5afa9d4 commented all send_event stuff 2015-10-26 18:26:07 +01:00
make-ing
d92a7477ba changed wait timeout to 0.01 and changed position of send_event.set() to directly after the readline() 2015-10-26 18:17:04 +01:00
make-ing
52a9954024 changed back to \n and fixed acc bug 2015-10-26 16:37:04 +01:00
make-ing
ab00b348f2 changed from \r to \r\n 2015-10-26 16:26:01 +01:00
make-ing
fd0b479ed4 changed from line-feed to carriage-return 2015-10-26 16:05:38 +01:00
make-ing
2075e4697c changed wait timeout to 0.05 2015-10-26 15:31:52 +01:00
make-ing
a994557eb9 changes to cancelPrint() method 2015-10-23 10:36:27 +02:00
make-ing
edecf336bd Merge branch 'perftest' into mrbeam 2015-10-23 10:33:07 +02:00
make-ing
c30fff8118 fixed status report bug! Grbl does not send ok for realtime commandsgit add .! if so, then you probably send a \n with it. 2015-10-22 17:15:09 +02:00
make-ing
8fed6d5d7e changed a lot of stuff 2015-10-22 15:21:52 +02:00
make-ing
79c10ea410 changed a lot of stuff 2015-10-21 15:57:34 +02:00
make-ing
312af22a73 changed some stuff 2015-10-21 14:55:54 +02:00
make-ing
0f2edfd82e added setPause() method 2015-10-20 18:12:30 +02:00
make-ing
6ff1ad52e7 added cancelPrint method 2015-10-20 18:03:47 +02:00
make-ing
0b5395e21d changed send_event.set() handling into _readline() 2015-10-20 17:22:03 +02:00
make-ing
796fbeacdd a lot of changes 2015-10-20 16:21:01 +02:00
make-ing
0c9ddbfd85 added debug message 2015-10-19 15:05:56 +02:00
make-ing
d6bfb03214 changed some stuff 2015-10-19 14:36:03 +02:00
make-ing
ac458f6a24 removed a lot of stuff in monitoring loop 2015-10-19 14:11:24 +02:00
make-ing
078fafbdb6 a lot of changes 2015-10-19 14:00:52 +02:00
Teja
4a12294f1d ui support for filled areas. 2015-10-18 14:40:34 +02:00
make-ing
04415d8656 fixed bad operator bug 2015-10-17 16:14:55 +02:00
make-ing
9776bba6bc added new comm_acc2 file and switched to it 2015-10-16 18:48:42 +02:00