Commit graph

96 commits

Author SHA1 Message Date
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
Kliment Yanev
02f14d5090 Fix comment stripping in duration estimation 2011-11-28 18:15:59 +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
ErikZalm
21d81f76a5 Enable T codes like T0 and T1. 2011-11-20 19:55:17 +01:00
Keegi
1d6605065d Merge branch 'master' into experimental 2011-11-09 15:16:04 +02:00
Steven Devijver
262b000f7a Removed initial_feedrate, isn't used anyways, will only confuse people 2011-11-04 14:12:18 +01:00
Steven Devijver
80a1301bfd Simplified duration calculation, acceleration calculation is not realistic anyways 2011-11-04 13:51:36 +01:00
Steven Devijver
e89eba8c9b Use latest feedrate, no need to fall back 2011-11-04 13:03:54 +01:00
Steven Devijver
0500332267 Also take forward movement after retraction into account 2011-11-04 12:48:38 +01:00
Steven Devijver
0bff3c93e4 Added retraction to calculation, format time in lower case 2011-11-04 12:41:13 +01:00
Steven Devijver
be5f0e4900 Moved estimated duration code to pronterface 2011-11-04 11:49:05 +01:00
Keegi
f0f6333681 better temperature combo box behavior when heated up 2011-10-25 22:56:44 +03:00
Denis B
ea72af56c1 Fixed hang on the second launch of skeinforge settings dialog under Windows. 2011-09-28 13:46:01 +02:00
kludgineer
5d2ea3cf4d pla temps set to better defaults 2011-08-27 01:16:35 -07:00
Skateboss
4f8cffd9b0 removed minmax() 2011-08-27 09:11:52 +02:00
Skateboss
52bb2bf919 Added two functions to return measurements in 'mm' when loading a .stl or gcode file. 2011-08-27 08:51:01 +02:00
Keegi
d482c6636b Remove diagnostic message about saving data into .pronsolerc 2011-08-12 08:55:13 +03:00
Kliment
013c9f0bec Add estimated filament length used.
Print elapsed time at end of print.
2011-08-06 14:48:10 +02:00
Keegi
2e99e1d72d improve confusing message about saving key when it is erased 2011-08-04 14:07:19 +03:00
Keegi
8dd97e12e7 Custom button customisation implemented 2011-08-04 14:03:35 +03:00
kliment
7abc2d59ce Fix homing for people in the stone age (using FiveD) 2011-07-28 12:07:47 +02:00
Keegi
ae81b88340 Python 2.5 friendly exception catching syntax change 2011-07-27 21:41:40 +03:00
Keegi
fba262be54 Options dialog 2011-07-26 19:29:55 +03:00
Keegi
0af5005052 Edit macros via menu access 2011-07-26 19:29:52 +03:00
kliment
dffa62023c Use G28 for individual axis homing 2011-07-20 15:10:01 +02:00
Keegi
2dc8272345 fix for unitialized variable error when .pronsolerc does not exist 2011-07-18 18:25:15 +03:00
Keegi
1d5ce77a36 some fixes to macro editor routines 2011-07-15 11:12:21 +03:00
Keegi
2834e5631e Merge remote branch 'kliment/master' 2011-07-15 10:19:53 +03:00
kliment
655ab135e5 Fix permissions, allow commands when printer disconnected 2011-07-15 09:15:12 +02:00
Keegi
7e80870c52 Merge remote branch 'kliment/master' 2011-07-12 00:15:58 +03:00
kliment
76818fc072 Fix crash on new file load 2011-07-10 11:57:11 +02:00
Keegi
d08bc641c0 simple small GUI editor for macros in pronterface 2011-07-07 00:19:45 +03:00
Keegi
8ca085a728 changed order of parsing startup config files and -e commands 2011-07-04 13:06:58 +03:00
Keegi
6f4ea3baf1 command line parsing, -c for overriding .pronsolerc filename/location, -e for commands from command line 2011-07-04 12:06:18 +03:00
Keegi
6ed74e6a63 Fixed missed change from self.feed{xyze} into self.settings.{xyze}_feedrate 2011-06-29 23:13:43 +03:00
Keegi
afb7236d03 pronterface to take into account the defaults (port, baudrate, feedrates) 2011-06-29 22:27:00 +03:00
Keegi
3de92320f8 command "set" to store persistent variables for preferences 2011-06-29 21:51:24 +03:00
Keegi
5f16c89d10 Fixed typo 2011-06-27 00:37:55 +03:00
Keegi
0fee017277 macro persistence 2011-06-27 00:05:22 +03:00
Keegi
2810993f06 Read .pronsolerc from current directory if not found in home directory 2011-06-25 11:03:01 +03:00
Keegi
936a2685be making macros work on pronterface (it was missing pronsole.__init__ call)
refactored reading pronsolerc as separate function, call that from pronterface
2011-06-20 23:41:31 +03:00
kliment
347124df57 Safer string handling. 2011-06-11 23:03:01 +02:00
kliment
756fa55fd2 Zero extruder after homing 2011-06-11 19:32:11 +02:00
kliment
95f6d22189 Fix z homing 2011-06-10 10:46:09 +02:00
kliment
0a79e1543e More precise homing 2011-06-10 10:24:16 +02:00
kliment
0d5809eada Slow approach on homing. Loaded filename in monitor output 2011-06-10 10:12:12 +02:00
kliment
80b222902b Remove dependency on "with" - works with python 2.5 2011-06-09 19:03:57 +02:00
kliment
cee3698530 Controllable feedrates 2011-06-09 18:44:57 +02:00
kliment
7a8819e448 Pronterface: remember dir across opened files 2011-06-09 16:43:03 +02:00