Gina Häußge
40b4bfad85
Merge branch 'feedbackCommands' into devel
2013-06-21 23:19:25 +02:00
Bryan Mayland
6600eea1a2
Feedback commands now work
2013-06-21 23:19:15 +02:00
Gina Häußge
94316fbcc1
Merge remote-tracking branch 'CapnBry/resendfix' into devel
2013-06-21 21:03:59 +02:00
Gina Häußge
f041c6b4f3
First work on custom controls with printer feedback evaluation and presentation in the UI
2013-06-21 20:50:57 +02:00
Gina Häußge
5bf5d24dfc
Also include /dev/ttyAMA* in glob patterns for serial port
2013-06-21 15:03:32 +02:00
Bryan Mayland
c8875fd0f1
Resend correct gcode line when resend is requested
2013-06-20 11:41:10 -04:00
Gina Häußge
a4aacf6108
Merge branch 'CapnBry-extrudevol' into devel
2013-06-18 21:28:13 +02:00
Gina Häußge
7c85013389
Added filament diameter retrieval from gcode generated by Cura, fixed Slic3r version
2013-06-18 21:28:05 +02:00
Bryan Mayland
e32afe147a
Add extrusion volume calculation for Slic3r gcode files
2013-06-17 14:39:52 +00:00
Gina Häußge
d6ad8dca00
Indentation still wrong, caused another funny behaviour
2013-06-11 18:45:57 +02:00
Gina Häußge
25802ddb66
Fixed wrong indentation that caused a rather funny behaviour...
2013-06-09 19:30:42 +02:00
Gina Häußge
d0035c3f3a
Removed reference to remove feedratemodifier
2013-06-09 19:05:37 +02:00
Gina Häußge
8917d2e607
strip, not trim
2013-06-09 18:58:03 +02:00
Gina Häußge
b099bb443b
Trim sd filenames
2013-06-09 18:53:23 +02:00
Gina Häußge
ac4a0f772d
Fixed whitespace
2013-06-09 18:29:28 +02:00
Gina Häußge
8be1329a71
Merge branch 'devel' into gcodestreaming
...
Conflicts:
octoprint/printer.py
octoprint/static/js/ui.js
octoprint/templates/index.jinja2
octoprint/util/comm.py
2013-06-09 18:28:40 +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
c36e39909e
Always reset heatingUp flag when receiving an ok
2013-06-09 17:44:06 +02:00
Gina Häußge
5b15d42881
Only send M105/M27 during sd printing when not currently heating up
2013-06-09 17:08:12 +02:00
Gina Häußge
90a1edbbcf
Testing out a space between the N-prefix and the command
2013-06-09 16:33:59 +02:00
Gina Häußge
30a57e21f4
Fixed line count incrementation for gcode streaming
2013-06-09 15:55:55 +02:00
Gina Häußge
8d4f7e2ba7
M20 on startup (2nd try)
2013-06-03 22:37:08 +02:00
Gina Häußge
480f0aef6f
M20 on startup
2013-06-03 22:32:23 +02:00
Gina Häußge
56cb1c294c
Changed to GCODE streaming instead of loading it all into memory -- no more loading times. Also better file handling.
2013-05-31 22:41:53 +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
