Commit Graph

45 Commits (bd61d45e2702905d78754caf30c234f506c44c0e)

Author SHA1 Message Date
Gina Häußge 599bca12a9 Changed api > allow to api > enabled for consistency 2013-06-23 19:48:12 +02:00
Gina Häußge c6e15a7d32 Merge branch 'richardjm-devel' into devel
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/templates/index.jinja2
2013-06-23 16:09:31 +02:00
Gina Häußge 31045b4c25 Merge branch 'peteruithoven-master' into devel
Conflicts:
	octoprint/timelapse.py
2013-06-23 14:58:58 +02:00
Bryan Mayland 329656837a Renamed flipX, flipY to flipH, flipV, made update upon change instant, also made timelapse video reflect flipped webcam 2013-06-23 14:57:48 +02:00
Gina Häußge 79f2cd0e31 Merge branch 'devel' into events
Conflicts:
	octoprint/util/comm.py
2013-06-22 15:08:53 +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
peteruithoven ecfdb37f93 Adding classes according to flipX, flipY settings and flipping using css 2013-06-19 02:39:49 +02:00
peteruithoven e8913e3141 Adding settings for webcam flipX and flipY 2013-06-19 00:42:43 +02:00
Gina Häußge 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
Gina Häußge 4509eab816 Enable sd support by default 2013-06-09 18:04:25 +02:00
Gina Häußge 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
Gina Häußge be99930021 Refactoring of event management 2013-05-27 00:56:57 +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 96adc0dc85 Merge branch 'norpchen-master' into events
Conflicts:
	octoprint/server.py
	octoprint/settings.py
2013-05-21 22:38:56 +02:00
Lars Norpchen 525d73a20b Event Manager
Added event manager to trigger system and gcode commands.
2013-05-20 20:04:21 -07:00
Gina Häußge 039a17d923 First try at SD card support 2013-05-20 19:18:03 +02:00
Richard Mitchell c1760c9940 A very simple API endpoint for loading and printing files direct. This is by default turned off and it "allowed" via the settings
From within Slic3r adding a post-processing script .bat containing

c:\curl\curl "http://192.168.0.7:5000/api/load?apikey=D96FA6A216CB44F78705D4506689D0EC&print=true" -F file=@%*
2013-05-18 17:47:31 +00:00
Lars Norpchen 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
Lars Norpchen b609123d8a Revert "Added external system commands support for events"
This reverts commit 3b66f63ff2.
2013-05-09 14:22:40 -07:00
Lars Norpchen 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
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 874a7421e9 Login and logout working for the first time 2013-04-13 21:45:20 +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
Gina Häußge 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
Gina Häußge 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
Gina Häußge 7e595b27ed Bugfix: configfile parameter was not properly used for settings in all cases 2013-03-16 01:48:28 +01:00
Gina Häußge 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
Gina Häußge 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
Gina Häußge 07d4a8fd4f Added (optional!) watermark addition to generated timelapse movies. 2013-03-09 00:23:52 +01:00
Gina Häußge 6eb8991035 Migrated ui.css to LESS (just some small touch ups compared to plain css version, nothing fancy) 2013-03-07 22:19:33 +01:00
Gina Häußge 9b3fc0c65e Set default instance name to empty string 2013-03-03 16:57:35 +01:00
Gina Häußge e0b405054a Fixed some whitespace and reworked custom title to always include an "OctoPrint" prefix (gotta protect the "brand" here ;)) 2013-03-02 12:42:35 +01:00
Richard Mitchell 260606601d Title and limited color control via settings 2013-03-02 10:56:32 +00:00
Richard Mitchell 9ba88a7d1a New temperature profile settings and hooked into ui. WIP: add and remove profiles 2013-02-23 17:47:01 +00:00
Richard Mitchell 9e351339a4 Added features for quick setting of temperatures for PLA and ABS - configured via new settings.
Not perfect, I'd like to show temperature to be set in UI.
On clicking it always moves to the top of the page.
The overflow and temp layout changes are to allow the drop down to display outside of the tab.

Is it worth having more temp boxes e.g. Nylon? - array like similar to move speeds?
2013-02-23 01:09:30 +00:00
Gina Häußge 1c4203b708 Added settings dialog for configuring OctoPrint
Warning: Many settings will need a restart of OctoPrint to take effect, adding corresponding notes is still a TODO. There's also no proper validation and error handling yet, so use at your own risk.
2013-02-17 22:30:34 +01:00
Gina Häußge cbae792dbe Added logging to file on top of to stdout, temperature parsing now can cope with negative temperature (shouldn't normally occur but seems to happen with buggy firmware), added option to wait for "start" response from printer firmware before switching to state "operational" (defaults to previous behaviour) 2013-02-17 17:47:06 +01:00
Gina Häußge f03056c1b2 Made settings module more flexible regarding variable path lengths to needed values, made speed for printer movement configurable 2013-02-16 20:28:09 +01:00
Gina Häußge ea52bbfb14 Merge branch 'gcodeViewer' into devel
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/static/js/ui.js
2013-02-03 21:38:00 +01:00
Gina Häußge 6fd0646128 Revamped gcode analysis.
Now UI and backend take data from saved metadata (if available). Metadata gets written after file upload and also on startup (for files that have not been added yet). Gcode analysis is interrupted if a printjob is started and resumed when it ends. Frontend is notified when new metadata comes available and UI triggers reload of gcode file list.  Also started on implementing proper logging.
2013-02-03 21:14:22 +01:00
Alex Ustyantsev e49669430b gCodeVisualizer can be enabled as a feature in config now (enabled by
default)
2013-02-03 12:04:41 +03:00
Gina Häußge ee7a1f9615 Added custom controls via configuration file.
Closes #13
2013-01-27 18:28:11 +01:00
Gina Häußge 0552d43b16 Further work on custom controls and custom bitrate for timelapses 2013-01-27 11:12:28 +01:00
Gina Häußge 9e964ea393 Switched config format from ini to yaml to allow more complex configuration options (in this case for custom controls) 2013-01-22 21:32:14 +01:00
Gina Häußge 720f3b3eb6 Renamed from Printer WebUI to OctoPrint
The location of the config folder has changed. OctoPrint will try to migrate the configuration from its old location (~/.printerwebui, ...) to its new one (~/.octoprint, ...). For this to work the following conditions must be met: 1) the old config folder exists and is a directory 2) the new config folder does not exist at all. The migration functionality will be in the future.
2013-01-18 23:44:11 +01:00