90a1edbbcf
Testing out a space between the N-prefix and the command
2013-06-09 16:33:59 +02:00
30a57e21f4
Fixed line count incrementation for gcode streaming
2013-06-09 15:55:55 +02:00
003109d59e
Made gcode viewer capable of handling progress information
...
GCode viewer now updates its visualization (during printing) based on the current progress percentage, not based on the current line (which will not be available any more as part of the progress tuple with gcode streaming)
2013-06-09 14:00:15 +02:00
add073a6cb
Add black color setting
2013-06-08 19:05:09 -05:00
719c4fab57
Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings
2013-06-08 18:43:17 -05:00
7662023223
Improve appearance of text-shadow when dark navbar colors are used; adjust color of carets in navbar menus according to the navbar color
2013-06-06 20:11:35 -05:00
57932ff78c
Check for localStorage with Modernizr before attempting to use it. Solves foosel/OctoPrint#91
2013-06-06 00:23:30 -05:00
8d4f7e2ba7
M20 on startup (2nd try)
2013-06-03 22:37:08 +02:00
480f0aef6f
M20 on startup
2013-06-03 22:32:23 +02:00
1441a7dbd8
Added missing image resource
2013-06-03 22:25:23 +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
8d53f313fe
Removed debug log output
2013-05-27 19:48:17 +02:00
16befc84d2
Brought up to date with sdcard branch
2013-05-27 01:45:52 +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
3130c0c30b
Fixed jobData key
2013-05-27 01:20:45 +02:00
624630ac63
Updated documentation of events
2013-05-27 01:03:53 +02:00
be99930021
Refactoring of event management
2013-05-27 00:56:57 +02:00
c836c79179
Merge branch 'norpchen-master' into events
...
Conflicts:
octoprint/printer.py
2013-05-26 20:24:51 +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
08229598e6
Merge branch 'repetier' into devel
2013-05-23 22:45:21 +02:00
5b72be31ba
Minor cleanup
2013-05-23 22:45:00 +02:00
da90b2d738
Try to remove timing issues when preparing next line to send
2013-05-23 22:37:02 +02:00
535de9f12e
redundant start event trigger removed
2013-05-22 21:41:37 -06:00
622e1f2ee7
Do not display the filename that was just streamed to SD, suggests that it is already selected for printing
2013-05-22 23:27:51 +02:00
fa584d59c5
Made progress calculation more resilient, do not hit printer with commands like a freight train during warm up
2013-05-22 18:56:02 +02:00
6ce7fed96d
Removed cause of NPE
2013-05-22 18:32:19 +02:00
75f53b8ab9
Properly parse Marlin's "opened file x" message
2013-05-22 18:25:26 +02:00
33bcf284a9
Always send all lower case filenames to the printer for sd card commands
2013-05-22 18:20:21 +02:00
3f98e0c687
Bug Fixes for Event Manager
2013-05-21 19:48:38 -07:00
bb954c50d2
Properly switch between file and sd printing
2013-05-21 23:41:18 +02:00
45fef79e3d
Use M26 to reset SD position to 0 when cancelling and restarting a print, preprocess gcode before sending to printer
2013-05-21 23:30:29 +02:00
eeddf0ae1a
Reset SD file data when disconnecting or when losing/regaining connection to the backend
2013-05-21 23:08: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
b048cc390b
Proper uploading incl. drag-n-drop for both local storage and SD card
2013-05-20 23:31:17 +02:00
783b3b8166
Merge branch 'master' into devel
2013-05-20 20:19:26 +02:00
039a17d923
First try at SD card support
2013-05-20 19:18:03 +02:00
8c8101bf62
Forgot to simplify the success after testing
2013-05-18 18:21:33 +00:00
e831ced2da
simple change so the url loads from http or https whichever is in use
2013-05-18 18:13:17 +00:00
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
3f79faf55b
Merge remote-tracking branch 'upstream/master' into devel
2013-05-18 06:32:04 +00:00
b61db6dc0f
jQuery over SSL and GoogleCDN
...
Issue #127
2013-05-16 16:43:09 +03: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
957213321e
Print 'unknown G/M code' warnings to console once
2013-05-09 08:07:33 -07:00
fc56744705
Fixed URL for setting timelapse configuration.
...
Closes #110
2013-05-01 20:17:30 +02: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
0bb17818e1
Do not convert command to send to upper case after checksum was calculated
...
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"
Should fix #103
(cherry picked from commit 628ffb5
2013-04-16 14:46:22 +02:00
628ffb5600
Do not convert command to send to upper case after checksum was calculated
...
Removed for the time being until I have a better idea on how allow stuff like "g28 x0 y0" to be autoconverted to "G28 X0 Y0" but autoconvert something like "m117 Some case sensitive text" only to "M117 Some case sensitive text"
Should fix #103
2013-04-16 14:45:25 +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
552048efbe
Fixed Modernizr queries by gcode renderer
2013-04-14 13:42:30 +02:00
7e82214d75
Added missing files
2013-04-14 13:15:54 +02:00
f7334ef65f
Fixed some merge bugs
2013-04-13 22:26:23 +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
244ff25e2f
Fixed settings for gcode file list
2013-04-13 22:20:41 +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
34a860efda
Added confirmation dialog and different logo for print job restart
...
Closes #98
2013-04-10 16:37:12 +02:00
46173bc35e
Merge branch 'webcamMove' into devel
2013-04-07 22:15:15 +02:00
3174559072
Moved webcam view to Control tab
2013-04-07 22:15:04 +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
d20aae6474
Added homepage to footer
2013-04-01 17:23:56 +02:00
edea3789b2
Made Webcam omnipresent
2013-04-01 17:20:25 +02:00
c01b49fbc7
Forgot to commit Font Awesome
2013-03-30 18:29:13 +01:00
cfdfad1c06
Changed color and font-size of footer
2013-03-30 18:28:24 +01:00
b5b023a29c
Merge remote-tracking branch 'splitbrain/footer' into devel
2013-03-30 18:22:33 +01: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
48a2fd71a7
More reliable initialization of communication with repetier
2013-03-26 07:25:16 +00: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
71f3dbbdcc
add tooltips to file controls
2013-03-25 23:55:53 -05:00
9b2d166c6c
Prevents manual commands from interupting other commands
2013-03-25 14:01:48 -04:00
9314e83665
added footer
...
makes it faster, to refer to the OctoPrint site when problems occur.
2013-03-24 16:11:54 +01: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
1477fb31fb
Merge branch 'devel'
2013-03-17 16:42:48 +01:00
192952c03f
Logging statements for timelapse creation
2013-03-17 16:31:20 +01:00
456ded3f36
Fixed off by one error in resend loop
2013-03-17 13:53:38 +01:00
ad1cbca22a
Added known error messages for checksum mismatches or expected line issues from Repetier to recognized "auto-correction" errors, made code around all that a bit more readable.
2013-03-17 10:58:34 +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
5e22b4b096
Reset currentLine when changing state to printing
...
This keeps gcodePos and current line in sync when changing status to "Printing"
2013-03-16 05:30:02 -03: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
7e595b27ed
Bugfix: configfile parameter was not properly used for settings in all cases
2013-03-16 01:48:28 +01:00
e08783c8bf
Merge remote-tracking branch 'daprice/master' into devel
2013-03-16 00:28:37 +01:00
088253e564
work around a bug in iOS 6 where ajax requests get cached and only work once
2013-03-14 20:55:02 -05:00
Gina Häußge