ce9557798b
Fixing #166 showed a deeper rooted issue with line number handling introduced with repetier/sdcard/gcodestreaming
...
Something like three wrongs led to one right. Core issue (not starting with line 0 but line 1 and not using the current line but the current line from the gcode file being sent, regardless of reset by M110) should now be rooted out.
2013-06-24 22:09:40 +02:00
a9ec4336de
More errors == more error events
2013-06-22 15:13:44 +02:00
79f2cd0e31
Merge branch 'devel' into events
...
Conflicts:
octoprint/util/comm.py
2013-06-22 15:08:53 +02:00
50914df07a
Made communication mode more error resilient
2013-06-22 15:03:01 +02:00
8b702db0d0
Be able to cope with M999 causing a Resend: 1
2013-06-22 09:36:21 +02:00
40b4bfad85
Merge branch 'feedbackCommands' into devel
2013-06-21 23:19:25 +02:00
6600eea1a2
Feedback commands now work
2013-06-21 23:19:15 +02:00
94316fbcc1
Merge remote-tracking branch 'CapnBry/resendfix' into devel
2013-06-21 21:03:59 +02:00
f041c6b4f3
First work on custom controls with printer feedback evaluation and presentation in the UI
2013-06-21 20:50:57 +02:00
5bf5d24dfc
Also include /dev/ttyAMA* in glob patterns for serial port
2013-06-21 15:03:32 +02:00
c8875fd0f1
Resend correct gcode line when resend is requested
2013-06-20 11:41:10 -04:00
236e26979f
Switched Timelapses to using Eventbus instead of direct connection
2013-06-16 21:50:50 +02:00
ed9e93f379
Merge branch 'devel' into events
...
Conflicts:
octoprint/printer.py
octoprint/server.py
octoprint/util/comm.py
2013-06-16 11:50:52 +02:00
e27b34a9f3
Hopefully fixed a off-by-one error...
2013-06-15 17:33:03 +02:00
d6ad8dca00
Indentation still wrong, caused another funny behaviour
2013-06-11 18:45:57 +02:00
25802ddb66
Fixed wrong indentation that caused a rather funny behaviour...
2013-06-09 19:30:42 +02:00
d0035c3f3a
Removed reference to remove feedratemodifier
2013-06-09 19:05:37 +02:00
8917d2e607
strip, not trim
2013-06-09 18:58:03 +02:00
b099bb443b
Trim sd filenames
2013-06-09 18:53:23 +02:00
ac4a0f772d
Fixed whitespace
2013-06-09 18:29:28 +02:00
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
9963c523c0
Do not display -1mm when printing from sd
2013-06-09 18:13:12 +02:00
d5a620f476
Introduced new function matchesGcode to properly test if a line contains a specific gcode
2013-06-09 18:03:41 +02:00
c36e39909e
Always reset heatingUp flag when receiving an ok
2013-06-09 17:44:06 +02:00
5b15d42881
Only send M105/M27 during sd printing when not currently heating up
2013-06-09 17:08:12 +02:00
90a1edbbcf
Testing out a space between the N-prefix and the command
2013-06-09 16:33:59 +02:00
30a57e21f4
Fixed line count incrementation for gcode streaming
2013-06-09 15:55:55 +02:00
8d4f7e2ba7
M20 on startup (2nd try)
2013-06-03 22:37:08 +02:00
480f0aef6f
M20 on startup
2013-06-03 22:32:23 +02:00
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
8d53f313fe
Removed debug log output
2013-05-27 19:48:17 +02:00
16befc84d2
Brought up to date with sdcard branch
2013-05-27 01:45:52 +02:00
d571aa588a
Merge branch 'sdcard' into events
...
Conflicts:
octoprint/printer.py
octoprint/server.py
octoprint/util/comm.py
2013-05-27 01:33:54 +02:00
be99930021
Refactoring of event management
2013-05-27 00:56:57 +02:00
b645073f1d
Added SD state evaluation and SD commands
2013-05-26 18:53:43 +02:00
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
5b72be31ba
Minor cleanup
2013-05-23 22:45:00 +02:00
da90b2d738
Try to remove timing issues when preparing next line to send
2013-05-23 22:37:02 +02:00
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
75f53b8ab9
Properly parse Marlin's "opened file x" message
2013-05-22 18:25:26 +02:00
33bcf284a9
Always send all lower case filenames to the printer for sd card commands
2013-05-22 18:20:21 +02:00
bb954c50d2
Properly switch between file and sd printing
2013-05-21 23:41:18 +02:00
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
eeddf0ae1a
Reset SD file data when disconnecting or when losing/regaining connection to the backend
2013-05-21 23:08:34 +02:00
38ec0b96b2
Started refactoring to match coding style and simplify things a bit.
2013-05-21 22:59:13 +02:00
525d73a20b
Event Manager
...
Added event manager to trigger system and gcode commands.
2013-05-20 20:04:21 -07:00
039a17d923
First try at SD card support
2013-05-20 19:18:03 +02:00
d721e5edc2
Merge branch 'devel' into repetier
...
Conflicts:
octoprint/util/comm.py
2013-04-16 15:14:18 +02:00
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
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