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
1441a7dbd8
Added missing image resource
2013-06-03 22:25:23 +02:00
Gina Häußge
107ff01b29
Merge branch 'gcodestreaming' into devel
2013-06-03 22:18:00 +02:00
Gina Häußge
41aa633f38
Added requirements for BeagleBone Black
...
Difference to regular dependencies is to not fetch pyserial and numpy via pip but instead install those from the available packages.
2013-06-02 13:41:03 +02:00
Gina Häußge
b0891b4d16
Added resource for retrieving a JSON representation of the current printer state (basically most of what's available on socket.io)
...
Endpoint is <baseurl>/ajax/state
2013-05-31 23:24:21 +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
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
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
6ce7fed96d
Removed cause of NPE
2013-05-22 18:32:19 +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
b048cc390b
Proper uploading incl. drag-n-drop for both local storage and SD card
2013-05-20 23:31:17 +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
Gina Häußge
427fa61ac6
Merge pull request #128 from marwue/patch-1
...
jQuery over SSL and GoogleCDN
2013-05-16 06:48:56 -07:00
Marlon Wünnemann
b61db6dc0f
jQuery over SSL and GoogleCDN
...
Issue #127
2013-05-16 16:43:09 +03:00
Gina Häußge
0f546f0053
Merge pull request #122 from norpchen/master
...
GCode files with unknown commands
2013-05-09 08:16:36 -07: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
fc56744705
Fixed URL for setting timelapse configuration.
...
Closes #110
2013-05-01 20:17:30 +02:00
Gina Häußge
245d9651b6
Merge branch 'devel' into repetier
2013-04-28 11:51:29 +02:00
Gina Häußge
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
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
b74d9d19ce
Merge pull request #101 from AxTheB/devel
...
Change shebang to run correct python in virtualenv
2013-04-15 15:06:09 -07:00
Václav 'Ax' Hůla
028751c193
Change shebang to run correct python in virtualenv
2013-04-15 13:38:35 +02:00
Gina Häußge
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
Gina Häußge
d7d8bba2e9
Fixed access to admin-only resources in case of disabled access control
2013-04-14 15:04:39 +02:00
Gina Häußge
552048efbe
Fixed Modernizr queries by gcode renderer
2013-04-14 13:42:30 +02:00
Gina Häußge
7e82214d75
Added missing files
2013-04-14 13:15:54 +02:00
Gina Häußge
f7334ef65f
Fixed some merge bugs
2013-04-13 22:26:23 +02:00
Gina Häußge
19dc238f06
User management now working
...
Also reorganized javascripts a bit (as preparation for some refactoring coming up) and renamed templates from ".html" to ".jinja2".
2013-04-13 22:21:53 +02:00
Gina Häußge
244ff25e2f
Fixed settings for gcode file list
2013-04-13 22:20:41 +02:00
Gina Häußge
3e5a6d3679
Furhter work on user management
2013-04-13 22:20:41 +02:00
Gina Häußge
93a73a0ad8
Added roles (user and admin) and according requirements
2013-04-13 22:19:17 +02:00
Gina Häußge
1febcd671a
"Writing" backend methods now protected (need logged in user (or dummy user if access control is disabled) to perform action), most "writing" frontend controls disabled if no logged in (or dummy) user returned from backend.
2013-04-13 22:19:17 +02:00
Gina Häußge
b27e1ce15e
User factory method for creating SocketConnection object for Tornadio2
2013-04-13 21:45:20 +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
150d6cb53d
First work on login and user management
2013-04-13 21:42:53 +02:00
Gina Häußge
34a860efda
Added confirmation dialog and different logo for print job restart
...
Closes #98
2013-04-10 16:37:12 +02:00