Commit Graph

1079 Commits (master)

Author SHA1 Message Date
Kaz Walker b0cb2b0781 Added icon files ad PNGs. 2013-02-17 14:11:01 -07:00
Kaz Walker 63bd1ca9f6 [printcore] Added checking to pause and resume function. 2013-02-17 14:09:38 -07:00
kliment 197f0ac1a8 Merge pull request #330 from colah/confirmation
Confirmation on exit
2013-02-12 23:19:27 -08:00
kliment 9f0cabae7d Merge pull request #332 from colah/exit-off
Make sure to set target temps to 0 before exiting.
2013-02-07 09:13:03 -08:00
Christopher Olah 29c3183168 Make sure to set target temps to 0 before exiting.
To ensure safety, we make sure we set target temps to 0 before we exit
pronsole.
2013-02-08 11:46:35 -05:00
Christopher Olah c20b270b84 Refactor and confirm exits while printing.
Presently, one might accidentally terminate a print with a CTR-D while
printing. Now we ask the user to confirm exiting if there is a print
going when they try to exit.
2013-02-02 21:24:07 -05:00
Christopher Olah 786baebbf8 Confirm dangerous extruder target temperatures.
Protect the user from typos in setting the extruder temp by confirming
them with the user if they exceed 250.
2013-02-02 10:25:16 -05:00
Miro Hrončok b0248934ff Added Fedora info 2013-02-02 13:40:28 +01:00
Kliment Yanev 37e27101f2 Merge branch 'master' of github.com:kliment/Printrun into experimental
Conflicts:
	gcoder.py
2013-02-02 11:49:42 +01:00
kliment 659cc0319b Merge pull request #324 from Lenbok/experimental-gcoder-relative-e
Support M82/M83 for relative E
2013-01-24 15:45:44 -08:00
Lenbok e2630df4bb Support M82/M83 for relative E 2013-01-25 07:29:45 +13:00
kliment 71e5da009a Merge pull request #318 from hroncok/master
Show connection error to the user
2013-01-23 08:20:43 -08:00
Miro Hrončok 354bfb090f Do not rise, but end the scope 2013-01-23 17:12:01 +01:00
Miro Hrončok 064974b733 Handle UTF encoding better 2013-01-23 17:11:08 +01:00
Miro Hrončok ee386e0091 Adding UTF-8 decoding back 2013-01-23 16:55:38 +01:00
kliment c527601f85 Merge pull request #321 from colah/clean-firmware-echo
Clean up echoed firmware lines, connect info.
2013-01-19 00:39:25 -08:00
Christopher Olah 1460246960 Clean up echoed firmware lines, connect info.
Presently, when you connect to a printer using pronsole, one sees
something like:

uninitialized>start
uninitialized>Printer is now online
uninitialized>echo: External Reset
printer>Marlin 1.0.0 RC2
...

With a few carriage returns and some string hackery, we clean up
the output so that one sees:

No port specified - connecting to /dev/ttyACM0 at 115200bps
start
Printer is now online
External Reset
Marlin 1.0.0 RC2

Much cleaner!
2013-01-19 18:34:15 -05:00
kliment c02e586533 Merge pull request #320 from colah/clean-monitor
Clean up the monitor command.
2013-01-19 00:39:06 -08:00
Christopher Olah 3fb7a3e71c Clean up the monitor command.
The monitor command now:

* Has more pythonic code
* Limits precision of progress elements (12.3% instead of 12.347812...%)
* Uses a carriage return to have print progress replace the previous
  progress line.

For example:

Monitoring printer, use ^C to interrupt.
Updating values every 5.000000 seconds.
Print progress: 0.3%

Previously, the line "Print progress: 0.3%" was "Print progress: 0.2%",
etc.
2013-01-19 19:11:04 -05:00
kliment 2a9433748c Merge pull request #319 from colah/dynamic-prompt
Fancy configurable prompts!
2013-01-19 00:38:49 -08:00
Christopher Olah 29c9700324 Fancy configurable prompts!
* Prompts are now generated based off of string templates,
  for example: "%(bold)sT:%(extruder_temp_fancy)s %(progress_fancy)s
  >%(normal)s "

* We have a dictionary of prompt string templates for different
  situations.

* We have bold support for the prompt.

* We have extruder temperature support for the prompt.

* We have progress support for the prompt.
2013-01-19 19:34:07 -05:00
Miro Hrončok f942c1a007 Tell the user, there was an error while connecting
Before, when there was an error while connecting, user didn't know, when
Pronterface wasn't launched from the terminal.

So you could just hit Connect button several times and all you've get was:
Connecting...
Connecting...
Connecting...

Now, when there is an exception during the connection, the user will notice:
Connecting...
Error: You are trying to connect to a non-exisiting port.

Or:
Connecting...
Error: You don't have permission to open /dev/ttyUSB0.
You might need to add yourself to the dialout group.

Unfortunately pyserial's SerialException doesn't provide errno yet, so the
message isn't so user friendly:
Connecting...
could not open port None: [Errno 2] No such file or directory: 'None'

I've filled a bug report with patch to pyserial.

Together with this I've realised, there is unnecessary UTF8 decoding of the
output. When user has UTF-8 locale, there was an exception when printing the
exception to the output (almost an exception inception). So I have dropped it,
but feel free to add it back, if I broke anything else.
2013-01-15 21:22:56 +01:00
kliment 92821f7e41 Merge pull request #317 from sivu/experimental
gcoder updated
2013-01-13 13:03:09 -08:00
Mikko Sivulainen aa1e576a1e gcoder updated 2013-01-13 23:00:19 +02:00
kliment 5897fbc60f Merge pull request #316 from hroncok/master
gcoder.py reads the file content instead of the file name when testing
2013-01-13 12:06:56 -08:00
Miro Hrončok 629a53ac5c gcoder.py reads only hte content of the file
Previously, gcoder.py read not only the content of the file, but also it's
filename. This could have led to unexpected exceptions.
2013-01-13 20:57:15 +01:00
Alessandro Ranellucci 094dffa53b Bugfix: printcore.py -s was generating garbage output 2013-01-13 13:27:14 +01:00
kliment a7300b60b7 Merge pull request #300 from hroncok/master
Added missing files to setup.py and fixed license notice in files which were not explicitly gplv3+.
2013-01-13 04:15:49 -08:00
Miro Hrončok d90166b04c Making the whole package GNU GPLv3+. 2013-01-13 12:18:47 +01:00
kliment 917256f947 Merge pull request #314 from colah/Ctr-C-D-fix
Fix Ctr-C and Ctr-D behavior.
2013-01-12 11:50:41 -08:00
kliment e73a8a9402 Merge pull request #313 from colah/temp-prompt
Temp prompt
2013-01-12 11:17:00 -08:00
Chris Olah a377b85c8f Make the dynamic prompt temperature stuff configurable. 2013-01-12 14:14:10 -05:00
Christopher Olah d3c1fbaa75 Fix Ctr-C and Ctr-D behavior.
We replace the cmdloop function with a slightly modified version
to achieve standard unix shell behavior on keyboard interupts and EOF.
2013-01-11 19:26:04 -05:00
Christopher Olah a224a10ce0 We make the prompt aware of extruder temperature.
In order to do this, we consolidate handeling of printer status
with a Status class. The status class is updated by recvcb.

This has the side effect of simplifying the implementation of gettemp.

We also detect whether there is a heated build platform or not, and
don't display info about it if there isn't.
2013-01-11 19:02:14 -05:00
Chris Olah df0265d4c6 Make prompt dynamically generated.
Prompt is now generated by a promptf() call for every cmdloop iteration.
2013-01-09 18:59:39 -05:00
Miro Hrončok 41889d62ed Added missing files to setup.py
If I install Printrun via setup.py, I don't have gcoder.py and I cannot even
use pronterface.py:

Traceback (most recent call last):
  File "/bin/pronterface.py", line 46, in <module>
    import pronsole
  File "/usr/bin/pronsole.py", line 23, in <module>
    from gcoder import GCode

So I've added this to setup.py.

Also, pronsole.ico is missing, added that to (not needed at runtime, but is
usefull for desktop files)
2012-11-24 15:53:03 +01:00
Kliment Yanev 80403aa7eb Make port textbox bigger 2012-11-13 17:36:12 +01:00
kliment 13a1425bad Merge pull request #297 from sivu/experimental
updated gcoder
2012-11-09 00:15:33 -08:00
Mikko Sivulainen 8f6f24d7a4 updated gcoder 2012-11-09 00:06:59 +02:00
Kliment Yanev 6fa47668f2 Merge branch 'master' of github.com:kliment/Printrun into experimental
Conflicts:
	pronterface.py
2012-11-03 12:18:04 +01:00
kliment 1d23c81f8e Merge pull request #293 from sivu/experimental
added gcoder from another project. using gcoder to calculate dimensions and used filament
2012-10-17 11:22:33 -07:00
Mikko Sivulainen 94666c2d13 updated gcoder copyright notice 2012-10-17 21:19:51 +03:00
Mikko Sivulainen 577ed7c8fb added gcoder from another project. using gcoder to calculate dimensions and used filament 2012-10-17 20:47:12 +03:00
kliment 51b5cf46dd Merge pull request #291 from sivu/experimental
fixed measurement calculation for X and Y axis
2012-10-09 09:23:11 -07:00
Mikko Sivulainen ab9002c579 fixed measurement calculation for X and Y axis
Conflicts:

	pronsole.py
2012-10-09 19:06:46 +03:00
iXce b6935b93d5 Merge pull request #288 from hroncok/master
Add the GNU GPL text as the licese itselfs demands
2012-09-23 17:13:33 -07:00
Miro Hrončok fa9ec49858 Added the GNU GPL text as the licese itselfs demands. 2012-09-24 01:01:21 +02:00
kliment 7333e93cc3 Merge pull request #286 from iXce/split-gui
GUI creation split
2012-09-10 04:56:18 -07:00
Guillaume Seguin 9c55677ec1 Fix custom button edit 2012-09-06 19:32:23 +02:00
Guillaume Seguin 7301d7e847 Merge branch 'experimental' of git://github.com/kliment/Printrun into split-gui 2012-09-06 18:07:08 +02:00