Commit Graph

907 Commits (c527601f85bfa0fc1293b81fef550aae831ed3e7)

Author SHA1 Message Date
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
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 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
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
Guillaume Seguin 55ff65805b Correctly parent xyz buttons code-wise 2012-09-06 17:35:44 +02:00
Guillaume Seguin 77376bc17c Fix custom buttons 2012-09-06 09:02:47 +02:00
Kliment Yanev ab7c278200 Merge branch 'experimental' of github.com:kliment/Printrun into experimental 2012-09-06 07:08:40 +02:00
Kliment Yanev 1581ab0b94 Fix exception when no bed present. Closes #283 2012-09-06 07:07:37 +02:00
Guillaume Seguin 8979ec888a Rename macroed to MacroEditor 2012-09-05 17:30:28 +02:00
Guillaume Seguin f8b7a52cbc Whitespace cleanup (extra newlines) on graph.py 2012-09-05 17:00:26 +02:00
Guillaume Seguin 37a442e6fd Cleanup imports 2012-09-05 16:55:28 +02:00
Guillaume Seguin 02ef52d777 Remove temperature gauges entirely from codebase 2012-09-05 16:46:39 +02:00
Guillaume Seguin ae7bac414b More cleanup of buttons handling, sanitize custom buttons 2012-09-05 16:32:35 +02:00
Guillaume Seguin d01cb51a57 Remove dead code 2012-09-05 15:47:10 +02:00
Guillaume Seguin bbcdf2f383 Cleanup factorized button creation, start using it more 2012-09-05 15:46:50 +02:00
Guillaume Seguin 8974ada134 Fix autosized button creation 2012-09-05 15:45:55 +02:00
Guillaume Seguin 0487808469 Improve lookup of files 2012-09-05 15:11:34 +02:00
Guillaume Seguin ffd7ff55dd Improve lookup of files 2012-09-05 15:11:11 +02:00
Guillaume Seguin b4f0240d4d Merge branch 'experimental' of github.com:kliment/Printrun into experimental 2012-09-05 14:43:08 +02:00
Guillaume Seguin 6b7532e723 re module was missing in pronterface_widgets 2012-09-05 14:40:16 +02:00
Guillaume Seguin 0d7a722839 Use correct variable for uppersizer 2012-09-05 14:37:03 +02:00
Guillaume Seguin 123fbf3802 re module was missing in pronterface_widgets 2012-09-05 13:27:49 +02:00
Guillaume Seguin 5f8d69c653 Merge branch 'experimental' of https://github.com/kliment/Printrun into split-gui 2012-09-05 13:26:00 +02:00
iXce a8621983fc Merge pull request #281 from cakeller98/experimental
Fixed a bug on windows that caused find to fail by a few spaces.
2012-09-05 04:22:45 -07:00
Guillaume Seguin 796968197d Factorize toolbar buttons creation 2012-09-05 13:20:37 +02:00
Guillaume Seguin db143e8589 Split GUI 2012-09-05 13:09:38 +02:00