Commit Graph

502 Commits (04b72b2835be9ca11da91b9c0cd7ce438ce69063)

Author SHA1 Message Date
Nathan Zadoks 04b72b2835 Made SD Upload call the right function - not the SD Print function 2011-12-04 01:41:33 +01:00
Kliment Yanev 2e416a7c25 Merge branch 'master', remote-tracking branch 'origin' into experimental 2011-12-03 23:10:59 +01:00
Kliment Yanev 10c2841c3f Merge branch 'experimental' of github.com:kliment/Printrun into experimental 2011-12-03 23:06:38 +01:00
Kliment Yanev 0421125340 Add buggy and slow gcode rendering (hard disabled by default) 2011-12-03 23:05:30 +01:00
Keegi 7030fcad05 sort settings alphabetically in options dialog 2011-12-02 10:21:16 +02:00
Keegi a99a801c02 escape backslashes - work around shlex eating them before passing filename on to slicer 2011-12-02 10:20:37 +02:00
Kliment Yanev 344cee8452 Make gviz scale 2011-11-30 21:49:31 +01:00
Kliment Yanev 3772428ecd Merge branch 'experimental' of github.com:kliment/Printrun into experimental 2011-11-30 19:05:44 +01:00
Kliment Yanev 901bacd4fb Fix spurious extra triangles in gcode view 2011-11-30 19:05:12 +01:00
kliment 9c72e79ad4 Merge pull request #113 from johnflux/experimental
Fix send box not expanding correctly, and fix layouting in custom button dialog
2011-11-30 06:08:08 -08:00
John Tapsell 1c707c7a7e Make the send textbox in the GUI expand properly 2011-11-30 13:59:38 +00:00
John Tapsell fe1e6659c5 Fix the custom color dialog to resize properly 2011-11-30 13:35:33 +00:00
kliment bdb9eae00b Merge pull request #112 from tjhowse/master
Sends M21 whenever SD Upload or SD Print are used.
2011-11-30 05:23:57 -08:00
tjhowse daf74897ae Fixed indenting. 2011-11-30 23:18:12 +10:00
tjhowse c4251c1925 SD Upload and SD Print buttons send an M21.
Automatically attempts to initialise the SD card whenever either of the SD
card related buttons are used.
2011-11-30 23:12:59 +10:00
kliment 75e1df750d Merge pull request #111 from johnflux/experimental
Allow the graph to expand
2011-11-30 04:42:40 -08:00
John Tapsell 6d8be315d8 Allow the graph to expand 2011-11-30 12:29:51 +00:00
kliment f2d965f429 Merge pull request #110 from johnflux/experimental
This cleans up the layouting code for the GUI
2011-11-30 03:27:20 -08:00
John Tapsell 033daa2105 Clean up the layouting code and let the log box grow with the dialog box 2011-11-30 11:21:09 +00:00
Kliment Yanev 5c4e1691e2 Merge branch 'master', remote-tracking branch 'origin' into experimental 2011-11-30 06:44:00 +01:00
kliment f63e3800c7 Merge pull request #108 from cakeller98/master
Added Current Z-Height to the status message.
2011-11-29 15:17:01 -08:00
Christopher Keller 225d61651c Added Current Z-Height to the status message.
Also added "Print Began at: HH:MM:SS"
and added the message "Print Ended at: HH:MM:SS: and took...
2011-11-29 14:37:34 -08:00
Kliment Yanev 3cfc76512c Gcode view debugging 2011-11-29 15:10:28 +01:00
kliment a09633a25e Merge pull request #107 from cakeller98/Estimated_Time_Status
Improved status line estimated time remaining.
2011-11-28 21:33:17 -08:00
kliment c62f5d5f81 Merge pull request #106 from cakeller98/Time_Estimater
Fixed the time estimator in pronsole.py
2011-11-28 21:32:49 -08:00
Christopher Keller cc40719e6c Fixed the time estimator in pronsole.py
at beginning of move set feedrate to average of last and current feedrate.  do move with that feedrate.
then set the feedrate to the current feedrate.
if it's just a feedrate change, then the feedrate will become the feedrate.
if there is no feedrate in current move, feedrate will be last feedrate
if there is a move and a new feedrate then the move will take however long the average feedrate would take.

estimation is a bit more optimistic than pessimistic.  however it seems to be a lot more accurate.
2011-11-28 20:36:04 -08:00
Christopher Keller 33610d53fb Improved status line estimated time remaining.
uses format:
SD Printing: pp.p% | Est: hh:mm:ss of hh:mm:ss of hh:mm:ss remaining
Printing: pp.p% | @ Line# xxx of yyyyy lines | Est: hh:mm:ss of hh:mm:ss remaining
2011-11-28 20:24:18 -08:00
Kliment Yanev 713c0c9265 Fix accumulating transformations in stlview 2011-11-28 19:31:54 +01:00
Kliment Yanev 3316dac639 Merge branch 'master' into experimental
Conflicts:
	stlview.py
2011-11-28 18:27:27 +01:00
Kliment Yanev 02f14d5090 Fix comment stripping in duration estimation 2011-11-28 18:15:59 +01:00
kliment db669df571 Merge pull request #104 from cakeller98/master
Added an Estimated Time Remaining of Total Time to the status bar.
2011-11-28 08:45:45 -08:00
Christopher Keller 2079a99278 Added Estimated time left, and total time,
for non-SD Printing. They get more and more accurate until the end.
2011-11-28 07:44:29 -08:00
Kliment Yanev 244350fee1 Merge branch 'master' into experimental 2011-11-27 17:34:09 +01:00
Kliment Yanev f7e14bf772 Merge branch 'master' of github.com:kliment/Printrun 2011-11-27 17:31:12 +01:00
Kliment Yanev 1eee27aa77 Ignore comments in gcode files when estimating duration 2011-11-27 17:30:35 +01:00
Kliment Yanev 97af7725d9 Prevent (harmless) exception on every printed gcode line 2011-11-24 00:41:49 +01:00
Kliment Yanev 56a4a0d98b Fix escalating memory usage when multiple large files are printed after each other.
React to resend only when the command is in the beginning of a line.
2011-11-22 21:32:16 +01:00
Kliment Yanev aa0a045ecd Reduce memory usage by clearing gviz cache. Avoid delays by using a queue to draw executed gcodes. 2011-11-22 19:08:00 +01:00
Kliment Yanev d05a399684 Fix bug where second and subsequent file load would cause an error and refuse to load further files. Closes #102 2011-11-22 18:51:18 +01:00
kliment edeb43396f Merge pull request #98 from canadaduane/friendlydisconnect
Catch exception so that disconnection does not give a traceback
2011-11-20 15:50:06 -08:00
kliment d704bba39e Merge pull request #100 from ErikZalm/master
Small change to enable T0 and T1 commands.
2011-11-20 15:49:25 -08:00
ErikZalm 21d81f76a5 Enable T codes like T0 and T1. 2011-11-20 19:55:17 +01:00
Kliment Yanev 03f727aa92 Merge branch 'master' into experimental 2011-11-20 09:20:37 +01:00
Kliment Yanev 82aa15becc Merge branch 'master' of github.com:kliment/Printrun 2011-11-20 09:19:23 +01:00
Kliment Yanev db0b48ce25 Remove readonly attribute from dropdowns for port and baud rate 2011-11-20 09:18:38 +01:00
Kliment Yanev 8a4bdc9290 Fix path handling when frozen (__file__ should be avoided in the future, this is a workaround) 2011-11-18 10:49:29 +01:00
Kliment Yanev 2bd2318070 Fix cancel button 2011-11-18 10:48:56 +01:00
Kliment Yanev 0afcc88bd4 Integrate plating into pronterface UI 2011-11-18 09:52:16 +01:00
Kliment Yanev 9669cd4337 Fix rotation direction 2011-11-17 19:31:54 +01:00
Kliment Yanev 84a6093a35 Change window title 2011-11-17 16:33:41 +01:00