Gina Häußge
44f1f01001
Allow enabling of serial logging at runtime
2013-06-30 22:18:29 +02:00
Gina Häußge
0ed8f0f28d
Fixed typo, better error handling.
2013-06-29 20:39:49 +02:00
Gina Häußge
8231e70b44
Added tab in settings for serial connection options
2013-06-29 20:20:27 +02:00
Gina Häußge
b0518a71a3
Also provide access to the auto-connect setting in the connection and the settings dialog
2013-06-29 19:57:46 +02: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
bd61d45e27
Missed the settings when changing api -> allow to api -> enabled
2013-06-24 17:48:13 +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
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
peteruithoven
e8913e3141
Adding settings for webcam flipX and flipY
2013-06-19 00:42:43 +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
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
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
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