Commit graph

3123 commits

Author SHA1 Message Date
Teja
84a90edd95 grab pictures from camera feature 2015-10-10 17:09:24 +02:00
make-ing
072c52b929 Merge branch 'perftest' into stable-1.2.2
Conflicts:
	.gitignore
2015-10-06 18:47:27 +02:00
make-ing
9d383f303e added /disconnect to help message 2015-10-06 18:46:00 +02:00
make-ing
2449f9e327 changed standart position poll rate to 1sec and removed disabling during printing 2015-10-06 16:40:49 +02:00
make-ing
77499fb868 changed acc remaining value from 10 to 5 character 2015-10-06 12:54:21 +02:00
make-ing
5b89302deb added stuff to resolve acc_line_length bug 2015-10-06 12:47:19 +02:00
make-ing
42844c2ef9 reverted to old sleep 0.1sec due to acc bug 2015-10-06 12:09:09 +02:00
make-ing
ac3b5ebc54 changed sleep from 0.1sec to 0.001sec in _send_loop() 2015-10-06 11:57:53 +02:00
make-ing
8a9317d742 changed sleep from 0.1sec to 0.001sec in _send_loop() 2015-10-06 11:31:55 +02:00
make-ing
147034680d added exception argument 2015-10-06 10:40:10 +02:00
make-ing
adce7b877d removed cprofile 2015-10-06 09:50:10 +02:00
make-ing
4793ec0e54 added cProfile 2015-10-01 18:46:13 +02:00
make-ing
e4931acaa6 removed yappi 2015-10-01 18:31:47 +02:00
make-ing
23cab00b36 yappi output to /tmp/yappi 2015-10-01 18:21:18 +02:00
make-ing
d5e4a5f4ae added disconnect special command and added yappi to profile while loop 2015-10-01 17:59:56 +02:00
make-ing
ad745e067b remove changes 2015-10-01 17:47:56 +02:00
make-ing
5ecc0a1e90 Revert "removed debugging output handling"
This reverts commit 3f61ebc29e.
2015-10-01 17:42:47 +02:00
make-ing
29a85fec96 deactivated timeout reset 2015-10-01 17:19:45 +02:00
make-ing
a61245a8b4 a lot of changes in _monitor trying to reduce computational effort 2015-10-01 16:54:59 +02:00
make-ing
3f61ebc29e removed debugging output handling 2015-10-01 11:53:20 +02:00
Teja
9f1c277777 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-10-01 10:55:08 +02:00
Teja
9aeacfee77 commented out lots of 3d printing stuff. 2015-10-01 10:54:43 +02:00
make-ing
4f00f2768c fixed if else bug in specialcommand handling 2015-09-28 11:36:32 +02:00
make-ing
a1c40c7a41 added setstatusfrequency special command 2015-09-25 11:50:41 +02:00
make-ing
a0b43adc61 change command test to only lowercase 2015-09-25 10:03:26 +02:00
make-ing
b5a80db874 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-24 14:05:32 +02:00
make-ing
198f40e2d7 added /toggleStatusReport command 2015-09-24 14:05:11 +02:00
Teja
beaa41c2c1 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-24 12:20:12 +02:00
Teja
8eb3fd3029 support for /debug commands 2015-09-24 12:19:46 +02:00
make-ing
156ac00f52 img id bug fix 2015-09-24 11:31:57 +02:00
make-ing
2f387c55cc fixed wrong class bug 2015-09-24 10:56:07 +02:00
make-ing
c75bd69eb4 added horizontal and vertical ui label 2015-09-24 10:30:40 +02:00
make-ing
ea20be6601 changed position output to float 2015-09-23 18:53:00 +02:00
make-ing
c5aa726155 fixed position update bug and display horizontal and vertical bug 2015-09-23 16:42:49 +02:00
make-ing
563a85ac7e paranthesis bug fix 2015-09-23 15:25:23 +02:00
make-ing
a9da7b8b20 string to int bug fix 2015-09-23 14:51:39 +02:00
make-ing
2b3ebaf14d fixed null bug 2015-09-23 14:37:34 +02:00
make-ing
e3f44df478 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-23 14:08:24 +02:00
make-ing
53ad230461 changed from eventManager to callback.on_comm_pos_update 2015-09-23 14:08:00 +02:00
make-ing
6fd68e0df0 changed detail information image display from percent to horizontal and vertical mm 2015-09-23 13:26:30 +02:00
Teja
8f144accf4 added todo comments 2015-09-23 11:45:23 +02:00
make-ing
906fd54c41 debug bug fix :) 2015-09-21 16:36:24 +02:00
make-ing
fbe2b56170 laser position halt debuging 2015-09-21 16:09:03 +02:00
make-ing
3516e8a8e7 Merge branch 'stable-1.2.2' into mrbeam 2015-09-18 12:23:31 +02:00
make-ing
6298863098 solved firefox bug; maybe needs better solution 2015-09-18 12:19:43 +02:00
make-ing
2c76ae4ebd fixed scale calculation bug 2015-09-17 15:22:27 +02:00
make-ing
1e187ddae2 fixed missing 2015-09-17 15:12:55 +02:00
make-ing
28c365a780 fixed wrong scale display bug 2015-09-17 15:01:13 +02:00
make-ing
c1355e4581 changed octoprint branch back to stable-1.2.2 and changed cache_ttl to 12 hours (12*60) 2015-09-15 15:49:12 +02:00
make-ing
5bbae83367 changed restart to octoprint type 2015-09-15 15:35:07 +02:00