Commit Graph

66 Commits (9254dbe535272c0ac3fb2f89f084e2be4e8d7afa)

Author SHA1 Message Date
Gina Häußge 5a6cd58f19 Make swallowOkAfterResend default to True, part of the fix for #166 2013-10-20 14:35:03 +02:00
Gina Häußge 93db51ecb9 Allow definition of additional glob patterns for serial ports
Configuration happens via config.yaml, just add additional patterns by listing them under serial > additionalPorts, e.g.

    serial:
        additionalPorts:
        - /dev/myCustomPort
        - /dev/myOtherCustomPort
2013-09-08 16:00:47 +02:00
Gina Häußge 0471f1155e Timelapse configuration may now be saved
Persisted configuration will automatically be loaded upon startup. May be overridden by custom settings. Current timelapse configuration is visible in State box.

Closes #116
2013-09-08 15:41:26 +02:00
Gina Häußge 715dea7eb3 Merge branch 'repetier' into devel 2013-09-02 17:35:52 +02:00
Gina Häußge 55cb991c44 Allow disabling of the temperature graph and gcode visualizer without any side effects
Also introduced feature parameter for the temperature graph

See #215
2013-08-29 21:16:35 +02:00
Gina Häußge edcc11376e Fixed merge error 2013-08-27 22:15:11 +02:00
Gina Häußge fcbd5ba042 Merge branch 'devel' into repetier
Conflicts:
	octoprint/settings.py
2013-08-27 22:14:09 +02:00
Gina Häußge 46500cea7c Implemented configurable terminal filters 2013-08-27 21:31:12 +02:00
Gina Häußge d12da2548f New option "swallowOkAfterResend" for Repetier, changed initial linenumber for serial comm to 1 2013-08-26 14:44:31 +02:00
Gina Häußge 3e0abf1b20 New custom control type "feedback"
Like "feedback_command", but without the button
2013-08-21 20:33:55 +02:00
Gina Häußge 6ab8b76859 Allow more than one local network to be defined 2013-08-18 22:50:52 +02:00
Gina Häußge 54175d2146 First throw at autologin capabilities 2013-08-18 18:33:21 +02:00
Gina Häußge 4cf041aaad Enforces a new first-run setup wizard for access control to be run and forbids running OctoPrint as root unless a special command option is supplied
The dialog also informs about the risk of unauthorized strangers (mis)using the printer if an unsecured OctoPrint installation is made available on the internet.
2013-08-10 21:59:05 +02:00
Gina Häußge c33c32410b Added configurable pause triggers to be able to react to custom firmware messages with pausing/unpausing/pause toggling 2013-07-08 18:01:10 +02:00
Gina Häußge 6d3e3221b8 Added timeout settings for serial communiction, initial connection and baudrate detection
Closes #126
2013-07-04 21:26:53 +02:00
Gina Häußge 44f1f01001 Allow enabling of serial logging at runtime 2013-06-30 22:18:29 +02:00
Gina Häußge 30e1624127 Merge remote-tracking branch 'CapnBry/autoconnect' into devel 2013-06-29 19:16:10 +02:00
Gina Häußge 1b45d15430 Merge branch 'master' into devel
Conflicts:
octoprint/util/comm.py
2013-06-27 21:51:09 +02:00
Gina Häußge 24bb0fdf05 Added missing return statement that caused an exception 2013-06-27 21:05:01 +02:00
Bryan Mayland b75a0ec5c3 Add a serial.autoconnect setting to connect to the printer on startup 2013-06-26 10:19:32 -04:00
Gina Häußge 09ae8fcdc2 Always send M110 with the new line number (default 0)
Previously it worked since the first command of every print was forced to be an M110 and the line number at the beginning of each print was always forced back to 0 as well. Now it just uses the actual line number (increased on each sent of a checksumed/numbered line) and resets that when an M110 is encountered. What was missing was forcing the line number of the actual M110 command to the desired line number as well. Should be "more correct" than before now, and work.
2013-06-25 20:05:31 +02:00
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