pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1199 commits 20 branches 22 tags 141 MiB
Commit graph

49 commits

Author SHA1 Message Date
Gina Häußge
e2bfdfd10c Added git information to website 
(cherry picked from commit 1caba2d)
 2013-06-29 13:46:12 +02:00
Gina Häußge
dd3e9030fa Yet another fix for the M999 resend issue 
Should hopefully now be also fixed in case of a newly established connection with the printer, which was a regression due to the fix of the resending code.
 2013-06-27 21:12:06 +02:00
Gina Häußge
e5389d0f0f Reverted bbad030a92 
Correct in devel branch, wrong in master branch (different counting).

Closes #166
 2013-06-24 18:24:45 +02:00
Bryan Mayland
66ddf77be8 Be able to cope with M999 causing a Resend: 1 
(cherry picked from commit 8b702db)
 2013-06-22 09:39:13 +02:00
Bryan Mayland
bbad030a92 Resend correct gcode line when resend is requested 
(manually cherry picked from commit c8875fd)
 2013-06-21 21:09:39 +02:00
Gina Häußge
9963c523c0 Do not display -1mm when printing from sd 2013-06-09 18:13:12 +02:00
Gina Häußge
d5a620f476 Introduced new function matchesGcode to properly test if a line contains a specific gcode 2013-06-09 18:03:41 +02:00
Gina Häußge
8d53f313fe Removed debug log output 2013-05-27 19:48:17 +02:00
Gina Häußge
b645073f1d Added SD state evaluation and SD commands 2013-05-26 18:53:43 +02:00
Gina Häußge
16f5e54bd7 Merge branch 'devel' into sdcard 
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/static/js/ui.js
	octoprint/util/comm.py
 2013-05-23 22:53:34 +02:00
Gina Häußge
08229598e6 Merge branch 'repetier' into devel 2013-05-23 22:45:21 +02:00
Gina Häußge
5b72be31ba Minor cleanup 2013-05-23 22:45:00 +02:00
Gina Häußge
da90b2d738 Try to remove timing issues when preparing next line to send 2013-05-23 22:37:02 +02:00
Gina Häußge
fa584d59c5 Made progress calculation more resilient, do not hit printer with commands like a freight train during warm up 2013-05-22 18:56:02 +02:00
Gina Häußge
75f53b8ab9 Properly parse Marlin's "opened file x" message 2013-05-22 18:25:26 +02:00
Gina Häußge
33bcf284a9 Always send all lower case filenames to the printer for sd card commands 2013-05-22 18:20:21 +02:00
Gina Häußge
bb954c50d2 Properly switch between file and sd printing 2013-05-21 23:41:18 +02:00
Gina Häußge
45fef79e3d Use M26 to reset SD position to 0 when cancelling and restarting a print, preprocess gcode before sending to printer 2013-05-21 23:30:29 +02:00
Gina Häußge
eeddf0ae1a Reset SD file data when disconnecting or when losing/regaining connection to the backend 2013-05-21 23:08:34 +02:00
Gina Häußge
783b3b8166 Merge branch 'master' into devel 2013-05-20 20:19:26 +02:00
Gina Häußge
039a17d923 First try at SD card support 2013-05-20 19:18:03 +02:00
Lars Norpchen
957213321e Print 'unknown G/M code' warnings to console once 2013-05-09 08:07:33 -07:00
Gina Häußge
d721e5edc2 Merge branch 'devel' into repetier 
Conflicts:
	octoprint/util/comm.py
 2013-04-16 15:14:18 +02:00
Gina Häußge
0bb17818e1 Do not convert command to send to upper case after checksum was calculated 
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"

Should fix #103
(cherry picked from commit 628ffb5)
 2013-04-16 14:46:22 +02:00
Gina Häußge
628ffb5600 Do not convert command to send to upper case after checksum was calculated 
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"

Should fix #103
 2013-04-16 14:45:25 +02:00
Gina Häußge
874a7421e9 Login and logout working for the first time 2013-04-13 21:45:20 +02:00
Gina Häußge
e70071f6c1 Removed waitForWait again (that didn't make much sense to begin with...) 2013-04-01 17:31:02 +02:00
Gina Häußge
f050567a1c User thread lock instead of boolean to ensure only one concurrent sending thread, introduced wait flag for repetier printers 2013-03-29 22:17:44 +01:00
daftscience
48a2fd71a7 More reliable initialization of communication with repetier 2013-03-26 07:25:16 +00:00
Tom
9b2d166c6c Prevents manual commands from interupting other commands 2013-03-25 14:01:48 -04:00
Gina Häußge
456ded3f36 Fixed off by one error in resend loop 2013-03-17 13:53:38 +01:00
Gina Häußge
ad1cbca22a Added known error messages for checksum mismatches or expected line issues from Repetier to recognized "auto-correction" errors, made code around all that a bit more readable. 2013-03-17 10:58:34 +01:00
Gina Häußge
d6a83d174f Overhauled resend handling to also work with alwaysSendChecksum feature. Also introduced new feature flag resetLineNumbersWithPrefixedN to make M110 commands send the target line number as part of their N prefix (Repetier), not as a separate N parameter (Marlin & co) 2013-03-16 18:25:39 +01:00
daftscience
5e22b4b096 Reset currentLine when changing state to printing 
This keeps gcodePos and current line in sync when changing status to "Printing"
 2013-03-16 05:30:02 -03:00
Gina Häußge
45419422d7 Merge branch 'devel' into repetier 2013-03-16 02:26:00 +01:00
Gina Häußge
8543d628b5 New serial log at ~/.octoprint/logs/serial.log 
Logs the same content as the terminal tab and is restricted to 2MB in size (hopefully).

Closes #77
 2013-03-16 02:24:33 +01:00
Gina Häußge
8ef580cfd9 Two changes to try to achieve repetier firmware compatibility 
- Read a "wait" as an empty line in order to send keep alive temperature updates
- Added option to add a checksum to all commands. Needed to add current line tracking for this, let's hope that we'll never get out of synch here...
 2013-03-16 01:57:05 +01:00
Tom
f10e10f5b3 Converts commands uppercase 2013-03-11 10:39:03 -04:00
Gina Häußge
c1f2866a94 Moved totalExtrusion calculation into existing branches, added calculation of currentE for relative extruders (in case GCODE switches back to absolute) 2013-03-02 13:39:44 +01:00
Gina Häußge
63888f5e2e Merge branch 'AxTheB-devel' into devel 2013-03-02 13:29:08 +01:00
Richard Mitchell
943d734993 That was easy enough to continue temp monitoring whilst paused 2013-03-01 22:19:58 +00:00
Václav 'Ax' Hůla
d667a0ff56 Fix filament measurement for relative extruders 2013-03-01 17:55:25 +01:00
Gina Häußge
cbae792dbe Added logging to file on top of to stdout, temperature parsing now can cope with negative temperature (shouldn't normally occur but seems to happen with buggy firmware), added option to wait for "start" response from printer firmware before switching to state "operational" (defaults to previous behaviour) 2013-02-17 17:47:06 +01:00
Gina Häußge
f03056c1b2 Made settings module more flexible regarding variable path lengths to needed values, made speed for printer movement configurable 2013-02-16 20:28:09 +01:00
Gina Häußge
9f52e90e44 Merge branch 'ajd4096-master' into devel 2013-02-06 19:56:45 +01:00
Andrew Dalgleish
53ce8953de Add support for M82/M83 absolute/relative extruder positions 2013-02-04 16:53:01 +11:00
Gina Häußge
8d90ad26ba Fixed exception triggered on analysis abort 2013-02-01 11:01:20 +01:00
Gina Häußge
49cd1ffbd6 Gcode filemanagement now lives in its own module. Upload triggers gcode analysis, result is stored into metadata file. Print jobs triggered and their results are saved as well. Adjusted UI to display gcode analysis result and last print date and (color coded) result if available. Also adjusted gcode file list to color code entries according to last print result. 2013-01-30 20:56:17 +01:00
Gina Häußge
720f3b3eb6 Renamed from Printer WebUI to OctoPrint 
The location of the config folder has changed. OctoPrint will try to migrate the configuration from its old location (~/.printerwebui, ...) to its new one (~/.octoprint, ...). For this to work the following conditions must be met: 1) the old config folder exists and is a directory 2) the new config folder does not exist at all. The migration functionality will be in the future.
 2013-01-18 23:44:11 +01:00