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
107ff01b29
Merge branch 'gcodestreaming' into devel
2013-06-03 22:18:00 +02:00
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
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
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
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
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
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
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
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
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
3e5a6d3679
Furhter work on user management
2013-04-13 22:20:41 +02:00
93a73a0ad8
Added roles (user and admin) and according requirements
2013-04-13 22:19:17 +02:00
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
b27e1ce15e
User factory method for creating SocketConnection object for Tornadio2
2013-04-13 21:45:20 +02:00
874a7421e9
Login and logout working for the first time
2013-04-13 21:45:20 +02:00
150d6cb53d
First work on login and user management
2013-04-13 21:42:53 +02:00
656aeb0189
Fixed evaluation of boolean argument for loadAndPrint from UI
...
Closes #96 .
2013-04-07 22:06:17 +02:00
e70071f6c1
Removed waitForWait again (that didn't make much sense to begin with...)
2013-04-01 17:31:02 +02:00
9618407aed
Merge branch 'devel' into repetier
...
Conflicts:
octoprint/server.py
2013-04-01 17:25:08 +02:00
f70649b0d2
Removed a couple of redundancies for loadAndPrint button, actions are now disabled if they don't make sense
2013-03-30 18:21:49 +01:00
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
021f413c12
add "Load and Print" button which automatically starts printing when a gcode file is done loading.
...
Solves foosel/OctoPrint#91
2013-03-26 00:09:36 -05:00
178b2f36d7
Only log the terminal output to disk if the "--debug" commandline switch is given
...
Otherwise slowdowns might be caused on Raspberry Pi when dumping all printer communication to SD
2013-03-17 22:32:35 +01:00
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
45419422d7
Merge branch 'devel' into repetier
2013-03-16 02:26:00 +01:00
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
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
363f00775b
New config options for daemonization, configfile location and basedir location
...
Using --daemon {start|stop|restart} OctoPrint can now be daemonized/controlled in daemon mode. Via --pidfile it's possible to set the pidfile to use, --configfile allows specification of the config.yaml to use, --basedir specifies the location of the basedir from which to base off the upload, timelapse and log folders. I also updated the README to include some config file settings which were previously undocumented.
2013-03-11 21:00:43 +01:00
b23098a265
Fixed TimedTimelapse
...
Fixed access of interval attribute
2013-03-11 09:39:54 +01:00
1b1f118646
Merge branch 'richardjm-daemon' into daemon
...
Conflicts:
octoprint/server.py
2013-03-10 19:11:16 +01:00
ff1678ab30
Set shell=True in subprocess calls to allow usage of string commands (instead of lists separating command from arguments)
2013-03-10 17:17:50 +01:00
eb3832b028
Implemented support for customizable system actions/commands, e.g. for shutting down/rebooting the system OctoPrint's running on from within the UI.
2013-03-10 17:04:05 +01:00
07caef034b
Improve comment reason
2013-03-10 13:40:53 +00:00
37f3f771fb
Incorrect indentation
2013-03-10 13:18:34 +00:00
7226c1edae
Lots of work to daemonise - logging still not working
2013-03-10 13:14:37 +00:00
1d2a2c873f
Fixed settings for ffmpeg path
2013-03-09 00:29:07 +01:00
07d4a8fd4f
Added (optional!) watermark addition to generated timelapse movies.
2013-03-09 00:23:52 +01:00
70f5ea3f7f
Fixed configuration of snapshot url
2013-03-08 23:24:30 +01:00
1fbb73e448
Refactored pagination/sorting/filtering of gcode files into own configurable listHelper now used to provide pagination etc to both gcode and timelapse file list.
2013-03-06 23:27:16 +01:00
Gina Häußge