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
3130c0c30b
Fixed jobData key
2013-05-27 01:20:45 +02:00
624630ac63
Updated documentation of events
2013-05-27 01:03:53 +02:00
be99930021
Refactoring of event management
2013-05-27 00:56:57 +02:00
c836c79179
Merge branch 'norpchen-master' into events
...
Conflicts:
octoprint/printer.py
2013-05-26 20:24:51 +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
08229598e6
Merge branch 'repetier' into devel
2013-05-23 22:45:21 +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
535de9f12e
redundant start event trigger removed
2013-05-22 21:41:37 -06:00
622e1f2ee7
Do not display the filename that was just streamed to SD, suggests that it is already selected for printing
2013-05-22 23:27:51 +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
6ce7fed96d
Removed cause of NPE
2013-05-22 18:32:19 +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
3f98e0c687
Bug Fixes for Event Manager
2013-05-21 19:48:38 -07: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
96adc0dc85
Merge branch 'norpchen-master' into events
...
Conflicts:
octoprint/server.py
octoprint/settings.py
2013-05-21 22:38:56 +02:00
f6108b5422
Update README.md
...
Back out previous changes
2013-05-20 21:14:00 -06:00
525d73a20b
Event Manager
...
Added event manager to trigger system and gcode commands.
2013-05-20 20:04:21 -07:00
b048cc390b
Proper uploading incl. drag-n-drop for both local storage and SD card
2013-05-20 23:31:17 +02:00
783b3b8166
Merge branch 'master' into devel
2013-05-20 20:19:26 +02:00
039a17d923
First try at SD card support
2013-05-20 19:18:03 +02:00
427fa61ac6
Merge pull request #128 from marwue/patch-1
...
jQuery over SSL and GoogleCDN
2013-05-16 06:48:56 -07:00
b61db6dc0f
jQuery over SSL and GoogleCDN
...
Issue #127
2013-05-16 16:43:09 +03:00
7b214d3f16
Update README.md
2013-05-09 15:39:57 -06:00
905c3dbea6
Update README.md
2013-05-09 15:38:03 -06:00
c6363ea046
External commands on events
...
These changes address issues 87 and 22 by adding the ability to trigger
external commands on print start, done, cancel and z-height change.
2013-05-09 14:31:54 -07:00
b609123d8a
Revert "Added external system commands support for events"
...
This reverts commit 3b66f63ff2
2013-05-09 14:22:40 -07:00
3b66f63ff2
Added external system commands support for events
...
Print start, print end, print cancel, and Z height change can now
trigger external system commands. These are set in config.yaml and take
_FILE_, _PERCENT_, _LINES_ and _ZHEIGHT_ tokens to be passed to
external commands.
system_commands:
cancelled: echo cancelled _FILE_ at _PROGRESS_
percent done.
print_done: echo done with _FILE_
print_started: echo
starting _FILE_
z_change: echo _LINE_ _PROGRESS_ _ZHEIGHT_
2013-05-09 14:05:48 -07:00
0f546f0053
Merge pull request #122 from norpchen/master
...
GCode files with unknown commands
2013-05-09 08:16:36 -07:00
957213321e
Print 'unknown G/M code' warnings to console once
2013-05-09 08:07:33 -07:00
fc56744705
Fixed URL for setting timelapse configuration.
...
Closes #110
2013-05-01 20:17:30 +02:00
245d9651b6
Merge branch 'devel' into repetier
2013-04-28 11:51:29 +02:00
9e9705f1ce
Follow up to commit b9d467d
...
Forgot to change session key to new Flask-Principal attribute name, which caused issues on logout sometimes (but weirdly not always).
Closes #107
2013-04-26 22:26:19 +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
b74d9d19ce
Merge pull request #101 from AxTheB/devel
...
Change shebang to run correct python in virtualenv
2013-04-15 15:06:09 -07:00
028751c193
Change shebang to run correct python in virtualenv
2013-04-15 13:38:35 +02:00
b9d467d23f
Upgraded to most recent Flask-Principal version, since an attribute name was changed there which OctoPrint uses
2013-04-14 15:33:11 +02:00
d7d8bba2e9
Fixed access to admin-only resources in case of disabled access control
2013-04-14 15:04:39 +02:00
552048efbe
Fixed Modernizr queries by gcode renderer
2013-04-14 13:42:30 +02:00
7e82214d75
Added missing files
2013-04-14 13:15:54 +02:00
f7334ef65f
Fixed some merge bugs
2013-04-13 22:26:23 +02:00
Gina Häußge