Commit Graph

1352 Commits (ce7ccc136be337fd6ae1047a130139797e514130)

Author SHA1 Message Date
Bryan Mayland bbad030a92 Resend correct gcode line when resend is requested
(manually cherry picked from commit c8875fd)
2013-06-21 21:09:39 +02:00
Gina Häußge 94316fbcc1 Merge remote-tracking branch 'CapnBry/resendfix' into devel 2013-06-21 21:03:59 +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
Gina Häußge 5bf5d24dfc Also include /dev/ttyAMA* in glob patterns for serial port 2013-06-21 15:03:32 +02:00
Bryan Mayland c8875fd0f1 Resend correct gcode line when resend is requested 2013-06-20 11:41:10 -04:00
Gina Häußge 7e015e6e18 Merge branch 'devel' into events 2013-06-19 20:39:01 +02:00
Gina Häußge f9beb28b1d Merge branch 'master' into devel 2013-06-19 20:38:38 +02:00
Gina Häußge c24a66c361 Fixed signature for user view model. Closes #157 2013-06-19 20:36:50 +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 0e294ef8fd Merge branch 'devel' into events 2013-06-18 21:44:30 +02:00
Gina Häußge cc77507368 Updated module versions
(cherry picked from commit e90c1d9)
2013-06-18 21:41:39 +02:00
Gina Häußge e90c1d9b28 Updated module versions 2013-06-18 21:41:12 +02:00
Gina Häußge a4aacf6108 Merge branch 'CapnBry-extrudevol' into devel 2013-06-18 21:28:13 +02:00
Gina Häußge 7c85013389 Added filament diameter retrieval from gcode generated by Cura, fixed Slic3r version 2013-06-18 21:28:05 +02:00
Gina Häußge e96765bc39 Merge branch 'master' into devel
Conflicts:
	octoprint/static/css/octoprint.less
2013-06-17 22:12:45 +02:00
Gina Häußge bcf8d54ff3 Merge remote-tracking branch 'origin/master' 2013-06-17 22:10:48 +02:00
Gina Häußge 6876438783 Fix for #153 backported from events branch 2013-06-17 22:10:14 +02:00
Bryan Mayland e32afe147a Add extrusion volume calculation for Slic3r gcode files 2013-06-17 14:39:52 +00:00
Gina Häußge 33731464e5 Merge pull request #145 from daprice/master
Improve nav bar appearance when custom colors are used
2013-06-17 04:56:10 -07:00
Gina Häußge 1af69c9790 Merge pull request #151 from algspd/master
Added jquery.min.js locally to avoid depending on internet connection on clients which may be locally and offline
2013-06-17 04:55:01 -07:00
algspd d9fb3bb8f6 Added jquery.min.js locally to avoid depending on
internet connection on clients which may be
locally and offline
2013-06-17 00:11:17 +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 4994d488cf Use span instead of button for upload buttons, otherwise FF and IE hiccup...
(cherry picked from commit ee3bc84)
2013-06-16 11:39:20 +02:00
Gina Häußge ee3bc84242 Use span instead of button for upload buttons, otherwise FF and IE hiccup... 2013-06-16 11:38:52 +02:00
Gina Häußge e27b34a9f3 Hopefully fixed a off-by-one error... 2013-06-15 17:33:03 +02:00
Gina Häußge 28d8dd773a Hotfix for recent Flask/Werkzeug versions breaking Flask-Login module 2013-06-15 17:01:42 +02:00
Gina Häußge b1ba513e32 Hotfix for recent Flask/Werkzeug versions breaking Flask-Login module
(cherry picked from commit 84caaeb)
2013-06-15 16:58:41 +02:00
Gina Häußge 84caaeb119 Hotfix for recent Flask/Werkzeug versions breaking Flask-Login module 2013-06-15 16:58:18 +02:00
Gina Häußge d6ad8dca00 Indentation still wrong, caused another funny behaviour 2013-06-11 18:45:57 +02:00
Gina Häußge 25802ddb66 Fixed wrong indentation that caused a rather funny behaviour... 2013-06-09 19:30:42 +02:00
Gina Häußge d0035c3f3a Removed reference to remove feedratemodifier 2013-06-09 19:05:37 +02:00
Gina Häußge 8917d2e607 strip, not trim 2013-06-09 18:58:03 +02:00
Gina Häußge b099bb443b Trim sd filenames 2013-06-09 18:53:23 +02:00
Gina Häußge 97bdc41370 Merge branch 'master' into devel 2013-06-09 18:42:41 +02:00
Gina Häußge 4371fa500c Adjusted README 2013-06-09 18:42:32 +02:00
Gina Häußge ac4a0f772d Fixed whitespace 2013-06-09 18:29:28 +02:00
Gina Häußge 8be1329a71 Merge branch 'devel' into gcodestreaming
Conflicts:
	octoprint/printer.py
	octoprint/static/js/ui.js
	octoprint/templates/index.jinja2
	octoprint/util/comm.py
2013-06-09 18:28:40 +02:00
Gina Häußge edff311351 Merge branch 'master' into devel 2013-06-09 18:18:57 +02:00
Gina Häußge 9963c523c0 Do not display -1mm when printing from sd 2013-06-09 18:13:12 +02:00
Gina Häußge 4509eab816 Enable sd support by default 2013-06-09 18:04:25 +02:00
Gina Häußge d5a620f476 Introduced new function matchesGcode to properly test if a line contains a specific gcode 2013-06-09 18:03:41 +02:00
Gina Häußge 7257714a8e Merge branch 'master' into devel 2013-06-09 17:53:10 +02:00
Gina Häußge c36e39909e Always reset heatingUp flag when receiving an ok 2013-06-09 17:44:06 +02:00
Gina Häußge 5b15d42881 Only send M105/M27 during sd printing when not currently heating up 2013-06-09 17:08:12 +02:00
Gina Häußge 90a1edbbcf Testing out a space between the N-prefix and the command 2013-06-09 16:33:59 +02:00
Gina Häußge 30a57e21f4 Fixed line count incrementation for gcode streaming 2013-06-09 15:55:55 +02:00
Gina Häußge 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