69793bd295
Merge branch 'experimental' of github.com:kliment/Printrun into experimental
2013-05-19 13:34:59 +02:00
98bdb2b108
Enable manual commands of any format to be passed through if prefixed by @
2013-05-19 13:32:58 +02:00
c5de6439e0
More translation strings for pronsole.py
2013-05-19 12:58:57 +02:00
9f9b8d05cd
Cleanup pronsole.py loading & some SD stuff
2013-05-19 12:38:40 +02:00
1dfb0cd6fe
Cleanup pronsole._do_load and parse gcode from there
2013-05-19 00:17:10 +02:00
7fc0f1c475
Add -g/--gauges CLI argument for temp gauges, and improved argparsing.
...
The gauges options is a CLI parameter as having it as an option would be
too painful to handle for now.
Argument parsing has been improved so that pronterface can add its own CLI
parameters in addition to pronsole's ones.
2013-05-17 17:04:41 +02:00
fb3e4068c0
Replace getopt CLI option parsing with a cleaner argparse parsing
2013-05-16 12:21:37 +02:00
f63dfe9981
Minor presentation error fix in pronsole.py
2013-05-16 12:21:17 +02:00
c5cb9a9926
Minor cleanups in pronsole.py
...
Command line option parsing really needs a better rework, to use optparse or
argparse and support gcode/stl filename argument.
2013-05-16 11:45:52 +02:00
79d0477553
Move code around and remove useless helpers from pronsole.py
2013-05-15 15:23:46 +02:00
b3a673bc97
Merge pull request #358 from DanLipsitt/patch-1
...
fix typo in do_pause() log output
2013-05-01 22:11:27 -07:00
5ddbed5091
fix typo in do_pause() log output
2013-05-01 15:23:05 -07:00
31891fa3da
Merging experimental branch with Pronserve
2013-04-19 20:42:03 -04:00
5f1955901c
Adding "Pronserver" - a network discoverable 3d printer service.
2013-04-10 22:49:35 -04:00
eb0f808bf4
Refactoring Pronsole to wrap print in a self.log method so that it can be reused and overriden by a web interface or any other non-conosole interface
2013-04-10 09:05:08 -04:00
e1660bd7f0
Removing the web interface bindings from pronsole and pronterface
2013-04-09 15:46:40 -04:00
197f0ac1a8
Merge pull request #330 from colah/confirmation
...
Confirmation on exit
2013-02-12 23:19:27 -08:00
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
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
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
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
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
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
c02e586533
Merge pull request #320 from colah/clean-monitor
...
Clean up the monitor command.
2013-01-19 00:39:06 -08:00
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
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
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
a377b85c8f
Make the dynamic prompt temperature stuff configurable.
2013-01-12 14:14:10 -05:00
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
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
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
577ed7c8fb
added gcoder from another project. using gcoder to calculate dimensions and used filament
2012-10-17 20:47:12 +03:00
ab9002c579
fixed measurement calculation for X and Y axis
...
Conflicts:
pronsole.py
2012-10-09 19:06:46 +03:00
107280b822
Rerun reindent.py
2012-09-05 10:11:48 +02:00
bff5a8ff51
Merge branch 'experimental' into connection-rework
...
Conflicts:
printrun/printcore.py
pronsole.py
pronterface.py
2012-09-05 09:56:16 +02:00
fd08509b75
Merge branch 'experimental' of https://github.com/kliment/Printrun into experimental
...
Conflicts:
pronterface.py
2012-09-02 11:48:31 +02:00
ef6ffecfd4
Patching do_load so that it updates the pronterface ui when the load command is used within pronterface
...
Conflicts:
pronterface.py
2012-08-20 11:47:04 -04:00
47aea82ade
pronsole.py: repeat manual commands only in non-verbose mode.
...
In verbose mode (self.p.loud = True), the code actually sending
the G-code line prints this, too, so this was a duplicate.
2012-08-13 16:34:54 +02:00
6f446e3726
More automated cleanup
2012-08-08 09:58:09 +02:00
77eb2440e3
Semi-automated coding style cleanup
2012-08-08 09:38:48 +02:00
e3b8fb491d
Whitespaces
2012-08-08 08:41:31 +02:00
8cc134955f
Run reindent.py on the whole repository
2012-08-08 08:39:50 +02:00
08c42443f1
Improve (and fix) time displays
2012-08-07 13:54:07 +02:00
24b7f97887
Correctly import printcore in pronsole and pronterface
2012-08-04 10:43:29 +02:00
72173c6023
Add CLI parameters for web config files location (if not in ~/.printrun or cwd)
...
Also remove the chdir() to pronterface.py directory
2012-07-31 22:37:00 +02:00
cc60367a83
New commandline paramters : -w/--web to request web interface
...
Also install webinterface deps and fix bug in configfile()
2012-07-31 12:00:05 +02:00
888143be42
Initial work towards a setup.py build system
2012-07-31 10:51:17 +02:00
e73e11d554
Allow unicode characters in custom button command names
2012-07-15 14:55:11 +02:00
73055e59a8
Fix math domain error in estimation code.
...
Make crash in estimation code not block file load.
Diable web interface by default.
2012-07-15 13:07:16 +02:00
227c0595a2
made wording slicer-agnostic
2012-05-23 17:01:04 +02:00
Guillaume Seguin