Gina Häußge
42f2398ac1
Only auto-connect if configured port is available at server startup. Also bugfixes.
2013-06-29 20:28:37 +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
30e1624127
Merge remote-tracking branch 'CapnBry/autoconnect' into devel
2013-06-29 19:16:10 +02:00
Gina Häußge
04ce284085
Just in case something goes wrong during reading the git repo information...
2013-06-29 13:43:45 +02:00
Gina Häußge
1caba2d634
Added git information to website
2013-06-29 13:41:39 +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
ae438ca03f
Fixed evaluation of "remember login" function
2013-06-25 20:09:40 +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
695f3f391c
Also send identity_changed event on passive login
2013-06-25 19:07:43 +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
6989613b99
Moved printer state to API endpoint, made apikey instead of login necessary
2013-06-23 21:24:19 +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
e17fa031c8
Return proper http status codes in case of problems
2013-06-23 16:57:38 +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
0e56952913
Finalized decoupling of timelapse from printer module, made sure timelapse is properly unregistered from eventbus on change
2013-06-16 22:42:18 +02:00
Gina Häußge
236e26979f
Switched Timelapses to using Eventbus instead of direct connection
2013-06-16 21:50:50 +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
107ff01b29
Merge branch 'gcodestreaming' into devel
2013-06-03 22:18:00 +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
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
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
38ec0b96b2
Started refactoring to match coding style and simplify things a bit.
2013-05-21 22:59:13 +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
8c8101bf62
Forgot to simplify the success after testing
2013-05-18 18:21:33 +00: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
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
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
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
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