q3k/OctoPrint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1389 commits 1 branch 0 tags 18 MiB
Commit graph

361 commits

Author SHA1 Message Date
Bryan Mayland
e7f5384427 Refresh gcode visualization if the selected file is modified 
This passes the file modification time to the javascript side and if
they don't match then the file is re-downloaded and parsed. The mtime
is also used in the AJAX request as it prevents the browser from serving
the new request from cache.
 2013-07-21 06:48:06 -04:00
Gina Häußge
566933a765 Merge branch 'CapnBry-job-metaupdate' into devel 2013-07-20 16:20:42 +02:00
Gina Häußge
2cafc6114d Just in case we'll use subfolders in the future... 2013-07-20 16:20:34 +02:00
Gina Häußge
31d86cd0a2 Added left space on filesystem holding the uploads folder to the gcode files list 
Closes #186
 2013-07-20 16:01:17 +02:00
Bryan Mayland
48408910b5 Remove superfluous selectedFile setting as setJobData does that 2013-07-14 11:31:55 -04:00
Bryan Mayland
8f6d536b8f Update job metadata when the gcodemanager signals a change 2013-07-14 11:26:14 -04:00
Bryan Mayland
fb9fd7e6c9 Fix metadata removal on upload for files with un-sane characters in them 
When re-uploading a file with characters that will be later sanitized,
the old metadata entry wasn't removed because it checked the unsane
filename rather than the sanitized version that will later be stored.

This was creating an inconsistent metadata view during analysis for
files with spaces in them.
 2013-07-14 11:20:37 -04:00
Gina Häußge
22ea55746c Overall better gcode file handling 
See #182 and https://groups.google.com/forum/#!topic/octoprint/YnOzyToxfkI
 2013-07-13 16:30:41 +02:00
Gina Häußge
c6a749c684 Properly disable connection configuration when connected 2013-07-13 10:44:09 +02:00
Gina Häußge
92b42dd583 Merge remote-tracking branch 'CapnBry/temphistfix' into devel 2013-07-13 09:59:50 +02:00
Gina Häußge
6e50d37e51 Fixed key error 2013-07-09 22:19:58 +02:00
Gina Häußge
d6553a29c6 First throw at clustering of settings 2013-07-09 21:41:26 +02:00
Bryan Mayland
7d51b32476 Fix initial temperatureHistory load not containing any data 2013-07-09 14:54:32 -04: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
8dcbb620bb Highlight currently selected file, disable deletion and load/loadAndPrint for it 
Fixed #182
 2013-07-07 23:27:22 +02:00
Gina Häußge
7d85860195 Reset view to first page in file lists when filters are changed 2013-07-07 14:18:08 +02:00
Gina Häußge
c9e261df32 Use absolute values for self._serial.timeout, not relative ones 
Thanks to @spapadim for spotting this
 2013-07-05 16:58:00 +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
f14acf8ba7 Fix height of terminal output to 340 px 2013-06-30 21:17:22 +02:00
Gina Häußge
119ee338f1 Client side filtering of M105 request/response and M27 request/response 
Since it's client side, if you leave these on when not printing, the log will go completely blank over time due to filling up with M105s. Re-enabling M105s will immediately restore the whole log (although it won't hold much information value).
 2013-06-30 21:10:09 +02:00
Gina Häußge
98d4317e6f More error resilience 2013-06-30 21:01:35 +02:00
Gina Häußge
9227bb5fd0 Removed peakZ again, doesn't work this way 
Slicers might raise the print head first for a "nose dive" onto the print platform, leading to a high peakZ already dialed in, with no way to get it down again. This way events won't be fired until the print reaches the height of the initial starting point. As a z-change is a z-change if z changes, we'll just fire the event now (if oldZ != newZ). Event consumers will have to think of a way to filter out the noise.
 2013-06-30 19:15:16 +02:00
Gina Häußge
83a864d3d8 Reset peakZ on new print 2013-06-30 00:03:34 +02:00
Gina Häußge
81464d65b7 Some more cleanups 2013-06-29 23:48:27 +02:00
Gina Häußge
0ed8f0f28d Fixed typo, better error handling. 2013-06-29 20:39:49 +02:00
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
9607de7d17 Removed matchesGcode again since it's not needed anymore 2013-06-29 19:09:55 +02:00
Gina Häußge
a9c35e5cf9 Changed gcode regex slightly to be on the safe side (we don't want to accidentally capture comments etc) 2013-06-29 19:06:14 +02:00
Gina Häußge
5b976b5300 Merge branch 'devel' into CapnBry-sendperf 
Conflicts:
	octoprint/util/__init__.py
 2013-06-29 18:38:23 +02:00
Gina Häußge
530cdcd26a Some refactoring (grouping methods, extracting classes, etc) 2013-06-29 18:37:47 +02:00
Gina Häußge
747fc4acc4 More in-source documentation for events 2013-06-29 14:33:05 +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
eb565645eb Remove profiling code 2013-06-28 14:19:35 -04:00
Bryan Mayland
b9144c2edc Microoptimization to not build the same string twice 2013-06-28 14:19:34 -04:00
Bryan Mayland
cb30d1fdd0 Refactor send command gcode handlers into individual functions. Very little gain if any. 2013-06-28 14:19:34 -04:00
Bryan Mayland
b1c5c58f02 Rename gfunc -> gcode 2013-06-28 14:19:34 -04:00
Bryan Mayland
715eb142f8 gcodeToEvent can only fire one event per gcode function anyway. <1% performance increase. 2013-06-28 14:19:33 -04:00
Bryan Mayland
b5661c6f5e Remove unused comm logQueue. 18% performance increase (12% vs baseline) 2013-06-28 14:19:33 -04:00
Bryan Mayland
905923cc4c Switch ringbuffer lists for deques. 6% performance boost (4.5% vs baseline) 2013-06-28 14:19:33 -04:00
Bryan Mayland
9dd754fdae Remove matchesGcode and instead just parse the code once. 29% performance increase 2013-06-28 14:19:32 -04: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
dd3e9030fa Yet another fix for the M999 resend issue 
Should hopefully now be also fixed in case of a newly established connection with the printer, which was a regression due to the fix of the resending code.
 2013-06-27 21:12:06 +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
8b384ef530 Small rewording 2013-06-25 22:00:52 +02: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
c9fb4e1ded Also send identity_changed event on passive login 
(cherry picked from commit 695f3f3)
 2013-06-25 19:32:05 +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
ce9557798b Fixing #166 showed a deeper rooted issue with line number handling introduced with repetier/sdcard/gcodestreaming 
Something like three wrongs led to one right. Core issue (not starting with line 0 but line 1 and not using the current line but the current line from the gcode file being sent, regardless of reset by M110) should now be rooted out.
 2013-06-24 22:09:40 +02:00
Gina Häußge
e5389d0f0f Reverted bbad030a92 
Correct in devel branch, wrong in master branch (different counting).

Closes #166
 2013-06-24 18:24:45 +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
Bryan Mayland
a9ec4336de More errors == more error events 2013-06-22 15:13:44 +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
Bryan Mayland
50914df07a Made communication mode more error resilient 2013-06-22 15:03:01 +02:00
Bryan Mayland
66ddf77be8 Be able to cope with M999 causing a Resend: 1 
(cherry picked from commit 8b702db)
 2013-06-22 09:39:13 +02:00
Bryan Mayland
8b702db0d0 Be able to cope with M999 causing a Resend: 1 2013-06-22 09:36:21 +02:00
Gina Häußge
40b4bfad85 Merge branch 'feedbackCommands' into devel 2013-06-21 23:19:25 +02:00
Bryan Mayland
6600eea1a2 Feedback commands now work 2013-06-21 23:19:15 +02:00
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
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
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
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