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

1383 commits

Author SHA1 Message Date
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
make-ing
28bf9364f6 working version of flashing ui 2015-09-02 11:04:38 +02:00
make-ing
f4e0801853 added flashing state to ui (not working) 2015-09-02 10:38:51 +02:00
make-ing
39bd1b4375 added functionality to send new working area size to grbl after change of profile 2015-09-01 17:15:36 +02:00
Teja
54af60cdd2 new blueprint API from octoproint v2 plugin interface. improved usability. 2015-09-01 13:06:50 +02:00
make-ing
221c6de990 Merge branch 'grblautoupdate' into mrbeam 2015-09-01 08:53:31 +02:00
Teja
9ab6650b07 fixes #43 2015-08-31 20:10:51 +02:00
Teja
11ab4509cb moved grbl binary to a non-machine-specific name 2015-08-31 18:47:24 +02:00
make-ing
0632bb5fdf -added new machine state (STATE_FLASHING) 
-added required grbl hex file to flash
 2015-08-27 15:10:05 +02:00
make-ing
4e76574bb9 added grbl version comparison and check to see if required version is detected. 
If the right grbl version is not detected, the arduino is flashed with the right
hex file.
 2015-08-25 16:46:32 +02:00
Teja
ed82f46f57 bugfix. disable convert button during slicing 2015-08-22 18:51:56 +02:00
Teja
7c9fbda690 updated safety notice 2015-08-22 17:16:21 +02:00
Teja
cf70b4e80a bugfix. fan must be switched on before any gcode file is streamed. 2015-08-20 15:34:20 +02:00
Teja
060b967efc pierce time support for img engraving. 2015-08-16 15:10:46 +02:00
Teja
236d2cd7fc explanations for the conversion popup. 2015-08-16 13:58:10 +02:00
Teja
86570f7e4d code cleanup 2015-08-16 12:45:18 +02:00
Teja
d5c1a8178a bugfix. focus mode disabling disables timeout as well. 2015-08-16 12:38:09 +02:00
Teja
8bb698c886 improved preview of gcode generated through img2gcode 2015-08-16 11:43:28 +02:00
Teja
b2555d3850 slicing progress visualized 2015-08-15 21:54:47 +02:00
Teja
45a42c4972 got rid of the gcode viewer - not in use here. 2015-08-15 19:39:51 +02:00
Teja
01d1f5b181 conversion progress reporting 2015-08-15 18:16:56 +02:00
Teja
517ea1a007 more performant gcode visualization for raster-gcode. disabled gcode analysis of octoprint. direct call of gcode generation scripts 2015-08-15 16:57:49 +02:00
Teja
9980030a51 fixes initial image size after placing 2015-08-13 20:07:52 +02:00
Teja
81e5c795a8 bugfix. line width parameter passed correct. 2015-08-13 16:36:08 +02:00
Teja
cdc744537d max values for sharpening and contrast 2015-08-13 12:18:49 +02:00
Teja
0bf06885dc configurable max values for sharpening and contrast. code cleanup 2015-08-13 11:10:43 +02:00
Teja
233f426dff minor ui fixes 2015-08-12 11:42:19 +02:00
Teja
4ac1707052 minor us fixes, photo attribution 2015-08-12 09:31:50 +02:00
Teja
383326932e explanatory preview for contrast, sharpening and dithering 2015-08-10 22:43:45 +02:00
Teja
b2a9c392fe passing forward the image engraving parameters 2015-08-09 17:40:05 +02:00
Teja
18fc2fd68e little bugfix. text in the working area is not selectable anymore. 2015-08-07 16:37:12 +02:00
Teja
572425b52b all parameters for image engraving are now in the ui. 2015-08-07 16:28:32 +02:00
Teja
8adf72a4be images can be placed on the working area, rotated and translated. 2015-08-06 22:45:55 +02:00
Teja
4879aafb72 logging update check. 2015-08-06 17:23:49 +02:00
Teja
0d83eaf1e3 bugfix. returning now tuples. 2015-08-06 16:03:18 +02:00
Teja
493612a47f connecting to a already homed grbl works. 2015-07-17 11:34:11 +02:00
Teja
9460f78d12 code cleanup. fixed drag n drop of svgs. fixed gcode file list entries 2015-07-17 09:56:36 +02:00
Teja
1f2f29336e bugfix. detecting empty 'd' attribute now correct. 2015-07-16 11:58:52 +02:00
Teja
c70b446d65 bugfix. catching emtpy path attribute d. 2015-07-16 11:43:09 +02:00
Teja
cb512a257c fixed re-connection bug when grbl already has a position. 2015-07-16 10:03:54 +02:00
Teja
f023dc99d4 default settings for update 2015-07-15 12:45:38 +02:00
Teja
49fece1e14 return home after print done 2015-07-15 12:45:18 +02:00
Teja
131e99adbe default branch is "mrbeam-stable" instead of "master" 2015-07-15 11:54:03 +02:00
Teja
6a7a6f0ff2 instant save working on connection timeout 2015-07-15 09:56:36 +02:00
Teja
98eaab755f fixed image paths 2015-07-14 22:11:52 +02:00
Teja
79587644b4 fixed update source and deprecation warnings 2015-07-14 21:33:13 +02:00
Teja
7f5d45efdc fixed confirmation dialog. 2015-07-11 16:54:52 +02:00
Teja
7dcf2f38e2 upload button visible again. progress bar fix. 2015-07-11 16:25:32 +02:00
Teja
0ae0390dcf finally working implementation of ACC in the latest comm.py 2015-07-11 15:48:53 +02:00
Teja
0725ee23f3 cancelling print working. 2015-07-11 15:44:00 +02:00
Teja
23d29b29ba minor ui changes 2015-07-11 15:40:02 +02:00
Teja
08ab894ead support for ! and ~ commands 2015-07-11 10:10:39 +02:00
Teja
fee7b32413 basic acc attached. missing ! ~ command support. 2015-07-11 00:36:35 +02:00
Teja
64c0c0d473 just a test. inject acc to upstream comm.py 2015-07-10 23:35:56 +02:00
Teja
dffb123d0e little ui fixes. restart button removed as it was not working. 2015-07-09 18:05:01 +02:00
Teja
f842809db8 code cleanup 2015-07-09 17:02:58 +02:00