Commit Graph

1057 Commits (06e3a02d4f7132f34b092c90851ca700b4acca88)

Author SHA1 Message Date
fsantini 896804056e Merge branch 'core_mods' into experimental - implementation of pause 2013-04-08 19:01:24 +02:00
fsantini a6abdbb74f Host commands start with ;@ 2013-04-08 18:49:33 +02:00
Francesco Santini 5a059961fa Indentation fixes, limit calculations 2013-04-08 13:06:31 +02:00
fsantini 360b4f60e4 Pause code working;
implemented the @pause gcode host command (and a small framework for host commands)
2013-04-07 19:45:45 +02:00
fsantini 00f1306f08 Bugfixes in the analyzer
Pause code (Ported from RepetierHost, untested)
2013-04-06 18:22:56 +02:00
kliment 630d11783d Merge pull request #350 from kenaaker/experimental
Fix crash on SUSE when setting temperature due to setting temp field background color to "".
2013-03-29 08:23:13 -07:00
Ken Aaker 3826dd1732 Merge branch 'experimental' of git://github.com/kenaaker/Printrun into experimental 2013-03-28 11:43:50 -05:00
Ken Aaker 2aac06f9da Fix abort in wxColour_helper on OpenSUSE
This replaces "" strings that cause aborts in python-wxWidgets wxColour_helper with
Python None objects. This corrects an abort where the helper tries to fetch the
first byte of the colour string even when it's 0 length.
2013-03-27 19:45:30 -05:00
kliment 7363497cdf Merge pull request #347 from OliverEngineer/experimental
Update webinterface.py
2013-03-27 09:47:43 -07:00
N Oliver 06280e2ba8 Update webinterface.py
oops! :'( web/css/style.css
2013-03-25 16:38:13 -07:00
kliment 5979f27f5c Merge pull request #346 from OliverEngineer/experimental
attempting fix for issue 305
2013-03-24 00:30:10 -07:00
OliverEngineer 3cfe86f96e Adding AJAX to the web interface
need to explore CherryPy & websockets, but this quick'n'dirty is a big
speed increase
2013-03-23 18:02:18 -07:00
N Oliver c298228ce9 attempting fix for issue 305
Encountered https://github.com/kliment/Printrun/issues/305#issuecomment-12306186
This edit removed the error, but I don't know what the original output was so I'm not sure if this really _fixes_ it, or is just a band-aid.
2013-03-23 14:36:15 -07:00
fsantini 6cf08006c2 Indentation fixes, start pronterface modification 2013-03-14 07:35:17 +01:00
fsantini b335a4cf77 G-codes and relevant M-codes implemented (check for tabs/spaces) 2013-03-12 20:58:00 +01:00
Francesco Santini 60158d5e39 More implementation (still unusable) 2013-03-12 18:04:28 +01:00
fsantini 9ee7602ace Creation of GCodeAnalyzer.py
Imported and translated from RepetierHost

First commit unfinished implementation
2013-03-11 22:10:22 +01:00
kliment c5d812a0fd Merge pull request #342 from Metamaquina/experimental
experimental branch: fixing broken pyreadline download url
2013-03-05 14:35:34 -08:00
kliment 2090124e16 Merge pull request #341 from Metamaquina/master
fixing broken pyreadline download url
2013-03-05 14:34:48 -08:00
Felipe Corrêa da Silva Sanches bc478d1d42 updating download url for windows version of pyreadline 2013-03-05 14:56:50 -03:00
Felipe Corrêa da Silva Sanches bc741d67f4 updating download url for windows version of pyreadline 2013-03-05 14:53:35 -03:00
kliment a0f75e858e Merge pull request #337 from KazW/experimental
[printcore] Have print_thread rejoin execution thread.
2013-02-17 21:31:46 -08:00
Kaz Walker c3f7e4c1ac [printcore] Have pirnt_thread rejoin execution thread once print completes. 2013-02-17 18:45:56 -07:00
kliment 80d465c285 Merge pull request #336 from KazW/experimental
[printcore] Switched to use Python if syntax and not Ruby's.
2013-02-17 13:27:36 -08:00
Kaz Walker 0f8d170f53 Switched to using "not" instead of ! modifier. 2013-02-17 14:24:25 -07:00
Kaz Walker db88c702ff [printcore] Switched to use Python if syntax and not Ruby's. 2013-02-17 14:20:20 -07:00
kliment 07fae14c47 Merge pull request #335 from KazW/experimental
Add checking to pause/resume functions in printcore.py
2013-02-17 13:16:18 -08:00
Kaz Walker 8fb6c98d05 [printcore] fixed typo. 2013-02-17 14:14:02 -07:00
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