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

1438 commits

Author SHA1 Message Date
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
Teja
4763a17da6 Merge branch 'stable-1.2.2' into filled_areas 2015-10-14 14:26:44 +02:00
Teja
58b5be9c71 code cleanup. 2015-10-13 18:23:42 +02:00
Teja
b7fd4c20ce really disabled debug coloring 2015-10-13 18:22:35 +02:00
Teja
07bafed37e removed debug coloring, cleanup works 2015-10-13 18:20:36 +02:00
Teja
8974ab535e infill rendering does not duplicate images 2015-10-13 17:44:38 +02:00
Teja
70b97bbca9 first working version of infill 2015-10-13 15:57:51 +02:00
Teja
fec89b70f4 image support. embedding and removing filters was the key. 2015-10-12 23:21:47 +02:00
Teja
cd83dd2a9b huge step forward, still wip. 2015-10-12 22:36:18 +02:00
make-ing
b97995323a added stop of temperature_poll during printing 2015-10-12 17:41:55 +02:00
make-ing
40343d5b89 removed rest of debug messages 2015-10-12 17:00:26 +02:00
make-ing
32ebec4973 blabla 2015-10-12 16:48:40 +02:00
make-ing
e93ffe0dba removed cmd_type temperature_poll 2015-10-12 16:40:02 +02:00
Teja
8c6ba8890d wip 2015-10-12 15:42:39 +02:00
make-ing
40b9eabd80 more debug messages 2015-10-12 15:13:03 +02:00
make-ing
5cc305e72f more debug messages 2015-10-12 15:03:51 +02:00
make-ing
4fe4945f24 more debug messages 2015-10-12 14:52:26 +02:00
make-ing
6a36933c25 removed some debug messages 2015-10-12 14:40:12 +02:00
make-ing
168a062dbb more debug messages 2015-10-12 14:25:40 +02:00
make-ing
1593baf16b more debug messages 2015-10-12 13:55:57 +02:00
make-ing
68e4904972 more debug messages 2015-10-12 13:49:06 +02:00
make-ing
d6b01068ac revert _clear_to_send.set() position 2015-10-12 12:44:53 +02:00
make-ing
d1b6e91fea changed _clear_to_send.set() position 2015-10-12 12:24:34 +02:00
make-ing
546b6e81af blabla bug? 2015-10-12 11:54:03 +02:00
make-ing
76324792e8 blabla bug? 2015-10-12 11:31:01 +02:00
make-ing
85ffe73b98 blabla bug? 2015-10-12 11:22:05 +02:00
make-ing
54913c1154 added debug message 2015-10-12 11:11:04 +02:00
make-ing
730033ef82 added debug message 2015-10-12 10:56:28 +02:00
make-ing
e94890a807 changed if statement to check for '?' IN command 2015-10-12 10:47:55 +02:00
make-ing
121716fd1a added status report queued logic to handle allready queued '?' 2015-10-12 10:36:12 +02:00
Teja
84a90edd95 grab pictures from camera feature 2015-10-10 17:09:24 +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
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
make-ing
9c837b1266 changed restart type to environment 2015-09-15 14:50:30 +02:00
make-ing
3bf5540675 coma bug fix and back to None update type 2015-09-15 14:31:12 +02:00
make-ing
b71f0a7cee changed rastart value of svgtogcode to octoprint 2015-09-15 14:23:03 +02:00
make-ing
2f4e18fceb added restart value None to svgtogcode update 2015-09-15 14:07:21 +02:00
make-ing
27b755326a changed defualt value of current form None to Unknown 2015-09-15 12:23:57 +02:00
make-ing
823b7be3f8 added default value for current to None 2015-09-15 12:13:21 +02:00
make-ing
e4a141d7e7 deleted unnesacery lines 2015-09-14 17:53:49 +02:00
make-ing
cecc9bb633 changed from update_folder to checkoutfolder for github_commit type 2015-09-14 16:00:55 +02:00
make-ing
650006b5db deleted restartCommand and rebootCommand 2015-09-14 15:11:15 +02:00
make-ing
3d68517cd7 added octoprintUnconfigured and octoprintUnreleased ko.observable() 2015-09-14 15:03:32 +02:00
Gina Häußge
d7485d288e cherry picked from 93763a5563 foosel/OctoPrint 2015-09-14 14:52:15 +02:00
Gina Häußge
fc63f95385 Also provide branch info to UI/on socket 
(cherry picked from commit cc8dcef)
 2015-09-14 13:05:25 +02:00
Gina Häußge
d0fadb1b6f atomic_write context to save configs first to temp file, then move 
Should prevent corruption of files
(cherry picked from commit c6d0290)
 2015-09-14 12:17:17 +02:00
make-ing
10dc7e4976 changed dafault update branch to grblautoupdate for testing 2015-09-14 11:58:27 +02:00
Gina Häußge
cacc6524a1 cherry-pick 13d7d5f2f6 from foosel/OctoPrint 2015-09-14 11:13:19 +02:00
make-ing
2a2696ff9a added new update script git-pull.py to update_script setting 2015-09-11 14:55:57 +02:00
make-ing
65bff81d35 added ne update script git-pull (copied from update-octoprint.py) 2015-09-11 14:52:58 +02:00
make-ing
912bb4ab1f changed update_script 2015-09-11 13:33:27 +02:00
make-ing
2db9724004 changed update_script 2015-09-11 12:34:14 +02:00
make-ing
f094056590 changed update_script string 2015-09-11 12:27:47 +02:00
make-ing
30a5a45147 changed update_script to "cd {target}; git pull" 2015-09-11 11:45:05 +02:00
make-ing
4b29593877 changed empty update_script string to pwd 2015-09-11 11:28:13 +02:00
make-ing
aa918ad980 added update_script and restart key to default values 2015-09-11 11:18:56 +02:00
make-ing
2f04ef43d5 changed all plugin branches to stable-1.2.2 2015-09-11 11:00:25 +02:00
make-ing
304c0919a7 chaned defualt settings in update software 2015-09-10 11:52:17 +02:00
Gina Häußge
6132fe2da9 SWU: Don't use display versions for "current" in github_commit configs 
(cherry picked from commit 58c6abc)
 2015-09-10 11:41:42 +02:00
make-ing
17f7e1171d changed default settings for testing 2015-09-10 10:50:34 +02:00
make-ing
48cbe8eded added update plugin default values from old config.yml 2015-09-09 15:14:31 +02:00
make-ing
2cb5b0246c fixed grbl travel settup problem when switching to senior 2015-09-09 14:06:30 +02:00
make-ing
d37ce77460 fixed position update bug after grbl flashing 2015-09-09 12:45:24 +02:00
make-ing
bb964b3d75 added new grbl.hex and changed the grblVersionRequirement.yml accordingly 2015-09-08 17:54:06 +02:00
make-ing
1052141be4 changed default settings of serial port to /dev/MrBeam 2015-09-08 14:40:50 +02:00
make-ing
469f2cb3f1 removed debug messages after avrdude bug fix 2015-09-07 15:59:58 +02:00
make-ing
dabcca4297 try to fix grbl flashing problem on pi 2015-09-07 11:07:05 +02:00
make-ing
e5cc1361c6 fixed grbl version string bug; fixed grbl.hex not found flashing bug 2015-09-05 13:09:57 +02:00
Teja
c482a487f6 bugfix. path of grblVersionString was wrong. 2015-09-04 20:02:54 +02:00
Teja
4f655bf306 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-04 18:58:27 +02:00
Teja
5554fc258e bugfix. don't send eeprom writing commands during printing 2015-09-04 18:57:55 +02:00
make-ing
6f1c9ed8d9 changed grbl version regex to be non-greedy 2015-09-04 18:14:55 +02:00
make-ing
bc4e0f2e35 *try to fix grbl version bug (No such file or directory: 'src/octoprint/util/grblVersionRequirement.yml') with change in setup.py and moving of grblVersionRequirement.yml and grbl.hex into new grbl folder 2015-09-04 18:10:33 +02:00
make-ing
d714e907c5 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-04 17:27:32 +02:00
make-ing
46347cc95b fixed grbl version regexp bug 2015-09-04 17:26:45 +02:00
Teja
85b43b5598 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-04 12:23:30 +02:00
Teja
a0f7fddec7 bugfix. 2015-09-04 12:23:12 +02:00
make-ing
5b70cfb3e5 changed error handling of grbl flashing to only flash once and if an error 
occurs the state is changed to STATE_CLOSED_WITH_ERROR
 2015-09-04 11:40:22 +02:00
Teja
010e2cfa92 flashing visualization fixed. uploaded up to date grbl version. 2015-09-04 11:15:36 +02:00
Teja
1c018ec277 added visual flashing bar. 2015-09-02 12:04:21 +02:00